From ae87df9e86872aeacf007c38e0e70d36778de061 Mon Sep 17 00:00:00 2001 From: ialbert Date: Thu, 20 Jun 2024 19:22:38 +0300 Subject: [PATCH] UNIT session fix: adjust value/5 step returns/inclusion conditions --- .../java/ru/spcex/clearing/session/stage/UnitedSession.java | 4 ++-- .../session/stage/impl/FormingPaymentInstructionAssets.java | 1 + .../clearing/session/stage/impl/InclusionObligations.java | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/UnitedSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/UnitedSession.java index d216e3bac..4164ed414 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/UnitedSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/UnitedSession.java @@ -227,8 +227,8 @@ public class UnitedSession extends AbstractSession implements InitializingBean { InspectionPoolPayload companyIdPayload = new InspectionPoolPayload(); companyIdPayload.setSessionId(currSession.getId()); companyIdPayload.setProcessedCompanyId(currSession.getCompanyId()); - //fixme checks inside the stages - runStage(TaskType.InspectionObligations, companyIdPayload, inspectionObligationsReturn); + //fixme checks inside the stages + //runStage(TaskType.InspectionObligations, companyIdPayload, inspectionObligationsReturn); runStage(TaskType.InspectionObligations, companyIdPayload, inspectionObligations); } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionAssets.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionAssets.java index efb3ee7ce..34e6a849d 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionAssets.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionAssets.java @@ -356,6 +356,7 @@ public class FormingPaymentInstructionAssets implements ISessionStage { } private BigDecimal adjustAmountByReturns(Registry amb, Long sessionId) {//companyid, tcr/account, sessionId, RUB + if (SessionType.UNIT.equals(sessionType)) return BigDecimal.ZERO; Long companyId = amb.getCompanyId(); Long tradingClearingRegistryId = amb.getTradingClearingRegistryId(); ImdgPredicateBuilder pb = registryImdg.predicateBuilder(); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InclusionObligations.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InclusionObligations.java index bc0f92484..877044b98 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InclusionObligations.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InclusionObligations.java @@ -117,6 +117,7 @@ public class InclusionObligations implements ISessionStage { } else { registryPredicate = prdctBuilder.and( defaultCondition, + SessionType.UNIT.equals(sessionType) ? prdctBuilder.equals("sessionId", sessionId) : prdctBuilder.alwaysTrue(), prdctBuilder.equals("registryStatus", RegistryStatus.PROC.getKey()) ); }