From 81a39b9dbefa7f54afe37bec32ee5aa98d28a816 Mon Sep 17 00:00:00 2001 From: ialbert Date: Fri, 1 Aug 2025 15:56:43 +0300 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=BE=D1=80=D0=BC=D0=B8=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20PaymentInstruction,=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=BF=D1=83=D1=81=D0=BA=20=D0=BF=D1=80=D0=B8=20?= =?UTF-8?q?=D0=BD=D0=B0=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 --- ...FormingPaymentInstructionAssetsAction.java | 86 ++++++++++++++----- 1 file changed, 64 insertions(+), 22 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/FormingPaymentInstructionAssetsAction.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/FormingPaymentInstructionAssetsAction.java index 3c3d3f8e6..481fe0d79 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/FormingPaymentInstructionAssetsAction.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/FormingPaymentInstructionAssetsAction.java @@ -189,7 +189,20 @@ public class FormingPaymentInstructionAssetsAction extends AbstractSessionAction Account debitLegAccount; Account creditLegAccount; BigDecimal amount; - amount = safeBD(registry.getBalance()).add(adjustAmountByReturns(registry, sessionId)); + Collection oAndT = loadLiabilitiesAndClaims(registry, sessionId); + Optional dmx = searchDmx(registry, oAndT); + if (dmx.isPresent()) { + log.debug("{}.id={} found {}.id={}, skipping PaymentInstruction creation", + registry.getRegistryCode(), registry.getId(), + dmx.get().getRegistryCode(), dmx.get().getId()); + continue; + } + BigDecimal adjustByReturns = adjustAmountByReturns(oAndT); + log.debug("{}.id={} adjust by returns value {}", + registry.getRegistryCode(), + registry.getId(), + adjustByReturns); + amount = safeBD(registry.getBalance()).add(adjustByReturns); boolean isPositiveBalance = amount.compareTo(BigDecimal.ZERO) > 0; if (amount.compareTo(BigDecimal.ZERO) == 0) { continue; @@ -349,6 +362,30 @@ public class FormingPaymentInstructionAssetsAction extends AbstractSessionAction } } + private Optional searchDmx(Registry asset, Collection oAndT) { + ImdgPredicateBuilder pb = registryImdg.predicateBuilder(); + Registry tOrO = oAndT + .stream() + .findFirst() + .orElse(null); + if (tOrO == null) { + log.debug("couldn't find O/T for {}.id={}, not searching DM*X", asset.getRegistryCode(), asset.getId()); + return Optional.empty(); + } + ImdgPredicate dmxPrdct = pb.and( + pb.sql(RegistryCodeSqlBuilder.getInstance(DM_X).build()), + pb.equals("companyId", tOrO.getCounterPartyId()), + pb.equals("contract", tOrO.getContract()), + pb.equals("registryStatus", RegistryStatus.OK.getKey()) + ); + log.debug("{}.id={}, searching DM*X by {}", asset.getRegistryCode(), asset.getId(), dmxPrdct); + Registry dmx = registryImdg.getSingleObjectByPredicate(dmxPrdct); + if (dmx == null) { + log.debug("{}.id={}, didn't find DM*X", asset.getRegistryCode(), asset.getId()); + } + return Optional.ofNullable(dmx); + } + private Collection selectAMBRegistries(Long sessionId) { ImdgPredicateBuilder rgsPb = registryImdg.predicateBuilder(); RegistryCodeSqlBuilder registryCodeSqlBuilder = RegistryCodeSqlBuilder.getInstance( @@ -373,8 +410,7 @@ public class FormingPaymentInstructionAssetsAction extends AbstractSessionAction return registryImdg.getCollectionObjectsByPredicate(rgsCodePrdct); } - private BigDecimal adjustAmountByReturns(Registry amb, Long sessionId) {//companyid, tcr/account, sessionId, RUB - if (SessionType.UNIT.equals(sessionType)) return BigDecimal.ZERO; + private Collection loadLiabilitiesAndClaims(Registry amb, Long sessionId) { Long companyId = amb.getCompanyId(); Long tradingClearingRegistryId = amb.getTradingClearingRegistryId(); ImdgPredicateBuilder pb = registryImdg.predicateBuilder(); @@ -388,26 +424,32 @@ public class FormingPaymentInstructionAssetsAction extends AbstractSessionAction pb.sql(RegistryCodeSqlBuilder.getInstance(TM_T).build()) ) ); - BigDecimal reduce = registryImdg.getCollectionObjectsByPredicate(cL) - .stream() - .filter(rgs -> rgs.getValueDate() != null) - .filter(rgs -> rgs.getSettlementDate() != null) - .filter(rgs -> rgs.getSettlementDate().isAfter(rgs.getValueDate())) - .map(rgs -> { - if (RegistryDesignation.T.equalsByKey(rgs.getRegistryDesignation())) { - return rgs.getBalance(); - } else { - return rgs.getBalance().abs().negate(); - } - }) - .reduce(BigDecimal.ZERO, BigDecimal::add); - log.debug("{}.id={} {} adjust value {}", - amb.getRegistryCode(), - amb.getId(), - cL, - reduce); - return reduce; + log.debug("{}.id={} search adjust O/T: {}", amb.getRegistryCode(), amb.getId(), cL); + List list = registryImdg + .getCollectionObjectsByPredicate(cL) + .stream() + .filter(rgs -> rgs.getValueDate() != null) + .filter(rgs -> rgs.getSettlementDate() != null) + .filter(rgs -> rgs.getSettlementDate().isAfter(rgs.getValueDate())) + .toList(); + log.debug("{}.id={} adjust O/T found: {}", amb.getRegistryCode(), amb.getId(), list.size()); + return list; + } + private BigDecimal adjustAmountByReturns(Collection lAndC) {//companyid, tcr/account, sessionId, RUB + if (SessionType.UNIT.equals(sessionType)) return BigDecimal.ZERO; + return lAndC.stream() + .filter(rgs -> rgs.getValueDate() != null) + .filter(rgs -> rgs.getSettlementDate() != null) + .filter(rgs -> rgs.getSettlementDate().isAfter(rgs.getValueDate())) + .map(rgs -> { + if (RegistryDesignation.T.equalsByKey(rgs.getRegistryDesignation())) { + return rgs.getBalance(); + } else { + return rgs.getBalance().abs().negate(); + } + }) + .reduce(BigDecimal.ZERO, BigDecimal::add); } private void setUpdatedStoreInImdg(Registry rgs, Instant now) {