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

balance-service поправил валидаторы с null BigInt

Browse source
This commit is contained in:
AKurakin 2023-01-16 10:52:36 +03:00
parent 592b2cd02f
commit 9ae5936a01
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/Sdf09ValidationRule.java
View file

@ -1,5 +1,6 @@
package ru.spcex.clearing.balance.validation; package ru.spcex.clearing.balance.validation;
import org.slf4j.LoggerFactory;
import ru.clearing.classes.statics.data.account.Account; import ru.clearing.classes.statics.data.account.Account;
import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.Company;
import ru.clearing.classes.statics.data.company.CompanySymbols; import ru.clearing.classes.statics.data.company.CompanySymbols;
@ -24,6 +25,9 @@ public enum Sdf09ValidationRule implements IValidationRule<ImdgValidationContext
SDf09 sdf09 = context.getValidatedObject(); SDf09 sdf09 = context.getValidatedObject();
Imdg<CompanySymbols> companySymbolImdg = context.obtainMap(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class); Imdg<CompanySymbols> companySymbolImdg = context.obtainMap(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class);
Imdg<Company> companyImdg = context.obtainMap(IMDGDistributedNames.Map_Company, Company.class); Imdg<Company> 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(); String innStr = sdf09.getInn().setScale(0, RoundingMode.DOWN).toString();
CompanySymbols symbol = companySymbolImdg CompanySymbols symbol = companySymbolImdg
.getSingleObjectByFieldValues(Map.of("companySymbol", CompanySymbol.INN.getKey(), .getSingleObjectByFieldValues(Map.of("companySymbol", CompanySymbol.INN.getKey(),

6
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/Sdf16ValidationRule.java
View file

@ -21,6 +21,12 @@ public enum Sdf16ValidationRule implements IValidationRule<ImdgValidationContext
SDf16 sdf16 = context.getValidatedObject(); SDf16 sdf16 = context.getValidatedObject();
Imdg<CompanySymbols> companySymbolsImdg = context.obtainMap(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class); Imdg<CompanySymbols> companySymbolsImdg = context.obtainMap(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class);
Imdg<Company> companyImdg = context.obtainMap(IMDGDistributedNames.Map_Company, Company.class); Imdg<Company> 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 innStr = sdf16.getInn().setScale(0, RoundingMode.DOWN).toString();
String bicStr = sdf16.getBic().setScale(0, RoundingMode.DOWN).toString(); String bicStr = sdf16.getBic().setScale(0, RoundingMode.DOWN).toString();
CompanySymbols companySymbols = companySymbolsImdg.getSingleObjectBySQL( CompanySymbols companySymbols = companySymbolsImdg.getSingleObjectBySQL(