diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/SdfCreatorBySTLDPayment.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/SdfCreatorBySTLDPayment.java index 9438e3c93..22f2c9c4e 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/SdfCreatorBySTLDPayment.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/SdfCreatorBySTLDPayment.java @@ -65,19 +65,19 @@ public class SdfCreatorBySTLDPayment { /*Map> byOrder = */ List>>> allEntries = group(paymentInstructionFound); + Set queueToSend = new HashSet<>(); allEntries.forEach(entry -> { log.info("Group category {}, index {}", entry.getKey().category, entry.getKey().getSortIndex()); GroupWrapper group = entry.getKey(); Collection> bySenderGroups = entry.getValue(); - Set queueToSend = new HashSet<>(); for (List bySenderGroup : bySenderGroups) { Long senderIdSpecificToGroup = bySenderGroup.iterator().next().getSenderId(); log.info("Group senderId {}", senderIdSpecificToGroup); queueToSend.add(saveSdfBeforeSendToKafka(senderIdSpecificToGroup, group.category, bySenderGroup, generationId)); } - log.info("Send command target queue: {}", queueToSend); - sendToKafkaSDFRequests(queueToSend, generationId); }); + log.info("Send command target queue: {}", queueToSend); + sendToKafkaSDFRequests(queueToSend, generationId); allEntries.forEach(entry -> { //category group GroupWrapper group = entry.getKey(); @@ -158,8 +158,8 @@ public class SdfCreatorBySTLDPayment { } SdfClearingRequest kafkaMessage = new SdfClearingRequest(); kafkaMessage.setGroupId(generationId); - Long requestId = kafkaSender.sendRequestToQueue(Consts.SDF03_PROCESS, kafkaMessage); - log.debug("Send to kafka command, queue={}, requestId={}", kQueue, requestId); + Long requestId = kafkaSender.sendRequestToQueue(kQueue, kafkaMessage); + log.debug("Send to kafka command, queue={}, requestId={}, generationId={}", kQueue, requestId, generationId); } }