From 679a64bd853026e995345a6ae34ae86b016d8938 Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Fri, 1 Aug 2025 14:16:46 +0300
Subject: [PATCH] =?UTF-8?q?Revert=20"=D1=84=D0=BE=D1=80=D0=BC=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20PaymentInstruction,=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=B2=D0=BE=D0=B7=D0=B2=D1=80=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B0=20=D0=B4=D0=B5=D0=BF=D0=BE=D0=B7=D0=B8=D1=82=D0=BE=D0=B2?=
 =?UTF-8?q?:=20=D0=BE=D0=B1=D0=BD=D1=83=D0=BB=D1=8F=D1=8E=20=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=BB=D0=B0=D0=BD=D1=81=20AM*B=20=D1=80=D0=B5=D0=B3=D0=B8?=
 =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B0=20=D0=BF=D1=80=D0=B8=20=D0=BD=D0=B0?=
 =?UTF-8?q?=D0=BB=D0=B8=D1=87=D0=B8=D0=B8=20DM*X"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit bcbc335089aaafed734259357a2e7c1098603b64.
---
 .../FormingPaymentInstructionReturnMkrAction.java     | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/FormingPaymentInstructionReturnMkrAction.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/FormingPaymentInstructionReturnMkrAction.java
index 224d92ba8..2ceea46ec 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/FormingPaymentInstructionReturnMkrAction.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/FormingPaymentInstructionReturnMkrAction.java
@@ -125,17 +125,11 @@ public class FormingPaymentInstructionReturnMkrAction extends AbstractSessionAct
             }
             Registry lm_t = lmtO.get(); //obligation by money
             Registry cm_t = cmtO.get();
-            //изменение активов - блокируем средства беред отправкой sdf'ов
-            Optional<Registry> receiverAmbO = rgsMng.findRelatedAsset(cm_t.getTradingClearingRegistryId(), cm_t.getCompanyId(), lm_t.getSecuritySymbol(), AM_B);
             Optional<Registry> dmx = rgsMng.searchDmxByCounterPartyNotOk(lm_t);
             if (dmx.isPresent()) {
                 log.debug("LM*T#id={}, DM*X#id={} found, no action needed for group {}, skipping liability",
                     lm_t.getId(), dmx.get().getId(), lm_t.getGroupId());
                 dmx.get().setRegistryStatus(RegistryStatus.OK.getKey());
-                receiverAmbO.ifPresent(r -> {
-                    r.setBalance(BigDecimal.ZERO);
-                    setUpdatedStoreInImdg(r, now);
-                });
                 setUpdatedStoreInImdg(dmx.get(), now);
                 continue;
             }
@@ -158,12 +152,13 @@ public class FormingPaymentInstructionReturnMkrAction extends AbstractSessionAct
             }
             {
                 //изменение активов - блокируем средства беред отправкой sdf'ов
+                Optional<Registry> receiverAmtO = rgsMng.findRelatedAsset(cm_t.getTradingClearingRegistryId(), cm_t.getCompanyId(), lm_t.getSecuritySymbol(), AM_B);
                 log.debug("changing A* registers based on LM_T.id={} and CM_T.id={} found AM*T(receiver).id={}",
                     lm_t.getId(),
                     cm_t.getId(),
-                    receiverAmbO.map(Registry::getId).orElse(null)
+                    receiverAmtO.map(Registry::getId).orElse(null)
                 );
-                receiverAmbO.ifPresent(amt -> {
+                receiverAmtO.ifPresent(amt -> {
                     // у отправителя и получателя одинаково, см. в FormingPaymentInstruction
                     amt.setSettledDebit(safeBD(amt.getSettledDebit()).add(safeBD(lm_t.getBalance())));
                     setUpdatedStoreInImdg(amt, now);