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

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

Browse source
This commit is contained in:
ialbert 2022-10-06 09:37:25 +03:00
parent 10fa810151
commit 63e54ae918
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/AccountBalanceService.java
View file

@ -52,7 +52,7 @@ public class AccountBalanceService {
accountBalance.setCompanyId(addresseeId); accountBalance.setCompanyId(addresseeId);
accountBalance.setCreated(Instant.now()); accountBalance.setCreated(Instant.now());
accountBalance.setAccountId(accountId); accountBalance.setAccountId(accountId);
//fixme accountBalance.setAccountType(account.getAccountType()); accountBalance.setAccountType(account.getAccountType());
accountBalance.setAccount(account.getAccount()); accountBalance.setAccount(account.getAccount());
accountBalance.setOpenBalanceAmount(amount); accountBalance.setOpenBalanceAmount(amount);
accountBalance.setFreeBalanceAmount(amount); accountBalance.setFreeBalanceAmount(amount);
@ -67,7 +67,7 @@ public class AccountBalanceService {
} else { } else {
accountBalance.setUpdated(Instant.now()); accountBalance.setUpdated(Instant.now());
accountBalance.setAccountId(accountId); accountBalance.setAccountId(accountId);
//fixme accountBalance.setAccountType(account.getAccountType()); accountBalance.setAccountType(account.getAccountType());
accountBalance.setAccount(account.getAccount()); accountBalance.setAccount(account.getAccount());
accountBalance.setOpenBalanceAmount(amount); accountBalance.setOpenBalanceAmount(amount);
accountBalance.setFreeBalanceAmount(amount); accountBalance.setFreeBalanceAmount(amount);

6
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/AccountBalance.java
View file

@ -15,7 +15,7 @@ public class AccountBalance extends BusinessObject {
private static final long serialVersionUID = ConstSerializable.serialVersionUID; private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private Long companyId; private Long companyId;
private Long accountId; private Long accountId;
private Long accountType; private String accountType;
private String account; private String account;
private BigDecimal openBalanceAmount; private BigDecimal openBalanceAmount;
private BigDecimal startBalanceAmount; private BigDecimal startBalanceAmount;
@ -49,11 +49,11 @@ public class AccountBalance extends BusinessObject {
this.accountId = accountId; this.accountId = accountId;
} }
public Long getAccountType() { public String getAccountType() {
return accountType; return accountType;
} }
public void setAccountType(Long accountType) { public void setAccountType(String accountType) {
this.accountType = accountType; this.accountType = accountType;
} }

2
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/AccountBalanceMapStore.java
View file

@ -47,7 +47,7 @@ public class AccountBalanceMapStore extends TemplateMapStore<AccountBalance> {
object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT")); object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT"));
object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT")); object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
object.setAccountId(resultSet.getObject("ACCOUNT_ID", Long.class)); 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.setAccount(resultSet.getObject("ACCOUNT", String.class));
object.setOpenBalanceAmount(resultSet.getObject("OPEN_BALANCE_AMOUNT", BigDecimal.class)); object.setOpenBalanceAmount(resultSet.getObject("OPEN_BALANCE_AMOUNT", BigDecimal.class));
object.setStartBalanceAmount(resultSet.getObject("START_BALANCE_AMOUNT", BigDecimal.class)); object.setStartBalanceAmount(resultSet.getObject("START_BALANCE_AMOUNT", BigDecimal.class));