diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/EventsReceiver.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/EventsReceiver.java index a947ca486..682a8354f 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/EventsReceiver.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/EventsReceiver.java @@ -40,6 +40,7 @@ import ru.spcex.clearing.service.payment.PaymentInstructionOutboundService; import ru.spcex.clearing.session.stage.CurrencySession; import ru.spcex.clearing.session.stage.FinalMkrSession; import ru.spcex.clearing.session.stage.IntermediateMkrSession; +import ru.spcex.clearing.session.stage.PaymSession; import ru.spcex.clearing.session.stage.PrimaryAuctionB0Session; import ru.spcex.clearing.session.stage.PrimaryAuctionBnSession; import ru.spcex.clearing.session.stage.PrimaryAuctionT0Session; @@ -69,6 +70,7 @@ public class EventsReceiver extends QueueConsumerV2 implements InitializingBean private final PrimaryAuctionB0Session primaryAuctionB0Session; private final IntermediateMkrSession intermediateMkrSession; private final FinalMkrSession finalMkrSession; + private final PaymSession paymSession; private final UnitedSession unitedSession; private final ReturnDepositSession returnDepositSession; private final SessionManager sessionManager; @@ -91,7 +93,7 @@ public class EventsReceiver extends QueueConsumerV2 implements InitializingBean PrimaryAuctionBnSession primaryAuctionBnSession, SecondaryAuctionT0Session secondaryAuctionT0Session, CurrencySession currencySession, - PrimaryAuctionB0Session primaryAuctionB0Session, PrimaryAuctionT0Session primaryAuctionT0Session, IntermediateMkrSession intermediateMkrSession, FinalMkrSession finalMkrSession, UnitedSession unitedSession, ReturnDepositSession returnDepositSession, SessionManager sessionManager, + PrimaryAuctionB0Session primaryAuctionB0Session, PrimaryAuctionT0Session primaryAuctionT0Session, IntermediateMkrSession intermediateMkrSession, FinalMkrSession finalMkrSession, PaymSession paymSession, UnitedSession unitedSession, ReturnDepositSession returnDepositSession, SessionManager sessionManager, Sdf06Executor sdf06Executor, Sdf10Executor sdf10Executor, BalanceRevise balanceRevise, Sdf05Sender sdf05Sender, StatementServiceV2 statementService, SessionTerminator sessionTerminator, PaymentInstructionOutboundService pmtOutboundService, ExecutionCurrencyComponent execCurrUpload, ExecutionDepositComponent execDepUpload, ExecutionFondComponent execFondUpload) { super(kafkaQueue, kafkaResponseQueue); @@ -106,6 +108,7 @@ public class EventsReceiver extends QueueConsumerV2 implements InitializingBean this.primaryAuctionT0Session = primaryAuctionT0Session; this.intermediateMkrSession = intermediateMkrSession; this.finalMkrSession = finalMkrSession; + this.paymSession = paymSession; this.unitedSession = unitedSession; this.returnDepositSession = returnDepositSession; this.sessionManager = sessionManager; @@ -170,6 +173,7 @@ public class EventsReceiver extends QueueConsumerV2 implements InitializingBean finalMkrSession.continueSession(req); unitedSession.continueSession(req); returnDepositSession.continueSession(req); + paymSession.continueSession(req); }) .forDestination(Consts.CONTINUE_SESSION_BN_FIRST_PART, callbacks::put); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SessionManager.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SessionManager.java index d00d76d88..ac8316fcd 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SessionManager.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SessionManager.java @@ -38,6 +38,8 @@ public class SessionManager { private final IntermediateMkrSession intermediateMkrSession; private final FinalMkrSession finalMkrSession; private final PrepSession prepSession; + private final PaymSession paymSession; + private final ReturnDepositSession returnDepositSession; private final UnitedSession unitedSession; private final TradingTimeService time; @@ -47,7 +49,7 @@ public class SessionManager { PrimaryAuctionBnSession primaryAuctionBnSession, PrimaryAuctionB0Session primaryAuctionB0Session, SecondaryAuctionT0Session secondaryAuctionT0Session, CurrencySession currencySession, - IntermediateMkrSession intermediateMkrSession, FinalMkrSession finalMkrSession, PrepSession prepSession, ReturnDepositSession returnDepositSession, UnitedSession unitedSession, TradingTimeService time) { + IntermediateMkrSession intermediateMkrSession, FinalMkrSession finalMkrSession, PrepSession prepSession, PaymSession paymSession, ReturnDepositSession returnDepositSession, UnitedSession unitedSession, TradingTimeService time) { this.notification = notification; this.msgs = msgs; this.primaryAuctionT0Session = primaryAuctionT0Session; @@ -58,6 +60,7 @@ public class SessionManager { this.intermediateMkrSession = intermediateMkrSession; this.finalMkrSession = finalMkrSession; this.prepSession = prepSession; + this.paymSession = paymSession; this.returnDepositSession = returnDepositSession; sessionImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Session, Session.class); @@ -122,6 +125,7 @@ public class SessionManager { case MEDM -> session = intermediateMkrSession; case FINL -> session = finalMkrSession; case PREP -> session = prepSession; + case PAYM -> session = paymSession; case XDEP -> session = returnDepositSession; case UNIT -> session = unitedSession; }