From 546359752b10e3f262aeb59c403e2b15368e711e Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Wed, 30 Aug 2023 16:58:25 +0300
Subject: [PATCH] =?UTF-8?q?clearing-service=20Sdf04=20=D0=BE=D0=B6=D0=B8?=
 =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=BB=D0=BD=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D1=8C=D1=8E=20=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=BE?=
 =?UTF-8?q?=D0=B9=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D1=8B=20=D0=B2=20Sessio?=
 =?UTF-8?q?nMonitor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ru/spcex/clearing/service/StatementService.java   |  2 +-
 .../clearing/service/executors/Sdf04Executor.java     | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/StatementService.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/StatementService.java
index 0f1ce0536..614201c42 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/StatementService.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/StatementService.java
@@ -243,7 +243,7 @@ public class StatementService extends QueueConsumer implements InitializingBean
                 NotificationNewRequest nRequest = new NotificationNewRequest();
                 nRequest.setObjectType(ObjectType.rgst.getKey());
                 nRequest.setPriority(Priority.HIGH.getKey());
-                nRequest.setComment(String.format("Ошибка : некоторые из новых SDF_04 имеют неправильный статус"));
+                nRequest.setComment("Поручения из клиринговой системы имеют неисполненный статус в ответе ДФ-04 из расчетной организации");
                 kafkaSender.sendRequestToQueue(Consts.NOTIFICATION_NEW, nRequest);
             } else { // отправить в SessionMonitor
                 kafkaSender.sendRequestToQueue(Consts.CONTINUE_SESSION_BN_FIRST_PART, continueSessionBn);
diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf04Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf04Executor.java
index deb1e0472..38ebb5ed9 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf04Executor.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf04Executor.java
@@ -69,14 +69,17 @@ public class Sdf04Executor extends AbstractExecutor<SDf04> {
 
     public Result execute(Collection<SDf04> sdf, StatementRequest statementRequest) {
         Result result = new Result();
-        Long generationIdForGroup = imdgProvider.getImdgIdGenerator().nextId();
-        result.setChildGenerationId(generationIdForGroup);
-        result.setAnyHasError(false);
         for (SDf04 sdf04 : sdf) {
             if (!("OK!".equals(sdf04.getImp_result()))) {
-                log.trace("sdf04[{}].Imp_result=\"{}\" was not ok.", sdf04.getId(), sdf04.getImp_result());
+                log.warn("groupId={} stop execute, cause: sdf04[{}].Imp_result=\"{}\" was not ok.", statementRequest.getGroupId(),
+                        sdf04.getId(), sdf04.getImp_result());
                 result.setAnyHasError(true);
+                return result;
             }
+        }
+        Long generationIdForGroup = imdgProvider.getImdgIdGenerator().nextId();
+        result.setChildGenerationId(generationIdForGroup);
+        for (SDf04 sdf04 : sdf) {
             //обычно мы ищем по группу sdf04, здесь как будто всегда только одна запись, todo нужно прочекать этот момент
             log.debug("Process sdf04 record; sdf04.id: {}", sdf04.getId());
             Collection<Registry> registries;