diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/GatewayUpdateEksClientCodeValidationRule.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/GatewayUpdateEksClientCodeValidationRule.java index 9d0bf15da..028b30e12 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/GatewayUpdateEksClientCodeValidationRule.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/GatewayUpdateEksClientCodeValidationRule.java @@ -52,7 +52,7 @@ public enum GatewayUpdateEksClientCodeValidationRule implements IValidationRule< ImdgPredicateBuilder predicateBuilder = accountImdg.predicateBuilder(); List accounts = validatedObject.getMoneyAccounts().stream() .filter(moneyAccountMsgRequest -> - moneyAccountMsgRequest.getStatus().equals("ADD") + moneyAccountMsgRequest.getStatus().equals("NEW") && !CurrencyCode.RUB.equalsByKey(moneyAccountMsgRequest.getCurrCode())) .toList(); List clrnAccounts = new ArrayList<>(); @@ -64,14 +64,12 @@ public enum GatewayUpdateEksClientCodeValidationRule implements IValidationRule< ) ); if (account == null) { - //todo пропускать такие счета и не выдавать ошибку? just continue; return of(AccountError.AccountNotFound, request.getAccount()); } TradingClearingRegistryList tkrListByAccount = tkrList.getSingleObjectByPredicate( predicateBuilder.equals("accountId", account.getId()) ); if (tkrListByAccount != null) { - //todo пропускать такие счета и не выдавать ошибку? just continue; return of(AccountError.AccountForTradingClearingRegistryAlreadyUsed, account.getId()); } clrnAccounts.add(account);