From bb96118df0fd2451de964a0b214dfd312259f05d Mon Sep 17 00:00:00 2001 From: AKurakin Date: Tue, 7 Feb 2023 14:10:59 +0300 Subject: [PATCH] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-189=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BB=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=D0=B2=20trace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../liabilities/LiabilitiesClaimsAssets.java | 29 +++++++++++++++++++ .../ru/spcex/clearing/service/Clearing.java | 5 ++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/liabilities/LiabilitiesClaimsAssets.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/liabilities/LiabilitiesClaimsAssets.java index a7643a8ba..767a94c1e 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/liabilities/LiabilitiesClaimsAssets.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/liabilities/LiabilitiesClaimsAssets.java @@ -226,4 +226,33 @@ public class LiabilitiesClaimsAssets extends BusinessObject { this.refundPaymentId = value; } + @Override + public String toString() { + return "LiabilitiesClaimsAssets{" + + "companyId=" + companyId + + ", clearingDate=" + clearingDate + + ", accountId=" + accountId + + ", accountType='" + accountType + '\'' + + ", account='" + account + '\'' + + ", liabilitiesQuantity=" + liabilitiesQuantity + + ", claimsQuantity=" + claimsQuantity + + ", currency='" + currency + '\'' + + ", settlementDate=" + settlementDate + + ", tradingDate=" + tradingDate + + ", refundDate=" + refundDate + + ", price=" + price + + ", securityId=" + securityId + + ", tradingCode='" + tradingCode + '\'' + + ", clearingCode='" + clearingCode + '\'' + + ", shortName='" + shortName + '\'' + + ", contract='" + contract + '\'' + + ", comment='" + comment + '\'' + + ", fullName='" + fullName + '\'' + + ", parentId=" + parentId + + ", liabilitiesClaimsMoneyId=" + liabilitiesClaimsMoneyId + + ", clearingStatus=" + clearingStatus + + ", paymentId=" + paymentId + + ", refundPaymentId=" + refundPaymentId + + '}'; + } } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/Clearing.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/Clearing.java index d6111abc7..e41fcedce 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/Clearing.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/Clearing.java @@ -194,7 +194,7 @@ public class Clearing { } LiabilitiesClaimsAssets lca = lbltsClmsAssetsCreator.createLiabilitiesClaimsAssets(category, execDeposit); liabilitiesClaimsAssetsImdg.insert(lca); - log.trace("LiabilitiesClaimsAssets {} was created", lca.getId()); + log.trace("LiabilitiesClaimsAssets {} was created: {}", lca.getId(), lca); Optional lcmFirstLegFound = lbltsClmsMoneyCreator.searchLcmBySettlementDate(lca.getAccountId(), lca.getCompanyId(), lca.getSettlementDate()); var wrapperFirstLegCreated = new Object() {LiabilitiesClaimsMoney firstLegCreated;}; lcmFirstLegFound.ifPresentOrElse(lcm -> { @@ -221,6 +221,7 @@ public class Clearing { }); lbltsClmsAssetsCreator.updateLca(lca, lcmFirstLegFound.orElse(wrapperFirstLegCreated.firstLegCreated)); liabilitiesClaimsAssetsImdg.update(lca); + log.trace("LiabilitiesClaimsAssets {} was updated: {}", lca.getId(), lca); log.trace("creating paymentInstructions"); List paymentInstructions = paymentInstructionCreator.createAndSavePaymentInstructions(lca, Collections.singleton(category)); @@ -228,7 +229,7 @@ public class Clearing { liabilitiesClaimsAssetsImdg.update(lca); var firstLegLiabilitiesClaimsMoney = lcmFirstLegFound.orElseGet(() -> wrapperFirstLegCreated.firstLegCreated); var secondLegLiabilitiesClaimsMoney = lcmSecondLegFound.orElseGet(() -> wrapperSecondLegCreated.secondLegCreated); - log.trace("updating LiabilitiesClaimsMoney by payment"); + log.trace("updating LiabilitiesClaimsMoney by payment"); log.trace("firstLegLiabilitiesClaimsMoney: {}; secondLegLiabilitiesClaimsMoney: {}", firstLegLiabilitiesClaimsMoney, secondLegLiabilitiesClaimsMoney); if (paymentInstructionCreator.updateFieldLiabilitiesClaimsMoneyByPayment(firstLegLiabilitiesClaimsMoney, true, paymentInstructions, Collections.singleton(category)) ) { liabilitiesClaimsMoneyImdg.update(firstLegLiabilitiesClaimsMoney);