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

Revert "формирование PaymentInstruction, для возврата депозитов: обнуляю баланс AM*B регистра при наличии DM*X"

Browse source 
This reverts commit bcbc335089.
This commit is contained in:
ialbert 2025-08-01 14:16:46 +03:00
parent 49235b0146
commit 679a64bd85
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/FormingPaymentInstructionReturnMkrAction.java
View file

@ -125,17 +125,11 @@ public class FormingPaymentInstructionReturnMkrAction extends AbstractSessionAct
}
Registry lm_t = lmtO.get(); //obligation by money
Registry cm_t = cmtO.get();
//изменение активов - блокируем средства беред отправкой sdf'ов
Optional<Registry> receiverAmbO = rgsMng.findRelatedAsset(cm_t.getTradingClearingRegistryId(), cm_t.getCompanyId(), lm_t.getSecuritySymbol(), AM_B);
Optional<Registry> dmx = rgsMng.searchDmxByCounterPartyNotOk(lm_t);
if (dmx.isPresent()) {
log.debug("LM*T#id={}, DM*X#id={} found, no action needed for group {}, skipping liability",
lm_t.getId(), dmx.get().getId(), lm_t.getGroupId());
dmx.get().setRegistryStatus(RegistryStatus.OK.getKey());
receiverAmbO.ifPresent(r -> {
r.setBalance(BigDecimal.ZERO);
setUpdatedStoreInImdg(r, now);
});
setUpdatedStoreInImdg(dmx.get(), now);
continue;
}
@ -158,12 +152,13 @@ public class FormingPaymentInstructionReturnMkrAction extends AbstractSessionAct
}
{
//изменение активов - блокируем средства беред отправкой sdf'ов
Optional<Registry> receiverAmtO = rgsMng.findRelatedAsset(cm_t.getTradingClearingRegistryId(), cm_t.getCompanyId(), lm_t.getSecuritySymbol(), AM_B);
log.debug("changing A* registers based on LM_T.id={} and CM_T.id={} found AM*T(receiver).id={}",
lm_t.getId(),
cm_t.getId(),
receiverAmbO.map(Registry::getId).orElse(null)
receiverAmtO.map(Registry::getId).orElse(null)
);
receiverAmbO.ifPresent(amt -> {
receiverAmtO.ifPresent(amt -> {
// у отправителя и получателя одинаково, см. в FormingPaymentInstruction
amt.setSettledDebit(safeBD(amt.getSettledDebit()).add(safeBD(lm_t.getBalance())));
setUpdatedStoreInImdg(amt, now);