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

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

Browse source
This commit is contained in:
ialbert 2023-02-08 12:00:28 +03:00
parent 8ae1c18344
commit 2d3808460e
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/LiabilitiesClaimsAssetsCreator.java
View file

@ -1,5 +1,7 @@
package ru.spcex.clearing.service.builder; package ru.spcex.clearing.service.builder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.account.Account; import ru.clearing.classes.statics.data.account.Account;
@ -23,6 +25,7 @@ import java.util.Optional;
@Component @Component
public class LiabilitiesClaimsAssetsCreator { public class LiabilitiesClaimsAssetsCreator {
private final Logger log = LoggerFactory.getLogger(getClass());
private final Imdg<Account> accountImdg; private final Imdg<Account> accountImdg;
private final Imdg<Company> companyImdg; private final Imdg<Company> companyImdg;
private final Imdg<LiabilitiesClaimsAssets> assetsImdg; private final Imdg<LiabilitiesClaimsAssets> assetsImdg;
@ -120,11 +123,13 @@ public class LiabilitiesClaimsAssetsCreator {
if (iClrn || vInfo) { if (iClrn || vInfo) {
BigDecimal prevCQuantity = BigDecimalUtil.safeBD(lca.getClaimsQuantity()); BigDecimal prevCQuantity = BigDecimalUtil.safeBD(lca.getClaimsQuantity());
BigDecimal secondLegAmount = BigDecimalUtil.safeBD(executionDeposit.getSecondLegAmount()); BigDecimal secondLegAmount = BigDecimalUtil.safeBD(executionDeposit.getSecondLegAmount());
log.trace("update second leg LCA: prevClaimsQuantity={}, secondLegAmount={}", prevCQuantity, secondLegAmount);
lca.setClaimsQuantity(prevCQuantity.add(secondLegAmount)); lca.setClaimsQuantity(prevCQuantity.add(secondLegAmount));
} }
if (bClrn) { if (bClrn) {
BigDecimal prevLQuantity = BigDecimalUtil.safeBD(lca.getLiabilitiesQuantity()); BigDecimal prevLQuantity = BigDecimalUtil.safeBD(lca.getLiabilitiesQuantity());
BigDecimal secondLegAmount = BigDecimalUtil.safeBD(executionDeposit.getSecondLegAmount()); BigDecimal secondLegAmount = BigDecimalUtil.safeBD(executionDeposit.getSecondLegAmount());
log.trace("update second leg LCA: prevLiabilitiesQuantity={}, secondLegAmount={}", prevLQuantity, secondLegAmount);
lca.setLiabilitiesQuantity(prevLQuantity.add(secondLegAmount)); lca.setLiabilitiesQuantity(prevLQuantity.add(secondLegAmount));
} }
} }
@ -141,11 +146,13 @@ public class LiabilitiesClaimsAssetsCreator {
if (iClrn || vInfo) { if (iClrn || vInfo) {
BigDecimal prevLQuantity = BigDecimalUtil.safeBD(lca.getLiabilitiesQuantity()); BigDecimal prevLQuantity = BigDecimalUtil.safeBD(lca.getLiabilitiesQuantity());
BigDecimal firstLegAmount = BigDecimalUtil.safeBD(executionDeposit.getFirstLegAmount()); BigDecimal firstLegAmount = BigDecimalUtil.safeBD(executionDeposit.getFirstLegAmount());
log.trace("update first leg LCA: prevLiabilitiesQuantity={}, firstLegAmount={}", prevLQuantity, firstLegAmount);
lca.setLiabilitiesQuantity(prevLQuantity.add(firstLegAmount)); lca.setLiabilitiesQuantity(prevLQuantity.add(firstLegAmount));
} }
if (bClrn) { if (bClrn) {
BigDecimal prevCQuantity = BigDecimalUtil.safeBD(lca.getClaimsQuantity()); BigDecimal prevCQuantity = BigDecimalUtil.safeBD(lca.getClaimsQuantity());
BigDecimal firstLegAmount = BigDecimalUtil.safeBD(executionDeposit.getFirstLegAmount()); BigDecimal firstLegAmount = BigDecimalUtil.safeBD(executionDeposit.getFirstLegAmount());
log.trace("update first leg LCA: prevClaimsQuantity={}, firstLegAmount={}", prevCQuantity, firstLegAmount);
lca.setClaimsQuantity(prevCQuantity.add(firstLegAmount)); lca.setClaimsQuantity(prevCQuantity.add(firstLegAmount));
} }
// //

7
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/LiabilitiesClaimsMoneyCreator.java
View file

@ -1,5 +1,7 @@
package ru.spcex.clearing.service.builder; package ru.spcex.clearing.service.builder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
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;
@ -18,6 +20,7 @@ import static ru.spcex.platform.utils.number.BigDecimalUtil.safeBD;
@Component @Component
public class LiabilitiesClaimsMoneyCreator { public class LiabilitiesClaimsMoneyCreator {
private final Logger log = LoggerFactory.getLogger(this.getClass());
private final Imdg<LiabilitiesClaimsMoney> liabilitiesClaimsMoneyImdg; private final Imdg<LiabilitiesClaimsMoney> liabilitiesClaimsMoneyImdg;
private final static DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); private final static DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
@ -37,6 +40,8 @@ public class LiabilitiesClaimsMoneyCreator {
BigDecimal prevClaimsAmount = safeBD(liabilitiesClaimsMoney.getClaimsAmount()); BigDecimal prevClaimsAmount = safeBD(liabilitiesClaimsMoney.getClaimsAmount());
BigDecimal lcaLiabilitiesQuantity = safeBD(liabilitiesClaimsAssets.getLiabilitiesQuantity()); BigDecimal lcaLiabilitiesQuantity = safeBD(liabilitiesClaimsAssets.getLiabilitiesQuantity());
BigDecimal lcaClaimsQuantity = safeBD(liabilitiesClaimsAssets.getClaimsQuantity()); BigDecimal lcaClaimsQuantity = safeBD(liabilitiesClaimsAssets.getClaimsQuantity());
log.trace("update first leg lcm {} by lca {}: prevLAmount={}, prevClaimsAmount={}, lcaLiabilitiesQuantity={}, lcaClaimsQuantity={}",
liabilitiesClaimsMoney.getId(), liabilitiesClaimsAssets.getId(), prevLAmount, prevClaimsAmount, lcaLiabilitiesQuantity, lcaClaimsQuantity);
liabilitiesClaimsMoney.setLiabilitiesAmount(prevLAmount.add(lcaLiabilitiesQuantity)); liabilitiesClaimsMoney.setLiabilitiesAmount(prevLAmount.add(lcaLiabilitiesQuantity));
liabilitiesClaimsMoney.setClaimsAmount(prevClaimsAmount.add(lcaClaimsQuantity)); liabilitiesClaimsMoney.setClaimsAmount(prevClaimsAmount.add(lcaClaimsQuantity));
} }
@ -97,6 +102,8 @@ public class LiabilitiesClaimsMoneyCreator {
BigDecimal prevClaimsAmount = safeBD(lcm.getClaimsAmount()); BigDecimal prevClaimsAmount = safeBD(lcm.getClaimsAmount());
BigDecimal lcaLiabilitiesQuantity = safeBD(lca.getLiabilitiesQuantity()); BigDecimal lcaLiabilitiesQuantity = safeBD(lca.getLiabilitiesQuantity());
BigDecimal lcaClaimsQuantity = safeBD(lca.getClaimsQuantity()); BigDecimal lcaClaimsQuantity = safeBD(lca.getClaimsQuantity());
log.trace("update second leg lcm {} by lca {}: prevLiabilitiesAmount={}, prevClaimsAmount={}, lcaLiabilitiesQuantity={}, lcaClaimsQuantity={}",
lcm.getId(), lca.getId(), prevLiabilitiesAmount, prevClaimsAmount, lcaLiabilitiesQuantity, lcaClaimsQuantity);
lcm.setLiabilitiesAmount(prevLiabilitiesAmount.add(lcaLiabilitiesQuantity)); lcm.setLiabilitiesAmount(prevLiabilitiesAmount.add(lcaLiabilitiesQuantity));
lcm.setClaimsAmount(prevClaimsAmount.add(lcaClaimsQuantity)); lcm.setClaimsAmount(prevClaimsAmount.add(lcaClaimsQuantity));
} }