From be35cf9c5fe90ca409a8bc30634a8de79e005b55 Mon Sep 17 00:00:00 2001 From: etreshenkov Date: Tue, 23 May 2023 14:58:23 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-290 --- .../clearing/session/stage/PrimaryAuctionBnSession.java | 6 +++--- .../session/stage/impl/FormingPaymentInstruction.java | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) 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 507d1014a..71b24b379 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 @@ -119,15 +119,15 @@ public class PrimaryAuctionBnSession extends QueueConsumer implements Initializi runStage(TaskType.InclusionToPool, inclusionToPoolPayload, inclusionObligations); } //stage 5 - InspectionPoolPayload companyIdPayload = new InspectionPoolPayload(); - companyIdPayload.setProcessedCompanyId(currSession.getCompanyId()); { + InspectionPoolPayload companyIdPayload = new InspectionPoolPayload(); + companyIdPayload.setProcessedCompanyId(currSession.getCompanyId()); runStage(TaskType.InspectionObligations, companyIdPayload, inclusionObligations); } //stage 6 runStage(TaskType.FormingRegistersOnOS, formingRegistersOnOS); //returns Collection //stage 7 - runStage(TaskType.FormingPaymentInstruction, companyIdPayload, formingPaymentInstruction); + runStage(TaskType.FormingPaymentInstruction, formingPaymentInstruction); //stage 8 { UnlockResourcesPayload unlockResourcesPayload = new UnlockResourcesPayload(); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstruction.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstruction.java index 0867d22af..49302f1b4 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstruction.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstruction.java @@ -13,7 +13,6 @@ import ru.spcex.clearing.service.builder.sql.RegistryCodeSqlBuilder; import ru.spcex.clearing.session.stage.ISessionStage; import ru.spcex.clearing.session.stage.StageResult; import ru.spcex.clearing.session.stage.Task; -import ru.spcex.clearing.session.stage.task.InspectionPoolPayload; import ru.spcex.platform.enumeration.RegistryDesignation; import ru.spcex.platform.enumeration.RegistryInstrumentType; import ru.spcex.platform.enumeration.RegistryUnit; @@ -48,10 +47,9 @@ public class FormingPaymentInstruction implements ISessionStage { @Override public StageResult submit(Task task) { - InspectionPoolPayload payload = (InspectionPoolPayload) task.getData(); switch (task.getTaskType()) { case FormingPaymentInstruction -> { - return formingPaymentInstruction(payload.getProcessedCompanyId()); + return formingPaymentInstruction(); } default -> { throw new IllegalStateException("Unknown task type: " + task.getTaskType()); @@ -60,7 +58,7 @@ public class FormingPaymentInstruction implements ISessionStage { } - private StageResult formingPaymentInstruction(Long processedCompanyId) { + private StageResult formingPaymentInstruction() { RegistryTradingParams registryTradingParamsL = new RegistryTradingParams(RegistryDesignation.L, RegistryInstrumentType.S, null, RegistryUnit.T); RegistryTradingParams registryTradingParamsC = new RegistryTradingParams(RegistryDesignation.C,