From 63e54ae918015acc246094d50ab2603c76d1e2a2 Mon Sep 17 00:00:00 2001 From: ialbert Date: Thu, 6 Oct 2022 09:37:25 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-36 --- .../clearing/balance/service/AccountBalanceService.java | 4 ++-- .../classes/statics/data/account/AccountBalance.java | 6 +++--- .../imdg/businessobject/AccountBalanceMapStore.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/AccountBalanceService.java b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/AccountBalanceService.java index 3eff4627f..3e46d3f42 100644 --- a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/AccountBalanceService.java +++ b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/AccountBalanceService.java @@ -52,7 +52,7 @@ public class AccountBalanceService { accountBalance.setCompanyId(addresseeId); accountBalance.setCreated(Instant.now()); accountBalance.setAccountId(accountId); -//fixme accountBalance.setAccountType(account.getAccountType()); + accountBalance.setAccountType(account.getAccountType()); accountBalance.setAccount(account.getAccount()); accountBalance.setOpenBalanceAmount(amount); accountBalance.setFreeBalanceAmount(amount); @@ -67,7 +67,7 @@ public class AccountBalanceService { } else { accountBalance.setUpdated(Instant.now()); accountBalance.setAccountId(accountId); - //fixme accountBalance.setAccountType(account.getAccountType()); + accountBalance.setAccountType(account.getAccountType()); accountBalance.setAccount(account.getAccount()); accountBalance.setOpenBalanceAmount(amount); accountBalance.setFreeBalanceAmount(amount); diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/AccountBalance.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/AccountBalance.java index ad7611ace..c34a3fb4e 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/AccountBalance.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/AccountBalance.java @@ -15,7 +15,7 @@ public class AccountBalance extends BusinessObject { private static final long serialVersionUID = ConstSerializable.serialVersionUID; private Long companyId; private Long accountId; - private Long accountType; + private String accountType; private String account; private BigDecimal openBalanceAmount; private BigDecimal startBalanceAmount; @@ -49,11 +49,11 @@ public class AccountBalance extends BusinessObject { this.accountId = accountId; } - public Long getAccountType() { + public String getAccountType() { return accountType; } - public void setAccountType(Long accountType) { + public void setAccountType(String accountType) { this.accountType = accountType; } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/AccountBalanceMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/AccountBalanceMapStore.java index ce5fedc49..37ab57966 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/AccountBalanceMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/AccountBalanceMapStore.java @@ -47,7 +47,7 @@ public class AccountBalanceMapStore extends TemplateMapStore { object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT")); object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT")); object.setAccountId(resultSet.getObject("ACCOUNT_ID", Long.class)); - object.setAccountType(resultSet.getObject("ACCOUNT_TYPE", Long.class)); + object.setAccountType(resultSet.getObject("ACCOUNT_TYPE", String.class)); object.setAccount(resultSet.getObject("ACCOUNT", String.class)); object.setOpenBalanceAmount(resultSet.getObject("OPEN_BALANCE_AMOUNT", BigDecimal.class)); object.setStartBalanceAmount(resultSet.getObject("START_BALANCE_AMOUNT", BigDecimal.class));