diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java index 47504aab5..b8538b425 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java @@ -8,6 +8,7 @@ import org.springframework.stereotype.Service; import ru.clearing.classes.statics.data.execution.ExecutionCommon; import ru.clearing.classes.statics.data.execution.ExecutionFond; import ru.clearing.classes.statics.data.misc.Session; +import ru.clearing.classes.statics.data.payment.PaymentInstruction; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.session.stage.impl.*; @@ -25,6 +26,7 @@ import ru.spcex.platform.utils.enumeration.IMessageResolver; import java.time.Instant; import java.time.LocalDate; +import java.util.Collection; import java.util.List; import java.util.function.Supplier; @@ -176,18 +178,18 @@ public class PrimaryAuctionB0Session extends AbstractSession implements Initiali payload.setSessionId(currSession.getId()); runStage(TaskType.FormingRegistersOnOS, payload, formingRegistersOnOS); //returns Collection } - StageResult paymentResult = null; + StageResult> paymentResult = null; { FormingPaymentInstructionPayload payload = new FormingPaymentInstructionPayload(); payload.setSessionId(currSession.getId()); //stage 7 paymentResult = runStage(TaskType.FormingPaymentInstruction, payload, formingPaymentInstruction); } - if (paymentResult.getStageResult().getPaymentInstructions().isEmpty()) { + if (paymentResult.getStageResult().isEmpty()) { log.info("no payment instructions were created, sending SDF56"); sendSdf56(); } else { - log.info("created {} PaymentInstructions, waiting for SDF04/SDF13", paymentResult.getStageResult().getPaymentInstructions().size()); + log.info("created {} PaymentInstructions, waiting for SDF04/SDF13", paymentResult.getStageResult().size()); this.afterPaymentsSdf4And13Monitor = SessionMonitorFactory.paymentsWereCreated(section()); } } catch (StageException e) { diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java index 6e068005d..1dcb36d75 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java @@ -8,6 +8,7 @@ import org.springframework.stereotype.Service; import ru.clearing.classes.statics.data.execution.ExecutionCommon; import ru.clearing.classes.statics.data.execution.ExecutionFond; import ru.clearing.classes.statics.data.misc.Session; +import ru.clearing.classes.statics.data.payment.PaymentInstruction; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.session.stage.impl.*; @@ -25,6 +26,7 @@ import ru.spcex.platform.utils.enumeration.IMessageResolver; import java.time.Instant; import java.time.LocalDate; +import java.util.Collection; import java.util.List; import java.util.function.Supplier; @@ -178,18 +180,18 @@ public class PrimaryAuctionBnSession extends AbstractSession implements Initiali runStage(TaskType.FormingRegistersOnOS, payload, formingRegistersOnOS); //returns Collection } //stage 7 - StageResult paymentResult = null; + StageResult> paymentResult = null; { FormingPaymentInstructionPayload payload = new FormingPaymentInstructionPayload(); payload.setSessionId(currSession.getId()); //stage 7 paymentResult = runStage(TaskType.FormingPaymentInstruction, payload, formingPaymentInstruction); } - if (paymentResult.getStageResult().getPaymentInstructions().isEmpty()) { + if (paymentResult.getStageResult().isEmpty()) { log.info("no payment instructions were created, sending SDF56"); sendSdf56(); } else { - log.info("created {} PaymentInstructions, waiting for SDF04/SDF13", paymentResult.getStageResult().getPaymentInstructions().size()); + log.info("created {} PaymentInstructions, waiting for SDF04/SDF13", paymentResult.getStageResult().size()); this.afterPaymentsSdf4And13Monitor = SessionMonitorFactory.paymentsWereCreated(section()); } } catch (StageException e) {