From 9ae5936a01e102d9e33aa6c7fb0e1c52734a4a96 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Mon, 16 Jan 2023 10:52:36 +0300 Subject: [PATCH] =?UTF-8?q?balance-service=20=D0=BF=D0=BE=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=B2=D0=B0=D0=BB=D0=B8=D0=B4=D0=B0?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D1=8B=20=D1=81=20null=20BigInt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clearing/balance/validation/Sdf09ValidationRule.java | 4 ++++ .../clearing/balance/validation/Sdf16ValidationRule.java | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/Sdf09ValidationRule.java b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/Sdf09ValidationRule.java index c707de1b4..325e00892 100644 --- a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/Sdf09ValidationRule.java +++ b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/Sdf09ValidationRule.java @@ -1,5 +1,6 @@ package ru.spcex.clearing.balance.validation; +import org.slf4j.LoggerFactory; import ru.clearing.classes.statics.data.account.Account; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.CompanySymbols; @@ -24,6 +25,9 @@ public enum Sdf09ValidationRule implements IValidationRule companySymbolImdg = context.obtainMap(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class); Imdg companyImdg = context.obtainMap(IMDGDistributedNames.Map_Company, Company.class); + if (sdf09.getInn() == null) { + return of( BalanceError.CompanyNotFound, "empty inn"); + } String innStr = sdf09.getInn().setScale(0, RoundingMode.DOWN).toString(); CompanySymbols symbol = companySymbolImdg .getSingleObjectByFieldValues(Map.of("companySymbol", CompanySymbol.INN.getKey(), diff --git a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/Sdf16ValidationRule.java b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/Sdf16ValidationRule.java index 679603699..b56e58f17 100644 --- a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/Sdf16ValidationRule.java +++ b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/Sdf16ValidationRule.java @@ -21,6 +21,12 @@ public enum Sdf16ValidationRule implements IValidationRule companySymbolsImdg = context.obtainMap(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class); Imdg companyImdg = context.obtainMap(IMDGDistributedNames.Map_Company, Company.class); + if (sdf16.getInn() == null) { + return of(BalanceError.CompanyNotFound, "empty inn"); + } + if (sdf16.getBic() == null) { + return of(BalanceError.CompanyNotFound, "empty bic"); + } String innStr = sdf16.getInn().setScale(0, RoundingMode.DOWN).toString(); String bicStr = sdf16.getBic().setScale(0, RoundingMode.DOWN).toString(); CompanySymbols companySymbols = companySymbolsImdg.getSingleObjectBySQL(