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 3aef03d6e..554198baf 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 @@ -23,6 +23,7 @@ import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import ru.spcex.platform.utils.enumeration.IMessageResolver; import java.time.LocalDate; +import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.function.Supplier; @@ -38,7 +39,7 @@ public class PrimaryAuctionB0Session extends AbstractSession implements Initiali private final InclusionObligations inclusionObligations; private final InspectionObligations inspectionObligations; private final FormingRegistersOnOS formingRegistersOnOS; - private final FormingPaymentInstruction formingPaymentInstruction; + private final FormingPaymentInstructionSecondaryT0 formingPaymentInstruction; private final UnlockResources unlockResources; private final FinishingSession finishingSession; private final EndStageNotification endStageNotification; @@ -55,7 +56,7 @@ public class PrimaryAuctionB0Session extends AbstractSession implements Initiali ObligationAdmission obligationsAdmission, InclusionObligations inclusionObligations, FormingRegistersOnOS formingRegistersOnOS, - FormingPaymentInstruction formingPaymentInstruction, + FormingPaymentInstructionSecondaryT0 formingPaymentInstruction, UnlockResources unlockResources, FinishingSession finishingSession, EndStageNotification endStageNotification, @@ -154,8 +155,10 @@ public class PrimaryAuctionB0Session extends AbstractSession implements Initiali //stage 7 StageResult> paymentResult = null; { - FormingPaymentInstructionPayload payload = new FormingPaymentInstructionPayload(); + FormingPaymentInstructionDealsMkrPayload payload = new FormingPaymentInstructionDealsMkrPayload(); payload.setSessionId(currSession.getId()); + payload.setPaymentInstructionReturns(new ArrayList<>()); + //stage 7 paymentResult = runStage(TaskType.FormingPaymentInstruction, payload, formingPaymentInstruction); } 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 4da10638e..9a9caa501 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 @@ -23,6 +23,7 @@ import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import ru.spcex.platform.utils.enumeration.IMessageResolver; import java.time.LocalDate; +import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.function.Supplier; @@ -38,7 +39,7 @@ public class PrimaryAuctionBnSession extends AbstractSession implements Initiali private final InclusionObligations inclusionObligations; private final InspectionObligations inspectionObligations; private final FormingRegistersOnOS formingRegistersOnOS; - private final FormingPaymentInstruction formingPaymentInstruction; + private final FormingPaymentInstructionSecondaryT0 formingPaymentInstruction; private final UnlockResources unlockResources; private final FinishingSession finishingSession; private final EndStageNotification endStageNotification; @@ -55,7 +56,7 @@ public class PrimaryAuctionBnSession extends AbstractSession implements Initiali ObligationAdmission obligationsAdmission, InclusionObligations inclusionObligations, FormingRegistersOnOS formingRegistersOnOS, - FormingPaymentInstruction formingPaymentInstruction, + FormingPaymentInstructionSecondaryT0 formingPaymentInstruction, UnlockResources unlockResources, FinishingSession finishingSession, EndStageNotification endStageNotification, @@ -153,8 +154,9 @@ public class PrimaryAuctionBnSession extends AbstractSession implements Initiali } StageResult> paymentResult = null; { - FormingPaymentInstructionPayload payload = new FormingPaymentInstructionPayload(); + FormingPaymentInstructionDealsMkrPayload payload = new FormingPaymentInstructionDealsMkrPayload(); payload.setSessionId(currSession.getId()); + payload.setPaymentInstructionReturns(new ArrayList<>()); //stage 7 paymentResult = runStage(TaskType.FormingPaymentInstruction, payload, formingPaymentInstruction); } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java index 52c16d43c..0ae994249 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java @@ -23,6 +23,7 @@ import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import ru.spcex.platform.utils.enumeration.IMessageResolver; import java.time.LocalDate; +import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.function.Supplier; @@ -38,7 +39,7 @@ public class PrimaryAuctionT0Session extends AbstractSession implements Initiali private final InclusionObligations inclusionObligations; private final InspectionObligations inspectionObligations; private final FormingRegistersOnOS formingRegistersOnOS; - private final FormingPaymentInstruction formingPaymentInstruction; + private final FormingPaymentInstructionSecondaryT0 formingPaymentInstruction; private final UnlockResources unlockResources; private final FinishingSession finishingSession; private final EndStageNotification endStageNotification; @@ -54,7 +55,7 @@ public class PrimaryAuctionT0Session extends AbstractSession implements Initiali ObligationAdmission obligationsAdmission, InclusionObligations inclusionObligations, FormingRegistersOnOS formingRegistersOnOS, - FormingPaymentInstruction formingPaymentInstruction, + FormingPaymentInstructionSecondaryT0 formingPaymentInstruction, UnlockResources unlockResources, FinishingSession finishingSession, EndStageNotification endStageNotification, @@ -153,8 +154,9 @@ public class PrimaryAuctionT0Session extends AbstractSession implements Initiali //stage 7 StageResult> paymentResult = null; { - FormingPaymentInstructionPayload payload = new FormingPaymentInstructionPayload(); + FormingPaymentInstructionDealsMkrPayload payload = new FormingPaymentInstructionDealsMkrPayload(); payload.setSessionId(currSession.getId()); + payload.setPaymentInstructionReturns(new ArrayList<>()); //stage 7 paymentResult = runStage(TaskType.FormingPaymentInstruction, payload, formingPaymentInstruction); } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java index f04eb6d78..bab6c30ca 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java @@ -39,6 +39,7 @@ public class SecondaryAuctionT0Session extends AbstractSession implements Initia private final InspectionObligations inspectionObligations; private final FormingRegistersOnOS formingRegistersOnOS; private final FormingPaymentInstructionSecondaryT0 formingPaymentInstruction; + private final FormingPaymentInstructionReturnMkr formingPaymentInstructionReturnMkr; private final UnlockResources unlockResources; private final FinishingSession finishingSession; private final EndStageNotification endStageNotification; @@ -56,6 +57,7 @@ public class SecondaryAuctionT0Session extends AbstractSession implements Initia InclusionObligations inclusionObligations, FormingRegistersOnOS formingRegistersOnOS, FormingPaymentInstructionSecondaryT0 formingPaymentInstruction, + FormingPaymentInstructionReturnMkr formingPaymentInstructionReturnMkr, UnlockResources unlockResources, FinishingSession finishingSession, EndStageNotification endStageNotification, @@ -75,6 +77,7 @@ public class SecondaryAuctionT0Session extends AbstractSession implements Initia this.endStageNotification = endStageNotification; this.executionFondImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ExecutionFond, ExecutionFond.class); this.inspectionObligations = inspectionObligations; + this.formingPaymentInstructionReturnMkr = formingPaymentInstructionReturnMkr; this.marketCodes = marketCodes; } @@ -151,12 +154,20 @@ public class SecondaryAuctionT0Session extends AbstractSession implements Initia payload.setSessionId(currSession.getId()); runStage(TaskType.FormingRegistersOnOS, payload, formingRegistersOnOS); //returns Collection } - //stage 7 - StageResult> paymentResult = null; + StageResult> returnsPayment = null; { FormingPaymentInstructionPayload payload = new FormingPaymentInstructionPayload(); payload.setSessionId(currSession.getId()); //stage 7 + returnsPayment = runStage(TaskType.FormingPaymentInstruction, payload, formingPaymentInstructionReturnMkr); + } + + StageResult> paymentResult = null; + { + FormingPaymentInstructionDealsMkrPayload payload = new FormingPaymentInstructionDealsMkrPayload(); + payload.setSessionId(currSession.getId()); + payload.setPaymentInstructionReturns(returnsPayment.getStageResult()); + //stage 7 paymentResult = runStage(TaskType.FormingPaymentInstruction, payload, formingPaymentInstruction); } if (paymentResult != null && paymentResult.getStageResult().isEmpty()) {