diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PaymSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PaymSession.java index f88c279bb..962800924 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PaymSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PaymSession.java @@ -11,7 +11,6 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import ru.clearing.classes.statics.data.execution.ExecutionCommon; import ru.clearing.classes.statics.data.execution.ExecutionCurrency; -import ru.clearing.classes.statics.data.execution.ExecutionFond; import ru.clearing.classes.statics.data.misc.Session; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; @@ -20,13 +19,11 @@ import ru.spcex.clearing.session.stage.impl.DealsPrepare; import ru.spcex.clearing.session.stage.impl.EndStageNotification; import ru.spcex.clearing.session.stage.impl.FinishingSession; import ru.spcex.clearing.session.stage.impl.FormingPaymentInstructionAssets; -import ru.spcex.clearing.session.stage.impl.FormingRegistersOnOS; import ru.spcex.clearing.session.stage.impl.InclusionObligations; import ru.spcex.clearing.session.stage.impl.InspectionObligationsV2; import ru.spcex.clearing.session.stage.impl.ObligationAdmission; import ru.spcex.clearing.session.stage.impl.PaymentInfo; import ru.spcex.clearing.session.stage.impl.RequirementsAndObligationCreation; -import ru.spcex.clearing.session.stage.impl.UnlockResources; import ru.spcex.clearing.session.stage.monitor.SessionMonitor; import ru.spcex.clearing.session.stage.monitor.SessionMonitorFactory; import ru.spcex.clearing.session.stage.task.DealsPreparePayload; @@ -56,15 +53,12 @@ public class PaymSession extends AbstractSession implements InitializingBean { private final InspectionObligationsV2 inspectionObligations; private final FormingPaymentInstructionAssets formingPaymentInstructionAssets; - private final UnlockResources unlockResources; private final FinishingSession finishingSession; private final EndStageNotification endStageNotification; - private final Imdg executionFondImdg; private final Imdg executionCurrencyImdg; private final Supplier> marketCodes; private SessionMonitor afterPaymentsReviseMonitor; - private SessionMonitor afterReviseErrorMonitor; public PaymSession( @@ -73,9 +67,8 @@ public class PaymSession extends AbstractSession implements InitializingBean { RequirementsAndObligationCreation requirementsAndObligationCreation, ObligationAdmission obligationsAdmission, InclusionObligations inclusionObligations, - FormingRegistersOnOS formingRegistersOnOS, BalanceRevise balanceRevise, + BalanceRevise balanceRevise, FormingPaymentInstructionAssets formingPaymentInstructionAssets, - UnlockResources unlockResources, FinishingSession finishingSession, EndStageNotification endStageNotification, IMessageResolver messageResolver, @@ -88,10 +81,8 @@ public class PaymSession extends AbstractSession implements InitializingBean { this.inclusionObligations = inclusionObligations; this.balanceRevise = balanceRevise; this.formingPaymentInstructionAssets = formingPaymentInstructionAssets; - this.unlockResources = unlockResources; this.finishingSession = finishingSession; this.endStageNotification = endStageNotification; - this.executionFondImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ExecutionFond, ExecutionFond.class); this.executionCurrencyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ExecutionCurrency, ExecutionCurrency.class); this.inspectionObligations = inspectionObligations; this.marketCodes = marketCodes; @@ -178,8 +169,8 @@ public class PaymSession extends AbstractSession implements InitializingBean { log.info("session is running, stage {}, monitors: {}", currStage.get(), logMonitors(afterPaymentsReviseMonitor)); - if (afterReviseErrorMonitor != null && isMonitorPassed(afterReviseErrorMonitor, req.getRequestPayload())) { - afterReviseErrorMonitor = null; + if (afterPaymentsReviseMonitor != null && isMonitorPassed(afterPaymentsReviseMonitor, req.getRequestPayload())) { + afterPaymentsReviseMonitor = null; finishPart(); return; }