treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

изменения по финальной МКР сессии шаг 5 фикс поиска DM*X

Browse source
This commit is contained in:
ialbert 2023-06-30 17:06:03 +03:00
parent f90365a191
commit 84ccc444b8
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsDepositReturn.java
View file

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