From 6a9867f477985ad765ec18fa0f34b99cf404a604 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Wed, 20 Sep 2023 11:39:45 +0300 Subject: [PATCH] =?UTF-8?q?account-service=20http://jira.mfd.msk:8088/brow?= =?UTF-8?q?se/CLS-527=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clearing/account/service/ClearingAccountService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClearingAccountService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClearingAccountService.java index 7b3bc5045..587c18b5f 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClearingAccountService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClearingAccountService.java @@ -367,6 +367,7 @@ public class ClearingAccountService extends QueueConsumer implements Initializin makeSdfErrorText(AccountError.AccountNotFound, SDFProcessService.SDF_STATUS_ERROR_COMPANY_NOT_FOUND))); continue; } + toProcessSDF53.add(new MutableTriple<>(sDf52, account, SDFProcessService.SDF_STATUS_OK)); toUpdate.add(new Pair<>(sDf52, account)); } } @@ -447,12 +448,13 @@ public class ClearingAccountService extends QueueConsumer implements Initializin account = accountImdg.getSingleObjectByID(account.getId()); if (!newStatus.equalsByKey(account.getStatus())) { // Обновление счёта + String oldStatus = account.getStatus(); account.setStatus(newStatus.getKey()); account.setUpdated(now); accountImdg.update(account); log.trace("S_DF52[{}] do update status to {} for account[{}]", sdf.getId(), newStatus.getKey(), account.getId()); - if (AccountStatus.ACTIVE == newStatus) { + if (AccountStatus.ACTIVE.equalsByKey(oldStatus) && AccountStatus.ACTIVE != newStatus) { // счёт заблокировали - значит блокируем ТКР, наоборот не надо. // Отправка в ТКР TradingClearingRegistryUpdateRequest tcrReq = new TradingClearingRegistryUpdateRequest(); tcrReq.setMoneyAccountId(account.getId());