From 84ccc444b89bd6b80e78aebef1138ea553efe5e0 Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Fri, 30 Jun 2023 17:06:03 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=BF=D0=BE=20=D1=84=D0=B8=D0=BD=D0=B0=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=BD=D0=BE=D0=B9=20=D0=9C=D0=9A=D0=A0=20=D1=81=D0=B5?=
 =?UTF-8?q?=D1=81=D1=81=D0=B8=D0=B8=20=D1=88=D0=B0=D0=B3=205=20=D1=84?=
 =?UTF-8?q?=D0=B8=D0=BA=D1=81=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=D0=B0=20DM*?=
 =?UTF-8?q?X?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InspectionObligationsDepositReturn.java   | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 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 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<Registry> 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<Registry> 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<Registry> 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);