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

http://jira.mfd.msk:8088/browse/CLS-280

Browse source 
---
refactor
This commit is contained in:
aalehin 2023-06-22 16:00:22 +03:00
parent b18e047f84
commit 4ac51b04ef
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java
View file

@ -91,16 +91,17 @@ public class MoneyBalanceRegisterService extends QueueConsumer implements Initia
String accountType = registry.getAccountType(); String accountType = registry.getAccountType();
String account = null; String account = null;
String infoAccount = null; String infoAccount = null;
if (accountType.equalsIgnoreCase("CLRN")) { if ("CLRN".equalsIgnoreCase(accountType)) {
account = registry.getAccount();
Account accountValue = accountMap.getSingleObjectByFieldValues(Map.of("companyId", registry.getCompanyId(), "accountType", "INFO")); Account accountValue = accountMap.getSingleObjectByFieldValues(Map.of("companyId", registry.getCompanyId(), "accountType", "INFO"));
account = registry.getAccount();
infoAccount = accountValue != null ? accountValue.getAccount() : null; infoAccount = accountValue != null ? accountValue.getAccount() : null;
} else if (accountType.equalsIgnoreCase("INFO")) { } else if ("INFO".equalsIgnoreCase(accountType)) {
Account accountValue = accountMap.getSingleObjectByFieldValues(Map.of("companyId", registry.getCompanyId(), "accountType", "CLRN")); Account accountValue = accountMap.getSingleObjectByFieldValues(Map.of("companyId", registry.getCompanyId(), "accountType", "CLRN"));
account = accountValue != null ? accountValue.getAccount() : null; account = accountValue != null ? accountValue.getAccount() : null;
infoAccount = registry.getAccount(); infoAccount = registry.getAccount();
} }
moneyBalanceRegister.setSetHouseName(setHouseName); moneyBalanceRegister.setSetHouseName(setHouseName);
moneyBalanceRegister.setCompanyFullName(registry.getFullName());
moneyBalanceRegister.setAccount(account); moneyBalanceRegister.setAccount(account);
moneyBalanceRegister.setInfoAccount(infoAccount); moneyBalanceRegister.setInfoAccount(infoAccount);
moneyBalanceRegister.setRemainderSum(registry.getCloseBalance()); moneyBalanceRegister.setRemainderSum(registry.getCloseBalance());