From 76ba3463cf98cbea0092e0608d26a06997159fb6 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Thu, 31 Aug 2023 14:38:52 +0300 Subject: [PATCH] =?UTF-8?q?clearing-service=20=D1=81=D1=82=D0=B0=D1=82?= =?UTF-8?q?=D1=83=D1=81=D1=8B=20=D0=B2=20InspectionObligationsDepositRetur?= =?UTF-8?q?n=20=D0=BF=D1=80=D0=B8=20=D0=BD=D0=B5=D0=BF=D0=BE=D0=BB=D0=BD?= =?UTF-8?q?=D0=BE=D0=BC=20=D0=BF=D0=BE=D0=BA=D1=80=D1=8B=D1=82=D0=B8=D0=B8?= =?UTF-8?q?=20amount=20=D0=B4=D0=BB=D1=8F/=D0=B4=D0=BE=20=D1=84=D0=B8?= =?UTF-8?q?=D0=BD=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B9=20=D1=81=D1=82=D0=B0?= =?UTF-8?q?=D0=B4=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InspectionObligationsDepositReturn.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsDepositReturn.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsDepositReturn.java index e7e0f306a..90349d623 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsDepositReturn.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsDepositReturn.java @@ -75,7 +75,7 @@ public class InspectionObligationsDepositReturn implements ISessionStage { Optional omtInGroupO = group.stream().filter(registry -> equalByRgs(OM_T, registry)).findFirst(); if (omtInGroupO.isEmpty()) { log.error("groupId {} failed to find OM*T registry", entry.getKey()); - group.forEach(rgs -> updateStatus(rgs, registryStatusFailed())); + group.forEach(rgs -> updateStatus(rgs, registryStatusFailed())); // FAIL or MNG continue; } Registry omtRgs = omtInGroupO.get(); @@ -112,7 +112,7 @@ public class InspectionObligationsDepositReturn implements ISessionStage { Optional amfAssetO = searchAssetByOMT(omtRgs); if (amfAssetO.isEmpty()) { log.error("OM*T register.id={} groupId={} failed to find AM*F asset", omtRgs.getId(), entry.getKey()); - group.forEach(rgs -> updateStatus(rgs, registryStatusFailed())); + group.forEach(rgs -> updateStatus(rgs, registryStatusFailed())); // FAIL or MNG continue; } @@ -130,11 +130,12 @@ public class InspectionObligationsDepositReturn implements ISessionStage { if (dmtBalance.compareTo(omtBalance) >= 0 && amfBalance.compareTo(omtBalance) >=0) { group.forEach(rgs -> updateStatus(rgs, RegistryStatus.OK)); // updateStatus(dmtInfo.get(), RegistryStatus.POOL); - } else { - group.forEach(rgs -> updateStatus(rgs, registryStatusFailed(rgs))); - updateStatus(dmtInfo.get(), RegistryStatus.UNCV); + continue; + } else if (SessionType.XDEP.equals(sessionType)) { + group.forEach(rgs -> updateStatus(rgs, registryStatusFailed(rgs))); // для финальной UNCV or FAIL ; другие MNG +// updateStatus(dmtInfo.get(), RegistryStatus.UNCV); не меняет статус, статус определяется OM*T + continue; } - continue; } Optional dmtClnr = rgsMng.searchDmtClrn(omtRgs); if (dmtClnr.isPresent()) { @@ -146,11 +147,12 @@ public class InspectionObligationsDepositReturn implements ISessionStage { ); if (dmtBalance.compareTo(omtBalance) >= 0 && amfBalance.compareTo(omtBalance) >= 0) { group.forEach(rgs -> updateStatus(rgs, RegistryStatus.OK)); - } else { + continue; + } else if (SessionType.XDEP.equals(sessionType)) { group.forEach(rgs -> updateStatus(rgs, registryStatusFailed(rgs))); - updateStatus(dmtClnr.get(), RegistryStatus.UNCV); +// updateStatus(dmtClnr.get(), RegistryStatus.UNCV); не меняет статус, статус определяется OM*T + continue; } - continue; } if (SessionType.FINL.equals(sessionType)