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)