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

http://jira.mfd.msk:8088/browse/CLS-189 добавил логов trace

Browse source
This commit is contained in:
AKurakin 2023-02-07 14:10:59 +03:00
parent 687b50d970
commit bb96118df0
2 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/liabilities/LiabilitiesClaimsAssets.java
View file

@ -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 +
'}';
}
}

5
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/Clearing.java
View file

@ -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<LiabilitiesClaimsMoney> 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<PaymentInstruction> 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);