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

clearing-service account-service правки создания ClearingAccount

Browse source
This commit is contained in:
AKurakin 2023-06-08 14:45:52 +03:00
parent f5a7842ab1
commit 768ba7c47f
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -233,13 +233,9 @@ public class ClearingAccountService extends QueueConsumer implements Initializin
clearingAccountId = clearingAccountImdg.insert(clearingAccount); clearingAccountId = clearingAccountImdg.insert(clearingAccount);
log.trace("New account {}, clearingAccount {} was created.", accountId, clearingAccountId); log.trace("New account {}, clearingAccount {} was created.", accountId, clearingAccountId);
{ //todo как правильно заполнить реквест? {
TradingClearingRegistryNewRequest request = new TradingClearingRegistryNewRequest(); TradingClearingRegistryNewRequest request = new TradingClearingRegistryNewRequest();
if (AccountType.Depo.equalsByKey(clearingAccount.getClearingAccountType())) { request.setMoneyAccountId(accountId);
request.setDepoAccountId(accountId);
} else {
request.setMoneyAccountId(accountId);
}
request.setCompanyId(clearingAccount.getCompanyId()); request.setCompanyId(clearingAccount.getCompanyId());
toTCRRequests.add(request); toTCRRequests.add(request);
} }

6
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf01Executor.java
View file

@ -111,7 +111,7 @@ public class Sdf01Executor extends AbstractExecutor<SDf01> {
//на данном шаге company существует -> getId ok //на данном шаге company существует -> getId ok
//формируем пакетный запрос на добавление account //формируем пакетный запрос на добавление account
//ответ придет в этот же метод, process //ответ придет в этот же метод, 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()); log.info("account {} for sdf01.id={} not found - send request for creation", sdf01.getAccount(), sdf01.getId());
continue; continue;
} else if (ClearingErrorInternal.AccountNotPresent.equals(error.map(EnumMessage::getSubject).orElse(null))) { } else if (ClearingErrorInternal.AccountNotPresent.equals(error.map(EnumMessage::getSubject).orElse(null))) {
@ -182,11 +182,11 @@ public class Sdf01Executor extends AbstractExecutor<SDf01> {
return stmt; 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(); AccountSdfRequestPart req = new AccountSdfRequestPart();
req.setAccount(account); req.setAccount(account);
req.setCompanyId(companyId); req.setCompanyId(companyId);
req.setAccountType(AccountType.Clrn.getKey()); req.setAccountType(accountType);
req.setSdfId(sdf01Id); req.setSdfId(sdf01Id);
return req; return req;
} }