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 6a9f10790..c8bd2fe62 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 @@ -147,7 +147,11 @@ public class StatementService extends QueueConsumer implements InitializingBean AbstractExecutor service = executorsMap.get(SdfTable.SDF_08); if (service != null) { Result res = service.execute(sdfGroup, statementRequest); - finishSendCommand(res, service, statementRequest); + if (res.getAccountRequests().size() != 0) { + kafkaSender.sendRequestToQueue(Consts.ACCOUNT_NEW_SDF08, createAccountsRequest(statementRequest.getGroupId(), res.getAccountRequests())); + } else if (service.isNeedToSendCommand()) { + service.sendCommand(kafkaSender, res); + } } else { log.warn("Executor for SDF_08 not set"); } @@ -177,12 +181,7 @@ public class StatementService extends QueueConsumer implements InitializingBean .collect(Collectors.toList()); } AbstractExecutor service = executorsMap.get(SdfTable.SDF_01); - Result res = service.execute(sdfGroup, statementRequest); - finishSendCommand(res, service, statementRequest); - } - - void finishSendCommand(Result res, AbstractExecutor service, StatementRequest statementRequest) { - if (res.getAccountRequests().size() != 0) { + Result res = service.execute(sdfGroup, statementRequest); if (res.getAccountRequests().size() != 0) { kafkaSender.sendRequestToQueue(Consts.ACCOUNT_NEW_SDF01, createAccountsRequest(statementRequest.getGroupId(), res.getAccountRequests())); } else if (service.isNeedToSendCommand()) { service.sendCommand(kafkaSender, res); diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java index 49e1f3772..4103f6812 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java @@ -86,6 +86,7 @@ public interface Consts { String CREATE_REPORT_FOR_REGISTRY = "create-report-for-registry"; String ACCOUNT_NEW_SDF01 = "account-new-sdf01"; + String ACCOUNT_NEW_SDF08 = "account-new-sdf08"; String DESTINATION_RELATION_NEW = "relation-new"; String DESTINATION_RELATION_UPDATE = "relation-update";