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

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

Browse source
This commit is contained in:
etreschenkov 2024-06-25 14:26:45 +03:00
parent e52b42973d
commit 70aa7b9748
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/GatewayClientCodeValidationRule.java
View file

@ -35,7 +35,7 @@ public enum GatewayClientCodeValidationRule implements IValidationRule<ImdgValid
Imdg<Company> companyImdg = context.obtainMap(IMDGDistributedNames.Map_Company, Company.class); Imdg<Company> companyImdg = context.obtainMap(IMDGDistributedNames.Map_Company, Company.class);
Company company = companyImdg.getFirstObjectByFieldValues( Company company = companyImdg.getFirstObjectByFieldValues(
Map.of("trading_code", String.valueOf(tradingCode)) Map.of("tradingCode", String.valueOf(tradingCode))
); );
if (company == null) { if (company == null) {
return of(AccountError.COMPANY_NOT_FOUND_GTW, "trading_code"); return of(AccountError.COMPANY_NOT_FOUND_GTW, "trading_code");
@ -62,6 +62,9 @@ public enum GatewayClientCodeValidationRule implements IValidationRule<ImdgValid
for (MoneyAccountMsgRequest moneyAccountMsg : accountList) { for (MoneyAccountMsgRequest moneyAccountMsg : accountList) {
ImdgPredicateBuilder predicateBuilder = imdg.predicateBuilder(); ImdgPredicateBuilder predicateBuilder = imdg.predicateBuilder();
ImdgPredicate currencyPredicate; ImdgPredicate currencyPredicate;
if (!StringUtils.hasText(moneyAccountMsg.getAccount())){
return of(AccountError.RequiredFieldEmpty, "account");
}
ImdgPredicate accountPredicate = predicateBuilder.equals("account", moneyAccountMsg.getAccount()); ImdgPredicate accountPredicate = predicateBuilder.equals("account", moneyAccountMsg.getAccount());
if (moneyAccountMsg.getCurrCode().equals(CurrencyCode.RUB.getKey())) { if (moneyAccountMsg.getCurrCode().equals(CurrencyCode.RUB.getKey())) {
currencyPredicate = predicateBuilder.or( currencyPredicate = predicateBuilder.or(

2
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/TkrService.java
View file

@ -23,7 +23,7 @@ public class TkrService {
} }
public void processedTkrRequest(TkrRequest tkrRequest) { public void processedTkrRequest(TkrRequest tkrRequest) {
if (!tkrRequest.getErrors().isEmpty()) { if (tkrRequest.getErrors() != null && !tkrRequest.getErrors().isEmpty()) {
return; return;
} }
List<TkrAccount> tkrAccountsForCheck = tkrRequest.getInfoAccount() List<TkrAccount> tkrAccountsForCheck = tkrRequest.getInfoAccount()