diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionAssets.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionAssets.java index d5ba52ad0..405fe9367 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionAssets.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionAssets.java @@ -162,7 +162,7 @@ public class FormingPaymentInstructionAssets implements ISessionStage { addresseeId = Sender.One.getId(); debitLegAccount = tranAcc; creditLegAccount = counterAcc; - amount = registry.getBalance() == null ? null : registry.getBalance().abs().negate(); + amount = registry.getBalance() == null ? null : registry.getBalance().abs(); Optional payerAmtO = rgsMng.findRelatedAsset(registry.getTradingClearingRegistryId(), registry.getCompanyId(), AM_T); payerAmtO.ifPresent(amt -> { amt.setSettledDebit(safeBD(amt.getSettledDebit()).subtract(safeBD(registry.getBalance()))); @@ -173,10 +173,10 @@ public class FormingPaymentInstructionAssets implements ISessionStage { addresseeId = registry.getCompanyId(); debitLegAccount = counterAcc; creditLegAccount = tranAcc; - amount = registry.getBalance() == null ? null : registry.getBalance().abs(); + amount = registry.getBalance() == null ? null : registry.getBalance().abs().negate(); Optional payerAmtO = rgsMng.findRelatedAsset(registry.getTradingClearingRegistryId(), registry.getCompanyId(), AM_T); payerAmtO.ifPresent(amt -> { - amt.setSettledDebit(safeBD(amt.getSettledDebit()).add(safeBD(registry.getBalance()))); + amt.setSettledCredit(safeBD(amt.getSettledCredit()).add(safeBD(registry.getBalance()))); setUpdatedStoreInImdg(amt, now); }); } @@ -233,10 +233,10 @@ public class FormingPaymentInstructionAssets implements ISessionStage { addresseeId = registry.getCompanyId(); debitLegAccount = counterAcc; creditLegAccount = dtrnAcc; - amount = registry.getBalance() == null ? null : registry.getBalance().abs(); + amount = registry.getBalance() == null ? null : registry.getBalance().abs().negate(); Optional payerAstO = rgsMng.findRelatedAsset(registry.getTradingClearingRegistryId(), registry.getCompanyId(), AS_T); payerAstO.ifPresent(amt -> { - amt.setSettledDebit(safeBD(amt.getSettledDebit()).add(safeBD(registry.getBalance()))); + amt.setSettledCredit(safeBD(amt.getSettledCredit()).add(safeBD(registry.getBalance()))); setUpdatedStoreInImdg(amt, now); }); }