diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/InspectionObligationsDepositReturnAction.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/InspectionObligationsDepositReturnAction.java index fe5d093ed..85b609b13 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/InspectionObligationsDepositReturnAction.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/InspectionObligationsDepositReturnAction.java @@ -50,7 +50,7 @@ import static ru.spcex.platform.utils.number.BigDecimalUtil.safeBD; @Service @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) -public class InspectionObligationsDepositReturnAction extends AbstractSessionActionForOkErrorHandling { +public class InspectionObligationsDepositReturnAction extends ReviseStage1Action { private final Logger log = LoggerFactory.getLogger(getClass()); private final Imdg registryImdg; private final Imdg categoryImdg; @@ -64,6 +64,7 @@ public class InspectionObligationsDepositReturnAction extends AbstractSessionAct @Autowired public InspectionObligationsDepositReturnAction(ImdgProvider imdgProvider, RegistryManager rgsMng, AssetTBFProcessing assets, TradingTimeService tradingTimeService, GatewayRequester gateway, PlanBalanceCalc planBalanceCalc) { + super(imdgProvider); this.registryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Registry, Registry.class); this.categoryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class); this.rgsMng = rgsMng; @@ -75,7 +76,8 @@ public class InspectionObligationsDepositReturnAction extends AbstractSessionAct } @Override - protected void actualExecute(StateContext ctx) { + public void actualExecute(StateContext ctx) { + super.actualExecute(ctx); Long sessionId = ctx.getExtendedState().get(DataEnum.sessionId, Long.class); this.sessionType = ctx.getExtendedState().get(DataEnum.sessionType, SessionType.class); String sqlCondition = String.format("(%s) and registryStatus = '%s'", diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/InspectionObligationsV2Action.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/InspectionObligationsV2Action.java index 7def16b29..675dca7dc 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/InspectionObligationsV2Action.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/InspectionObligationsV2Action.java @@ -62,7 +62,7 @@ import static ru.spcex.platform.utils.number.BigDecimalUtil.safeBD; @Service @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) -public class InspectionObligationsV2Action extends AbstractSessionActionForOkErrorHandling { +public class InspectionObligationsV2Action extends ReviseStage1Action { private final Logger log = LoggerFactory.getLogger(getClass()); private final Imdg registryImdg; private final ImdgId idGen; @@ -78,6 +78,7 @@ public class InspectionObligationsV2Action extends AbstractSessionActionForOkErr GatewayRequester gateway, PlanBalanceCalc planBalanceCalc ) { + super(imdgProvider); this.registryImdg = imdgProvider.getCashingImdg(IMDGDistributedNames.Map_Registry, Registry.class, null); this.idGen = imdgProvider.getImdgIdGenerator(); this.gateway = gateway; @@ -93,8 +94,9 @@ public class InspectionObligationsV2Action extends AbstractSessionActionForOkErr @Override - protected void actualExecute(StateContext ctx) { + public void actualExecute(StateContext ctx) { try { + super.actualExecute(ctx); Long sessionId = ctx.getExtendedState().get(DataEnum.sessionId, Long.class); this.sessionType = ctx.getExtendedState().get(DataEnum.sessionType, SessionType.class); inspectionObligations(sessionId, ctx); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/ReviseStage1Action.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/ReviseStage1Action.java index 01b4980c1..b77fe22d0 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/ReviseStage1Action.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/ReviseStage1Action.java @@ -23,7 +23,7 @@ import ru.spcex.platform.imdg.api.predicate.specific.RegistryCodeSqlBuilder; @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) public class ReviseStage1Action extends AbstractSessionActionForOkErrorHandling { private final Logger log = LoggerFactory.getLogger(getClass()); - private Imdg registryImdg; + private final Imdg registryImdg; @Autowired public ReviseStage1Action(ImdgProvider imdgProvider) {