From 2319f1a345243169edd9ba67645c90c0d1366236 Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Thu, 8 Jun 2023 15:09:13 +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=20=D0=BF=D0=BE=D0=BB=D1=8F=20Adress?=
 =?UTF-8?q?eeBic/PayeeBic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...aymentInstructionBuilderFinalMkrDeals.java | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 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 aa745265d..d5cf1554d 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
@@ -92,24 +92,31 @@ public class PaymentInstructionBuilderFinalMkrDeals {
             payment1.setClearingDate(TimeUtil.toLocalDate(now));
             payment1.setSenderId(lm_t.getCompanyId());
             payment1.setAddresseeId(Sender.One.getId());
-            String symbol1 = selectSymbolValue(payment1.getAddresseeId(), CompanySymbol.BIC);
-            if (symbol1 == null) {
-                log.warn("CompanySymbols BIC not found for companyId={}", payment1.getAddresseeId());
-            } else {
-                payment1.setAdresseeBic(symbol1);
+            {
+                String addresseeBic = selectSymbolValue(payment1.getAddresseeId(), CompanySymbol.BIC);
+                if (addresseeBic == null) {
+                    log.warn("CompanySymbols BIC not found for companyId={}", payment1.getAddresseeId());
+                } else {
+                    payment1.setAdresseeBic(addresseeBic);
+                }
             }
-
-            Company companyPRC = companyImdg.getSingleObjectByID(Sender.Prc.getId()); // 2 "НКО АО ПРЦ"
-            String companyPRCName = null;
-            if (companyPRC == null) {
-                log.warn("Company.id={} not found", Sender.Prc.getId());
-            } else {
-                companyPRCName = companyPRC.getShortName();
+            {
+                Company companyPRC = companyImdg.getSingleObjectByID(Sender.Prc.getId()); // 2 "НКО АО ПРЦ"
+                if (companyPRC == null) {
+                    log.warn("Company.id={} not found", Sender.Prc.getId());
+                } else {
+                    payment1.setPayeeBankName(companyPRC.getShortName());
+                    payment1.setAddresseeBankName(companyPRC.getShortName());
+                }
+            }
+            {
+                String payeeBic = selectSymbolValue(payment1.getSenderId(), CompanySymbol.BIC);
+                if (payeeBic == null) {
+                    log.warn("payeeBic by senderId={} not found", payment1.getSenderId());
+                } else {
+                    payment1.setPayeeBic(payeeBic);
+                }
             }
-            payment1.setPayeeBankName(companyPRCName);
-            payment1.setPayeeBic(symbolPRC);
-
-            payment1.setAddresseeBankName(companyPRCName);
 
             payment1.setPaymentDate(TimeUtil.localDateToInstant(lm_t.getSettlementDate()));