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 { public Result execute(Collection 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 registries;