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()