From f5a7842ab129d9c8a5872b60a36f8fbb22cf0ad1 Mon Sep 17 00:00:00 2001 From: ialbert Date: Thu, 8 Jun 2023 14:42:37 +0300 Subject: [PATCH] =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20PaymentInstruction=20=D0=BF=D0=BE=20=D0=B2=D0=BE=D0=B7?= =?UTF-8?q?=D0=B2=D1=80=D0=B0=D1=82=D0=B0=D0=BC=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=B8=D1=82=D0=BE=D0=B3=D0=BE=D0=B2=D0=BE=D0=B9=20=D1=81=D0=B5?= =?UTF-8?q?=D1=81=D1=81=D0=B8=D0=B8=20=D0=9C=D0=9A=D0=A0=20=D1=83=D1=81?= =?UTF-8?q?=D0=BB=D0=BE=D0=B2=D0=B8=D1=8F=20=D0=B8=20=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../builder/PaymentInstructionBuilderFinalMkrDeals.java | 8 ++++++++ .../stage/impl/FormingPaymentInstructionReturnMkr.java | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderFinalMkrDeals.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderFinalMkrDeals.java index 7a9d09623..8931ad3f1 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderFinalMkrDeals.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderFinalMkrDeals.java @@ -146,6 +146,9 @@ public class PaymentInstructionBuilderFinalMkrDeals { payment1.setDocumentNumber(nextDocumentNumber(lm_t, payment1)); payment1.setCreditLeg_direction(InOutDirection.out.getKey()); payment1.setDebitLeg_direction(InOutDirection.in.getKey()); + payment1.setCreditLeg_securityId(lm_t.getSecurityId()); + payment1.setDebitLeg_securityId(lm_t.getSecurityId()); + payment1.setSessionId(sessionId); } //**************** @@ -193,6 +196,11 @@ public class PaymentInstructionBuilderFinalMkrDeals { payment2.setDocumentNumber(nextDocumentNumber(cm_t, payment2)); payment2.setCreditLeg_direction(InOutDirection.out.getKey()); payment2.setDebitLeg_direction(InOutDirection.in.getKey()); + payment2.setCreditLeg_currencyCode(CurrencyCode.RUB.getKey()); + payment2.setDebitLeg_currencyCode(CurrencyCode.RUB.getKey()); + payment2.setCreditLeg_securityId(lm_t.getSecurityId()); + payment2.setDebitLeg_securityId(lm_t.getSecurityId()); + payment2.setSessionId(sessionId); } return new Pair<>(payment1, payment2); } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionReturnMkr.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionReturnMkr.java index 96c77284b..0d7721270 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionReturnMkr.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionReturnMkr.java @@ -89,7 +89,12 @@ public class FormingPaymentInstructionReturnMkr implements ISessionStage { RegistryCodeSqlBuilder registryCodeSqlBuilder = RegistryCodeSqlBuilder.getInstance(LM_T, CM_T); String registryCodeCondition = registryCodeSqlBuilder.build(); - Collection rgsAll = registryImdg.getCollectionObjectsBySQL(registryCodeCondition); + Collection rgsAll = registryImdg.getCollectionObjectsBySQL(registryCodeCondition) + .stream() + .filter(rgs -> rgs.getValueDate() != null) + .filter(rgs -> rgs.getSettlementDate() != null) + .filter(rgs -> rgs.getSettlementDate().isAfter(rgs.getValueDate())) + .toList(); log.debug("LM*T and CM*T size = {}", rgsAll.size()); List obligationsByMoney = rgsAll.stream()