From 768ba7c47f12341522c0d25c7a4f5b70822b2c3d Mon Sep 17 00:00:00 2001 From: AKurakin Date: Thu, 8 Jun 2023 14:45:52 +0300 Subject: [PATCH] =?UTF-8?q?clearing-service=20account-service=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20ClearingAccount?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clearing/account/service/ClearingAccountService.java | 8 ++------ .../spcex/clearing/service/executors/Sdf01Executor.java | 6 +++--- 2 files changed, 5 insertions(+), 9 deletions(-) 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 8bc8ce9de..39b06249c 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 @@ -233,13 +233,9 @@ public class ClearingAccountService extends QueueConsumer implements Initializin clearingAccountId = clearingAccountImdg.insert(clearingAccount); log.trace("New account {}, clearingAccount {} was created.", accountId, clearingAccountId); - { //todo как правильно заполнить реквест? + { TradingClearingRegistryNewRequest request = new TradingClearingRegistryNewRequest(); - if (AccountType.Depo.equalsByKey(clearingAccount.getClearingAccountType())) { - request.setDepoAccountId(accountId); - } else { - request.setMoneyAccountId(accountId); - } + request.setMoneyAccountId(accountId); request.setCompanyId(clearingAccount.getCompanyId()); toTCRRequests.add(request); } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf01Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf01Executor.java index 94132651c..a82619191 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf01Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf01Executor.java @@ -111,7 +111,7 @@ public class Sdf01Executor extends AbstractExecutor { //на данном шаге company существует -> getId ok //формируем пакетный запрос на добавление account //ответ придет в этот же метод, process - result.getAccountRequests().add(createAccountRequestPart(sdf01.getId(), sdf01.getAccount(), company.getId())); + result.getAccountRequests().add(createAccountRequestPart(sdf01.getId(), sdf01.getAccount(), sdf01.getAcc_type(), company.getId())); log.info("account {} for sdf01.id={} not found - send request for creation", sdf01.getAccount(), sdf01.getId()); continue; } else if (ClearingErrorInternal.AccountNotPresent.equals(error.map(EnumMessage::getSubject).orElse(null))) { @@ -182,11 +182,11 @@ public class Sdf01Executor extends AbstractExecutor { return stmt; } - private AccountSdfRequestPart createAccountRequestPart(Long sdf01Id, String account, Long companyId) { + private AccountSdfRequestPart createAccountRequestPart(Long sdf01Id, String account, String accountType, Long companyId) { AccountSdfRequestPart req = new AccountSdfRequestPart(); req.setAccount(account); req.setCompanyId(companyId); - req.setAccountType(AccountType.Clrn.getKey()); + req.setAccountType(accountType); req.setSdfId(sdf01Id); return req; }