From 690ab4c35d6acc4eee93a339a480bfea435749d8 Mon Sep 17 00:00:00 2001 From: ialbert Date: Fri, 7 Jul 2023 19:31:56 +0300 Subject: [PATCH] =?UTF-8?q?PaymentInstruction#paymentPurpose=20=D1=80?= =?UTF-8?q?=D0=B0=D1=81=D0=BC=D0=B5=D1=89=D0=B5=D0=BD=D0=B8=D0=B5=20"?= =?UTF-8?q?=D0=A0=D0=B0=D0=B7=D0=BC=D0=B5=D1=89=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=B4=D0=B5=D0=BF=D0=BE=D0=B7=D0=B8=D1=82=D0=B0=20...=20=D0=BF?= =?UTF-8?q?=D0=BE=20=D0=A2=D0=9A=D0=A0=20..."?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../builder/PaymentInstructionBuilderFinalMkrDeals.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 0279ac510..28808e528 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 @@ -121,7 +121,7 @@ public class PaymentInstructionBuilderFinalMkrDeals { payment1.setPaymentDate(TimeUtil.localDateToInstant(lm_t.getSettlementDate())); - payment1.setPaymentPurpose("Размещение депозита " + lm_t.getContract()); + payment1.setPaymentPurpose(paymentPurpose(lm_t)); payment1.setSettlementDate(lm_t.getSettlementDate()); @@ -181,7 +181,7 @@ public class PaymentInstructionBuilderFinalMkrDeals { } payment2.setAdresseeBic(tranBic); payment2.setPaymentDate(TimeUtil.localDateToInstant(lm_t.getSettlementDate())); - payment2.setPaymentPurpose("Размещение депозита " + lm_t.getContract()); + payment2.setPaymentPurpose(paymentPurpose(lm_t)); payment2.setSettlementDate(lm_t.getSettlementDate()); BigDecimal amount = lm_t.getBalance() == null ? null : lm_t.getBalance().abs(); payment2.setCreditLeg_amount(amount); @@ -213,6 +213,10 @@ public class PaymentInstructionBuilderFinalMkrDeals { return new Pair<>(payment1, payment2); } + private static String paymentPurpose(Registry rgs) { + return "Размещение депозита " + rgs.getContract() + " по ТКР " + rgs.getTradingClearingRegistry(); + } + protected String nextDocumentNumber(Registry rgs, PaymentInstruction paymentInstruction) { LocalDate nowD = LocalDate.now(); if (documentNumberResetAt == null || documentNumberResetAt.isBefore(nowD)) synchronized (this) {