From 4ac51b04eff4d197ba1e3270bb1b565eda881b8a Mon Sep 17 00:00:00 2001 From: aalehin Date: Thu, 22 Jun 2023 16:00:22 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-280 --- refactor --- .../registry/service/MoneyBalanceRegisterService.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java index 0dc17aa56..7c99e87a3 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java @@ -91,16 +91,17 @@ public class MoneyBalanceRegisterService extends QueueConsumer implements Initia String accountType = registry.getAccountType(); String account = null; String infoAccount = null; - if (accountType.equalsIgnoreCase("CLRN")) { - account = registry.getAccount(); + if ("CLRN".equalsIgnoreCase(accountType)) { Account accountValue = accountMap.getSingleObjectByFieldValues(Map.of("companyId", registry.getCompanyId(), "accountType", "INFO")); + account = registry.getAccount(); 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 != null ? accountValue.getAccount() : null; infoAccount = registry.getAccount(); } moneyBalanceRegister.setSetHouseName(setHouseName); + moneyBalanceRegister.setCompanyFullName(registry.getFullName()); moneyBalanceRegister.setAccount(account); moneyBalanceRegister.setInfoAccount(infoAccount); moneyBalanceRegister.setRemainderSum(registry.getCloseBalance());