From 19222032264763a4c2e6fb10f62fa6cd2832184d Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Mon, 6 Feb 2023 12:36:45 +0300
Subject: [PATCH] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-189=20Payme?=
 =?UTF-8?q?ntInstructionCreator=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?payment1/2.getAddresseeId=20=D0=BF=D0=BE=20executionDeposit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../builder/PaymentInstructionCreator.java    | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionCreator.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionCreator.java
index 7409b8516..465dbbb81 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionCreator.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionCreator.java
@@ -7,6 +7,7 @@ import org.springframework.stereotype.Service;
 import ru.clearing.classes.statics.data.account.Account;
 import ru.clearing.classes.statics.data.company.Company;
 import ru.clearing.classes.statics.data.company.CompanySymbols;
+import ru.clearing.classes.statics.data.execution.ExecutionDeposit;
 import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets;
 import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsMoney;
 import ru.clearing.classes.statics.data.payment.PaymentInstruction;
@@ -48,6 +49,7 @@ public class PaymentInstructionCreator {
     protected final Imdg<Account> accountImdg;
     protected final Imdg<PaymentInstruction> paymentInstructionImdg;
     protected final Imdg<LiabilitiesClaimsMoney> liabilitiesClaimsMoneyImdg;
+    protected final Imdg<ExecutionDeposit> executionDepositImdg;
 
     protected AtomicLong documentNumberId = new AtomicLong(0L); // порядковый номер (сквозной по всем компаниям за день
     protected LocalDate documentNumberResetAt;
@@ -60,6 +62,7 @@ public class PaymentInstructionCreator {
         this.accountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Account, Account.class);
         this.paymentInstructionImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_PaymentInstruction, PaymentInstruction.class);
         this.liabilitiesClaimsMoneyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsMoney, LiabilitiesClaimsMoney.class);
+        this.executionDepositImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ExecutionDeposit, ExecutionDeposit.class);
         this.idGenerator = imdgProvider.getImdgIdGenerator();
     }
 
@@ -107,13 +110,13 @@ public class PaymentInstructionCreator {
             payment2.setSenderId(SPVB_ID); // СПВБ
 
             payment1.setAddresseeId(SPVB_ID); // СПВБ
-            String sqlLCA = String.format("securityId = %s and companyId <> %s",
+            String sqlLCA = String.format("securityId = %s and companyId != %s",
                     liabilitiesClaimsAssets.getSecurityId(), liabilitiesClaimsAssets.getCompanyId());
-            LiabilitiesClaimsAssets counterLiabilitiesClaimsAssets = liabilitiesClaimsAssetsImdg.getSingleObjectBySQL(sqlLCA);
-            if (counterLiabilitiesClaimsAssets == null) {
-                log.warn("Counter LiabilitiesClaimsAssets not found for : {}", sqlLCA);
+            ExecutionDeposit counterExecutionDeposit = executionDepositImdg.getSingleObjectBySQL(sqlLCA);
+            if (counterExecutionDeposit == null) {
+                log.warn("Counter ExecutionDeposit not found for : {}", sqlLCA);
             } else {
-                payment2.setAddresseeId(counterLiabilitiesClaimsAssets.getCompanyId());
+                payment2.setAddresseeId(counterExecutionDeposit.getCompanyId());
             }
 
             String symbol1 = selectSymbolValue(payment1.getAddresseeId(), CompanySymbol.BIC);
@@ -231,13 +234,13 @@ public class PaymentInstructionCreator {
 
                 payment1.setSenderId(SPVB_ID); // СПВБ
 
-                String sqlLCA = String.format("securityId = %s and companyId <> %s",
+                String sqlLCA = String.format("securityId = %s and companyId != %s",
                         liabilitiesClaimsAssets.getSecurityId(), liabilitiesClaimsAssets.getCompanyId());
-                LiabilitiesClaimsAssets counterLiabilitiesClaimsAssets = liabilitiesClaimsAssetsImdg.getSingleObjectBySQL(sqlLCA);
-                if (counterLiabilitiesClaimsAssets == null) {
-                    log.warn("Counter LiabilitiesClaimsAssets not found for : {}", sqlLCA);
+                ExecutionDeposit counterExecutionDeposit = executionDepositImdg.getSingleObjectBySQL(sqlLCA);
+                if (counterExecutionDeposit == null) {
+                    log.warn("Counter ExecutionDeposit not found for : {}", sqlLCA);
                 } else {
-                    payment1.setAddresseeId(counterLiabilitiesClaimsAssets.getCompanyId());
+                    payment1.setAddresseeId(counterExecutionDeposit.getCompanyId());
                 }
 
                 String symbol1 = selectSymbolValue(payment1.getAddresseeId(), CompanySymbol.BIC);