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 0bf221178..bb7271717 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 @@ -112,20 +112,24 @@ public class InspectionObligationsDepositReturn implements ISessionStage { log.debug("groupId={}, OM*T.id={}", entry.getKey(), omtRgs.getId()); BigDecimal omtBalance = safeBD(omtRgs.getBalance()); - Optional dmx = searchDmx(omtRgs); - if (dmx.isPresent()) { - BigDecimal dmxBalance = safeBD(dmx.get().getBalance()); - log.debug("OM*T.id={} -> DM*X.id={}, dmxBalance={}, omtBalance={}", - omtRgs.getId(), - dmx.get().getId(), - dmxBalance, omtBalance - ); - if (dmxBalance.compareTo(omtBalance) >= 0) { - group.forEach(rgs -> updateStatus(rgs, RegistryStatus.OK)); - } else { - group.forEach(rgs -> updateStatus(rgs, registryStatusForDmxCheckFailed())); + if (omtRgs.getValueDate() != null + && omtRgs.getSettlementDate() != null + && omtRgs.getValueDate().isBefore(omtRgs.getSettlementDate())) { + Optional dmx = searchDmx(omtRgs); + if (dmx.isPresent()) { + BigDecimal dmxBalance = safeBD(dmx.get().getBalance()); + log.debug("OM*T.id={} -> DM*X.id={}, dmxBalance={}, omtBalance={}", + omtRgs.getId(), + dmx.get().getId(), + dmxBalance, omtBalance + ); + if (dmxBalance.compareTo(omtBalance) >= 0) { + group.forEach(rgs -> updateStatus(rgs, RegistryStatus.OK)); + } else { + group.forEach(rgs -> updateStatus(rgs, registryStatusForDmxCheckFailed())); + } + continue; } - continue; } Optional amfAssetO = searchAssetByOMT(omtRgs); @@ -168,7 +172,8 @@ public class InspectionObligationsDepositReturn implements ISessionStage { } continue; } - log.info("OM*T.id={} -> no DM*X/DM*T(INFO/CLRN) registry found. setting MNG status to group", omtRgs.getId()); + log.info("OM*T.id={} -> no DM*X/DM*T(INFO/CLRN) registry found. setting {} status to group", + omtRgs.getId(), registryStatusForDmxCheckFailed()); group.forEach(rgs -> updateStatus(rgs, registryStatusForDmxCheckFailed())); } return new StageResult<>(null, true);