From c4476c89a96bd795324954e6492038685954df43 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Wed, 23 Aug 2023 10:47:44 +0300 Subject: [PATCH] =?UTF-8?q?swt-exporter=20clearing-service=20DF11Exporter?= =?UTF-8?q?=20result=20OK=20=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=B2=D0=BE?= =?UTF-8?q?=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D1=8B=D0=B9=20!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/spcex/clearing/service/executors/Sdf10Executor.java | 2 +- .../swt/exporter/services/exportimpl/DF11Exporter.java | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf10Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf10Executor.java index f75910c53..ce3d69c80 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf10Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf10Executor.java @@ -63,7 +63,7 @@ public class Sdf10Executor { private final TradingTimeService tradingTimeService; private final KafkaSender kafkaSender; - private final static String OK = "OK!"; + private final static String OK = "OK"; private final static String SYNTAX_ERROR = "Синтаксическая ошибка (файл сформирован неверно)"; private final static String GATEWAY_REJECTED = "Отрицательный ответ от Торговой Системы"; private final static String NOT_FOUND_ACCOUNT = "Не найден код раздела субсчета/счета депо"; diff --git a/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/exportimpl/DF11Exporter.java b/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/exportimpl/DF11Exporter.java index dd6d80e83..e307d1085 100644 --- a/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/exportimpl/DF11Exporter.java +++ b/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/exportimpl/DF11Exporter.java @@ -57,11 +57,7 @@ public class DF11Exporter extends AbstractExporterService { stringBuilder.append(record.getQuantity()).append(':'); stringBuilder.append(record.getSecurityCode()).append(':'); stringBuilder.append(record.getClientName()).append(':'); - String result = record.getResult(); - if (result != null && result.endsWith("!")) { // OK! => OK - result = result.substring(0, result.length() - 1); - } - stringBuilder.append(result).append(SWTHeaderData.LINE_SEPARATOR); + stringBuilder.append(record.getResult()).append(SWTHeaderData.LINE_SEPARATOR); return stringBuilder.toString(); }