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

http://jira.mfd.msk:8088/browse/CLS-189 fix npe два (но тут еррор добавил

Browse source
This commit is contained in:
AKurakin 2023-02-07 17:52:50 +03:00
parent 5c74626e76
commit 8a41f93e19
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -181,6 +181,11 @@ public class SdfCreatorBySTLDPayment {
ClearingCategory getClearingCategory(PaymentInstruction paymentInstruction) { ClearingCategory getClearingCategory(PaymentInstruction paymentInstruction) {
ClearingMemberCategory category = clearingMemberCategoryImdg.getSingleObjectByFieldValues( ClearingMemberCategory category = clearingMemberCategoryImdg.getSingleObjectByFieldValues(
Map.of("companyId", paymentInstruction.getSenderId())); Map.of("companyId", paymentInstruction.getSenderId()));
if (category == null) {
log.error("ClearingMemberCategory not found by paymentInstruction[{}].companyId={}",
paymentInstruction.getId(), paymentInstruction.getSenderId());
return null;
}
return IEnumKey.getEnumByKeyOrUndefined(ClearingCategory.class, return IEnumKey.getEnumByKeyOrUndefined(ClearingCategory.class,
category.getClearingMemberCategory()); category.getClearingMemberCategory());
} }

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

@ -49,9 +49,9 @@ public class LiabilitiesClaimsMoneyCreator {
lcm.setAccountType(lca.getAccountType()); lcm.setAccountType(lca.getAccountType());
lcm.setAccount(lca.getAccount()); lcm.setAccount(lca.getAccount());
if (category.equals(ClearingCategory.I) || category.equals(ClearingCategory.V)) { if (category.equals(ClearingCategory.I) || category.equals(ClearingCategory.V)) {
lcm.setLiabilitiesAmount(lca.getLiabilitiesQuantity()); lcm.setLiabilitiesAmount(safeBD(lca.getLiabilitiesQuantity()));
} else if (category.equals(ClearingCategory.B)) { } else if (category.equals(ClearingCategory.B)) {
lcm.setClaimsAmount(lca.getClaimsQuantity()); lcm.setClaimsAmount(safeBD(lca.getClaimsQuantity()));
} }
lcm.setSettlementDate(lca.getSettlementDate()); lcm.setSettlementDate(lca.getSettlementDate());
lcm.setTradingDate(lca.getTradingDate()); lcm.setTradingDate(lca.getTradingDate());
@ -77,9 +77,9 @@ public class LiabilitiesClaimsMoneyCreator {
lcm.setAccountType(lca.getAccountType()); lcm.setAccountType(lca.getAccountType());
lcm.setAccount(lca.getAccount()); lcm.setAccount(lca.getAccount());
if (category.equals(ClearingCategory.I) || category.equals(ClearingCategory.V)) { if (category.equals(ClearingCategory.I) || category.equals(ClearingCategory.V)) {
lcm.setClaimsAmount(lca.getClaimsQuantity()); lcm.setClaimsAmount(safeBD(lca.getClaimsQuantity()));
} else if (category.equals(ClearingCategory.B)) { } else if (category.equals(ClearingCategory.B)) {
lcm.setLiabilitiesAmount(lca.getLiabilitiesQuantity()); lcm.setLiabilitiesAmount(safeBD(lca.getLiabilitiesQuantity()));
} }
lcm.setSettlementDate(lca.getRefundDate()); lcm.setSettlementDate(lca.getRefundDate());
lcm.setTradingDate(lca.getTradingDate()); lcm.setTradingDate(lca.getTradingDate());