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

http://jira.mfd.msk:8088/browse/CLS-189 final merge code

Browse source
This commit is contained in:
AKurakin 2023-02-07 16:55:21 +03:00
parent 37e7ee1f2e
commit 553bf5b93c
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@ import ru.clearing.classes.statics.data.execution.ExecutionDeposit;
import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; import ru.clearing.classes.statics.data.generated.ClearingMemberCategory;
import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets;
import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsMoney; import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsMoney;
import ru.clearing.classes.statics.data.payment.PaymentInstruction;
import ru.spcex.clearing.error.ClearingErrorInternal; import ru.spcex.clearing.error.ClearingErrorInternal;
import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.platform.messaging.domain.Consts; import ru.spcex.clearing.platform.messaging.domain.Consts;
@ -248,18 +249,21 @@ public class Clearing {
liabilitiesClaimsAssetsImdg.update(lcaFirstLeg); liabilitiesClaimsAssetsImdg.update(lcaFirstLeg);
lbltsClmsAssetsCreator.setLcaLcmId(lcaSecondLeg, lcmSecondLeg); lbltsClmsAssetsCreator.setLcaLcmId(lcaSecondLeg, lcmSecondLeg);
liabilitiesClaimsAssetsImdg.update(lcaSecondLeg); liabilitiesClaimsAssetsImdg.update(lcaSecondLeg);
log.trace("creating paymentInstructions");
// List<PaymentInstruction> paymentInstructions = paymentInstructionCreator.createAndSavePaymentInstructions(lca, Collections.singleton(category)); log.trace("creating paymentInstructions");
// paymentInstructionCreator.updateFieldLiabilitiesClaimsAssetsByPayment(lca, paymentInstructions, Collections.singleton(category)); List<PaymentInstruction> paymentInstructions = paymentInstructionCreator.createAndSavePaymentInstructions(lcaFirstLeg, Collections.singleton(category));
// liabilitiesClaimsAssetsImdg.update(lca); paymentInstructionCreator.updateFieldLiabilitiesClaimsAssetsByPayment(lcaFirstLeg, lcmFirstLeg, paymentInstructions, Collections.singleton(category));
liabilitiesClaimsAssetsImdg.update(lcaFirstLeg);
log.trace("update first leg LiabilitiesClaimsMoney by payment: {}", lcaFirstLeg);
// log.trace("updating LiabilitiesClaimsMoney by payment"); // log.trace("updating LiabilitiesClaimsMoney by payment");
// log.trace("firstLegLiabilitiesClaimsMoney: {}; secondLegLiabilitiesClaimsMoney: {}", lcmFirstLeg, lcmSecondLeg); // log.trace("firstLegLiabilitiesClaimsMoney: {}; secondLegLiabilitiesClaimsMoney: {}", lcmFirstLeg, lcmSecondLeg);
// if (paymentInstructionCreator.updateFieldLiabilitiesClaimsMoneyByPayment(lcmFirstLeg, true, paymentInstructions, Collections.singleton(category)) ) { // if (paymentInstructionCreator.updateFieldLiabilitiesClaimsMoneyByPayment(lcmFirstLeg, true, paymentInstructions, Collections.singleton(category)) ) {
// liabilitiesClaimsMoneyImdg.update(lcmFirstLeg); // liabilitiesClaimsMoneyImdg.update(lcmFirstLeg);
// log.trace("LiabilitiesClaimsMoney first leg {} was updated", lcmFirstLeg.getId()); // log.trace("LiabilitiesClaimsMoney first leg {} was updated", lcmFirstLeg.getId());
// } // }
log.trace("firstLegLiabilitiesClaimsMoney: {}; secondLegLiabilitiesClaimsMoney: {}", lcmFirstLeg.getId(), lcmSecondLeg.getId()); // log.trace("firstLegLiabilitiesClaimsMoney: {}; secondLegLiabilitiesClaimsMoney: {}", lcmFirstLeg.getId(), lcmSecondLeg.getId());
execDeposit.setSessionId(clearingSessionId); execDeposit.setSessionId(clearingSessionId);
execDeposit.setUpdated(Instant.now()); execDeposit.setUpdated(Instant.now());
executionDepositImdg.update(execDeposit); executionDepositImdg.update(execDeposit);

6
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionCreator.java
View file

@ -468,8 +468,8 @@ public class PaymentInstructionCreator {
LiabilitiesClaimsMoney liabilitiesClaimsMoney, LiabilitiesClaimsMoney liabilitiesClaimsMoney,
List<PaymentInstruction> paymentInstructions, List<PaymentInstruction> paymentInstructions,
Collection<ClearingCategory> clearingCategory) { Collection<ClearingCategory> clearingCategory) {
final boolean isFirstLeg = true; // final boolean isFirstLeg = true;
final boolean isSecondLeg = !isFirstLeg; // final boolean isSecondLeg = !isFirstLeg;
PaymentInstruction paymentIAny = paymentInstructions.iterator().next(); PaymentInstruction paymentIAny = paymentInstructions.iterator().next();
// if (clearingCategory.contains(ClearingCategory.I) || clearingCategory.contains(ClearingCategory.V)) { // if (clearingCategory.contains(ClearingCategory.I) || clearingCategory.contains(ClearingCategory.V)) {
@ -502,7 +502,7 @@ public class PaymentInstructionCreator {
// liabilitiesClaimsAssets.setClearingStatus(ClearingStatus.OK.getKey()); // liabilitiesClaimsAssets.setClearingStatus(ClearingStatus.OK.getKey());
// } // }
liabilitiesClaimsAssets.setLiabilitiesClaimsMoneyId(liabilitiesClaimsMoney.getId()); // liabilitiesClaimsAssets.setLiabilitiesClaimsMoneyId(liabilitiesClaimsMoney.getId());
liabilitiesClaimsAssets.setPaymentId(paymentIAny.getId()); liabilitiesClaimsAssets.setPaymentId(paymentIAny.getId());
liabilitiesClaimsAssets.setUpdated(Instant.now()); liabilitiesClaimsAssets.setUpdated(Instant.now());
} }