From 9d2be448eee03cd61064fba937f4a0c48ad30b92 Mon Sep 17 00:00:00 2001 From: ialbert Date: Thu, 8 Jun 2023 15:56:30 +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=D1=80=D0=B8=20=D0=BE=D0=B1?= =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B5=20=D1=81=D0=B4=D0=B5?= =?UTF-8?q?=D0=BB=D0=BE=D0=BA=20=D0=B4=D0=BB=D1=8F=20=D0=B8=D1=82=D0=BE?= =?UTF-8?q?=D0=B3=D0=BE=D0=B2=D0=BE=D0=B9=20=D1=81=D0=B5=D1=81=D1=81=D0=B8?= =?UTF-8?q?=D0=B8=20=D0=9C=D0=9A=D0=A0=20fix=20payeeBic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../builder/PaymentInstructionBuilderFinalMkrDeals.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 d5cf1554d..0eefce6e1 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 @@ -86,6 +86,7 @@ public class PaymentInstructionBuilderFinalMkrDeals { Instant now = Instant.now(); String symbolPRC = selectSymbolValue(Sender.Prc.getId(), CompanySymbol.BIC); // 2 "НКО АО ПРЦ" + String tranBic; { // record 1 payment1 = new PaymentInstruction(); payment1.setCreated(now); @@ -93,11 +94,11 @@ public class PaymentInstructionBuilderFinalMkrDeals { payment1.setSenderId(lm_t.getCompanyId()); payment1.setAddresseeId(Sender.One.getId()); { - String addresseeBic = selectSymbolValue(payment1.getAddresseeId(), CompanySymbol.BIC); - if (addresseeBic == null) { + tranBic = selectSymbolValue(payment1.getAddresseeId(), CompanySymbol.BIC); + if (tranBic == null) { log.warn("CompanySymbols BIC not found for companyId={}", payment1.getAddresseeId()); } else { - payment1.setAdresseeBic(addresseeBic); + payment1.setAdresseeBic(tranBic); } } { @@ -178,7 +179,7 @@ public class PaymentInstructionBuilderFinalMkrDeals { payment2.setPayeeBankName(companyPRC.getShortName()); payment2.setAddresseeBankName(companyPRC.getShortName()); } - payment2.setPayeeBic(symbolPRC); + payment1.setAdresseeBic(tranBic); payment2.setPaymentDate(TimeUtil.localDateToInstant(lm_t.getSettlementDate())); payment2.setPaymentPurpose("Размещение депозита " + lm_t.getContract()); payment2.setSettlementDate(lm_t.getSettlementDate());