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

account-service http://jira.mfd.msk:8088/browse/CLS-527 правки

Browse source
This commit is contained in:
AKurakin 2023-09-20 11:39:45 +03:00
parent 6b7c41705c
commit 6a9867f477
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClearingAccountService.java
View file

@ -367,6 +367,7 @@ public class ClearingAccountService extends QueueConsumer implements Initializin
makeSdfErrorText(AccountError.AccountNotFound, SDFProcessService.SDF_STATUS_ERROR_COMPANY_NOT_FOUND))); makeSdfErrorText(AccountError.AccountNotFound, SDFProcessService.SDF_STATUS_ERROR_COMPANY_NOT_FOUND)));
continue; continue;
} }
toProcessSDF53.add(new MutableTriple<>(sDf52, account, SDFProcessService.SDF_STATUS_OK));
toUpdate.add(new Pair<>(sDf52, account)); toUpdate.add(new Pair<>(sDf52, account));
} }
} }
@ -447,12 +448,13 @@ public class ClearingAccountService extends QueueConsumer implements Initializin
account = accountImdg.getSingleObjectByID(account.getId()); account = accountImdg.getSingleObjectByID(account.getId());
if (!newStatus.equalsByKey(account.getStatus())) { if (!newStatus.equalsByKey(account.getStatus())) {
// Обновление счёта // Обновление счёта
String oldStatus = account.getStatus();
account.setStatus(newStatus.getKey()); account.setStatus(newStatus.getKey());
account.setUpdated(now); account.setUpdated(now);
accountImdg.update(account); accountImdg.update(account);
log.trace("S_DF52[{}] do update status to {} for account[{}]", log.trace("S_DF52[{}] do update status to {} for account[{}]",
sdf.getId(), newStatus.getKey(), account.getId()); sdf.getId(), newStatus.getKey(), account.getId());
if (AccountStatus.ACTIVE == newStatus) { if (AccountStatus.ACTIVE.equalsByKey(oldStatus) && AccountStatus.ACTIVE != newStatus) { // счёт заблокировали - значит блокируем ТКР, наоборот не надо.
// Отправка в ТКР // Отправка в ТКР
TradingClearingRegistryUpdateRequest tcrReq = new TradingClearingRegistryUpdateRequest(); TradingClearingRegistryUpdateRequest tcrReq = new TradingClearingRegistryUpdateRequest();
tcrReq.setMoneyAccountId(account.getId()); tcrReq.setMoneyAccountId(account.getId());