From 49235b014679ac0c8a32e8302da1636036b3908b Mon Sep 17 00:00:00 2001 From: ialbert Date: Fri, 1 Aug 2025 14:16:45 +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=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D1=82=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f11b4d1b22e6126681eab96ad67fca0703e98a99. --- .../FormingPaymentInstructionReturnMkrAction.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 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 c23b3d341..224d92ba8 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 @@ -7,7 +7,6 @@ import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.function.Consumer; import java.util.stream.Collectors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -132,18 +131,11 @@ public class FormingPaymentInstructionReturnMkrAction extends AbstractSessionAct 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()); - Consumer updateBalanceTo0 = r -> { - log.debug("updating {}.id={} balance to 0...", r.getRegistryCode(), r.getId()); + dmx.get().setRegistryStatus(RegistryStatus.OK.getKey()); + receiverAmbO.ifPresent(r -> { r.setBalance(BigDecimal.ZERO); setUpdatedStoreInImdg(r, now); - }; - receiverAmbO.ifPresent(updateBalanceTo0); - rgsMng.findRelatedAsset( - lm_t.getTradingClearingRegistryId(), - lm_t.getCompanyId(), - cm_t.getSecuritySymbol(), - AM_B).ifPresent(updateBalanceTo0); - dmx.get().setRegistryStatus(RegistryStatus.OK.getKey()); + }); setUpdatedStoreInImdg(dmx.get(), now); continue; }