提交 04c9f931 authored 作者: huyufan's avatar huyufan

bug修复

上级 a3e3eb91
......@@ -153,7 +153,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
OwnerAccount update = new OwnerAccount();
update.setUsableBalance(caseOutBalance);
update.setFrozenBalance(caseOutBalance);
update.setAccountBalance(caseOutBalance);
update.setAccountBalance(BigDecimal.ZERO);
update.setModifiedTime(account.getModifiedTime());
update.setId(account.getId());
Integer flag = ownerAccountDao.updateAccountCAS(update, now, false);
......@@ -181,7 +181,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
//变动金额
runningWaterRecord.setAlterationBalance(caseOutBalance);
//账户余额
//runningWaterRecord.setAccountBalance(account.getAccountBalance());
runningWaterRecord.setAccountBalance(account.getAccountBalance());
//冻结金额
runningWaterRecord.setFrozenBalance(caseOutBalance);
//扣除金额
......@@ -676,7 +676,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
//可用余额
entity.setUsableBalance(ensureBalance);
//账户余额
//entity.setAccountBalance(ensureBalance);
entity.setAccountBalance(BigDecimal.ZERO);
//updateList.add(entity);
flag += ownerAccountDao.updateAccountCAS(entity, now, false);
......@@ -689,7 +689,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
//可用余额
entity.setUsableBalance(frozenBalance);
//账户余额
entity.setAccountBalance(frozenBalance);
entity.setAccountBalance(BigDecimal.ZERO);
//updateList.add(entity);
flag += ownerAccountDao.updateAccountCAS(entity, now, false);
}
......@@ -713,7 +713,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
marginAccount.setFrozenBalance(ensureBalance);
marginAccount.setUsableBalance(ownerAccount.getUsableBalance());
marginAccount.setTakeOutBalance(BigDecimal.ZERO);
//marginAccount.setAccountBalance(ownerAccount.getAccountBalance());
marginAccount.setAccountBalance(ownerAccount.getAccountBalance());
marginAccount.setOwnerUserNo(userNo);
marginAccount.setAccountType(OwnerAccountEnum.AccountTypeStatus.MARGIN_ACCOUNT.getCode());
......@@ -734,7 +734,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
prepaidFreight.setFrozenBalance(frozenBalance);
prepaidFreight.setUsableBalance(ownerAccount.getUsableBalance());
prepaidFreight.setTakeOutBalance(BigDecimal.ZERO);
//prepaidFreight.setAccountBalance(ownerAccount.getAccountBalance());
prepaidFreight.setAccountBalance(ownerAccount.getAccountBalance());
prepaidFreight.setOwnerUserNo(userNo);
prepaidFreight.setAccountType(OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论