diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/registry/AssetTBFProcessing.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/registry/AssetTBFProcessing.java index 37cc52524..dd547e258 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/registry/AssetTBFProcessing.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/registry/AssetTBFProcessing.java @@ -65,7 +65,8 @@ public class AssetTBFProcessing { .map(rgs -> safeBD(rgs.getBalance())) .reduce(BigDecimal.ZERO, BigDecimal::add); Instant now = Instant.now(); - + BigDecimal am_fBalanceForLoging = am_f.getBalance(); + BigDecimal am_bBalanceForLoging = am_b.getBalance(); am_b.setBalance(am_b.getBalance().subtract(sum)); am_f.setBalance(am_t.getBalance().subtract(am_b.getBalance()).add(d__iSum).subtract(d__vSum)); am_b.setUpdated(now); @@ -73,6 +74,14 @@ public class AssetTBFProcessing { rgsImdg.update(am_b); rgsImdg.update(am_f); + log.debug("assets processing [{}#id={}#balance={} | {}#id={}#balance={} | {}#id={}#balance={}] " + + "D**I.size={} D**V.size={}. {}.balance -> {}, {}.balance -> {}", + am_f.getRegistryCode(), am_f.getId(), am_fBalanceForLoging, + am_t.getRegistryCode(), am_t.getId(), am_t.getBalance(), + am_b.getRegistryCode(), am_b.getId(), am_bBalanceForLoging, + d__is.size(), d__vs.size(), + am_b.getRegistryCode(), am_b.getBalance(), + am_f.getRegistryCode(), am_f.getBalance()); } public Collection searchByParams(String account, 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 4d6df6934..452ea6e80 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 @@ -156,7 +156,7 @@ public class InspectionObligationsDepositReturn implements ISessionStage { dmtInfo.get().getId(), dmtBalance, omtBalance, amfBalance ); - if (dmtBalance.compareTo(omtBalance) >= 0 && amfBalance.compareTo(omtBalance) >=0 && gatewayIfNeeded(omtRgs)) { + if (dmtBalance.compareTo(omtBalance) >= 0 && amfBalance.compareTo(omtBalance) >=0) { group.forEach(rgs -> updateStatus(rgs, RegistryStatus.OK)); assets.processByAm_f(amfAsset, omtBalance.negate()); // updateStatus(dmtInfo.get(), RegistryStatus.POOL); @@ -175,7 +175,7 @@ public class InspectionObligationsDepositReturn implements ISessionStage { dmtClnr.get().getId(), dmtBalance, omtBalance, amfBalance ); - if (dmtBalance.compareTo(omtBalance) >= 0 && amfBalance.compareTo(omtBalance) >= 0 && gatewayIfNeeded(omtRgs)) { + if (dmtBalance.compareTo(omtBalance) >= 0 && amfBalance.compareTo(omtBalance) >= 0) { group.forEach(rgs -> updateStatus(rgs, RegistryStatus.OK)); assets.processByAm_f(amfAsset, omtBalance.negate()); continue;