diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/facade/AccountFacade.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/facade/AccountFacade.java index 7d4719d09..e76b2705a 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/facade/AccountFacade.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/facade/AccountFacade.java @@ -62,7 +62,7 @@ public class AccountFacade implements IClearingFacade { String currencyCode = moneyAccountMsgRequest.getCurrCode() == null ? CurrencyCode.RUB.getKey() : moneyAccountMsgRequest.getCurrCode(); Instant now = Instant.now(); - String accountValue = defineAccountValForInfo(currencyCode); + String accountValue = defineAccountValForInfo(currencyCode, moneyAccountMsgRequest.getEks_account()); Account account = new Account(); account.setCompanyId(company.getId()); account.setAccount(accountValue); @@ -78,7 +78,7 @@ public class AccountFacade implements IClearingFacade { return new Pair<>(specificAccId, currencyCode); } - private String defineAccountValForInfo(String currencyCode) { + private String defineAccountValForInfo(String currencyCode, String eksAccount) { ImdgPredicateBuilder predicateBuilder = currencyImdg.predicateBuilder(); Currency currency = currencyImdg.getFirstObjectByPredicate( predicateBuilder.equals("currencyCode", currencyCode) @@ -88,7 +88,8 @@ public class AccountFacade implements IClearingFacade { ImdgPredicateBuilder pb = accountImdg.predicateBuilder(); ImdgPredicate andPredicate = pb.and( pb.equals("accountType", AccountType.Anlt.getKey()), - pb.equals("currency", currencyCode) + pb.equals("currency", currencyCode), + pb.equals("account", eksAccount) ); Collection accountsAnlt = accountImdg.getCollectionObjectsByPredicate(andPredicate); if (accountsAnlt.isEmpty()) {