From 6b34b26852536a4d23530c20415fce8c1f782305 Mon Sep 17 00:00:00 2001 From: ialbert Date: Tue, 30 May 2023 11:59:21 +0300 Subject: [PATCH] Secondary SecondaryAuctionT0Session session fix --- .../session/stage/SecondaryAuctionT0Session.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 33fe7aa24..674e05f57 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 @@ -86,6 +86,7 @@ public class SecondaryAuctionT0Session extends AbstractSession implements Initia dealsPrepare.addExecutionFondCondition(execFondPb.in("market", marketCodes.get().toArray(new String[0]))); } + @Override public void runSession(BaseRequest req) { if (!startSession()) { return; @@ -146,15 +147,14 @@ public class SecondaryAuctionT0Session extends AbstractSession implements Initia //stage 7 StageResult> paymentResult = runStage(TaskType.FormingPaymentInstruction, formingPaymentInstruction); if (paymentResult.getStageResult().isEmpty()) { - runStage(TaskType.ContinueRevise, balanceRevise); - finishPart(req); + runStage(TaskType.FormingPaymentInstruction, balanceRevise); +// finishPart(req); } } catch (StageException e) { //already logged } } - public void finishPart(BaseRequest req) { try { if (!checkStage(TaskType.FormingPaymentInstruction)) { @@ -171,6 +171,7 @@ public class SecondaryAuctionT0Session extends AbstractSession implements Initia { EndStageNotificationPayload payload = new EndStageNotificationPayload(); payload.setSection(currSession.getSection()); + payload.setSessionId(currSession.getId()); runStage(TaskType.EndStageNotification, payload, endStageNotification); } } catch (StageException e) { @@ -184,10 +185,12 @@ public class SecondaryAuctionT0Session extends AbstractSession implements Initia log.info("already running session.id={}", this.currSession.getId()); return false; } else { + TaskType startStatus = TaskType.StartRevise; Session newSession = new Session(); newSession.setSection(Section.FOND.getKey()); newSession.setSessionType(SessionType.TRDT.getKey()); - newSession.setSessionStatus(SessionStatus.CLRN.getKey()); + newSession.setSessionStatus(startStatus.getKey()); + newSession.setWorkflowStatus(SessionStatus.ACTV.getKey()); newSession.setClearingDate(LocalDate.now()); //todo companyId/securityId/userId передается из сообщения очереди