From 15d836fade81aa1c46e5db8fdea5f66b30da9343 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Tue, 7 Feb 2023 11:07:33 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/ru/spcex/clearing/service/Clearing.java    | 9 ++++-----
 .../service/builder/PaymentInstructionCreator.java       | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/Clearing.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/Clearing.java
index 23d5d81a9..d6111abc7 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/Clearing.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/Clearing.java
@@ -230,11 +230,10 @@ public class Clearing {
             var secondLegLiabilitiesClaimsMoney = lcmSecondLegFound.orElseGet(() -> wrapperSecondLegCreated.secondLegCreated);
             log.trace("updating  LiabilitiesClaimsMoney by payment");
             log.trace("firstLegLiabilitiesClaimsMoney: {}; secondLegLiabilitiesClaimsMoney: {}", firstLegLiabilitiesClaimsMoney, secondLegLiabilitiesClaimsMoney);
-            paymentInstructionCreator.updateFieldLiabilitiesClaimsMoneyByPayment(firstLegLiabilitiesClaimsMoney, true, paymentInstructions, Collections.singleton(category));
-            liabilitiesClaimsMoneyImdg.update(firstLegLiabilitiesClaimsMoney);
-            paymentInstructionCreator.updateFieldLiabilitiesClaimsMoneyByPayment(secondLegLiabilitiesClaimsMoney, false, paymentInstructions, Collections.singleton(category));
-            liabilitiesClaimsMoneyImdg.update(secondLegLiabilitiesClaimsMoney);
-            log.trace("LiabilitiesClaimsMoney first leg {}, second leg {} was updated", firstLegLiabilitiesClaimsMoney.getId(), secondLegLiabilitiesClaimsMoney.getId());
+            if (paymentInstructionCreator.updateFieldLiabilitiesClaimsMoneyByPayment(firstLegLiabilitiesClaimsMoney, true, paymentInstructions, Collections.singleton(category)) ) {
+                liabilitiesClaimsMoneyImdg.update(firstLegLiabilitiesClaimsMoney);
+                log.trace("LiabilitiesClaimsMoney first leg {} was updated", firstLegLiabilitiesClaimsMoney.getId(), secondLegLiabilitiesClaimsMoney.getId());
+            }
             log.trace("firstLegLiabilitiesClaimsMoney: {}; secondLegLiabilitiesClaimsMoney: {}", firstLegLiabilitiesClaimsMoney, secondLegLiabilitiesClaimsMoney);
             execDeposit.setSessionId(clearingSessionId);
             execDeposit.setUpdated(Instant.now());
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 25b5cafea..53b837b2e 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
@@ -522,13 +522,13 @@ public class PaymentInstructionCreator {
 
         if (clearingCategory.contains(ClearingCategory.B)) {
             if (isFirstLeg) {
-                // liabilitiesAmount не меняется ;
-            }
-            if (isSecondLeg) {
                 BigDecimal amount = safeBD(liabilitiesClaimsMoney.getClaimsAmount()).subtract(bdFromLongSafe(paymentIAny.getDebitLegAmount()));
                 liabilitiesClaimsMoney.setClaimsAmount(amount);
                 modified = true;
             }
+            if (isSecondLeg) {
+                // liabilitiesAmount не меняется ;
+            }
         }
 
         if (modified) {