From f9898617e893a09d5480d95b0c80927e7a80db23 Mon Sep 17 00:00:00 2001
From: etreschenkov <ETreschenkov@mfd.ru>
Date: Fri, 19 Jun 2026 16:29:43 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-1039

---
 .../service/v2/listeners/ClientCodeMessageListener.java     | 3 +++
 .../GatewayUpdateEksClientCodeValidationRule.java           | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/listeners/ClientCodeMessageListener.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/listeners/ClientCodeMessageListener.java
index 0f0fa7a9d..55f4e3e54 100644
--- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/listeners/ClientCodeMessageListener.java
+++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/listeners/ClientCodeMessageListener.java
@@ -227,6 +227,9 @@ public class ClientCodeMessageListener extends QueueConsumer implements Initiali
 
             List<Long> accIds = new ArrayList<>();
             for (MoneyAccountMsgRequest account : tkrAccount.getMoneyAccounts()) {
+                if (account.getStatus().equals("NOW")) {
+                    continue;
+                }
                 if (StringUtils.hasText(account.getEks_account())) {
                     log.debug("eks_account is filled, creating info account: {}", account.getEks_account());
                     Pair<Long, String> accId = accountFacade.createAccountInfo(account, company);
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 d87781fa7..71cf5bafe 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
@@ -132,16 +132,16 @@ public enum GatewayUpdateEksClientCodeValidationRule implements IValidationRule<
             TradingClearingRegistry tkr = context.getStoredObject(ClientCodeStoreObjects.TRADING_CLEARING_REGISTRY);
             Imdg<ClientCode> clientCodeImdg = context.obtainMap(IMDGDistributedNames.Map_ClientCode, ClientCode.class);
             ImdgPredicateBuilder predicate = clientCodeImdg.predicateBuilder();
-            String trkCode = validatedObject.getTkrCode();
+            String clientCode = validatedObject.getClientCode();
             ClientCode existClientCode = clientCodeImdg.getSingleObjectByPredicate(
                 predicate.and(
-                    predicate.equals("code", validatedObject.getClientCode()),
+                    predicate.equals("code", clientCode),
                     predicate.equals("tradingClearingRegistryId", tkr.getId()),
                     predicate.equals("status", Status.Active.getKey())
                 )
             );
             if (existClientCode == null) {
-                return of(AccountError.ClientCodeNotFound, trkCode);
+                return of(AccountError.ClientCodeNotFound, clientCode);
             }
             context.storeObject(ClientCodeStoreObjects.CLIENT_CODE, existClientCode);
             return empty();