提交 176eade3 authored 作者: huyufan's avatar huyufan

bug修复

上级 04c9f931
...@@ -183,11 +183,11 @@ public class OwnerAccountServiceImpl implements OwnerAccountService { ...@@ -183,11 +183,11 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
//账户余额 //账户余额
runningWaterRecord.setAccountBalance(account.getAccountBalance()); runningWaterRecord.setAccountBalance(account.getAccountBalance());
//冻结金额 //冻结金额
runningWaterRecord.setFrozenBalance(caseOutBalance); runningWaterRecord.setFrozenBalance(account.getFrozenBalance().add(caseOutBalance));
//扣除金额 //扣除金额
runningWaterRecord.setTakeOutBalance(BigDecimal.ZERO); runningWaterRecord.setTakeOutBalance(BigDecimal.ZERO);
//可用余额 //可用余额
runningWaterRecord.setUsableBalance(account.getUsableBalance()); runningWaterRecord.setUsableBalance(account.getUsableBalance().subtract(caseOutBalance));
runningWaterRecord.setOwnerUserNo(param.getOwnerUserNo()); runningWaterRecord.setOwnerUserNo(param.getOwnerUserNo());
runningWaterRecord.setAccountType(param.getAccountType()); runningWaterRecord.setAccountType(param.getAccountType());
...@@ -710,8 +710,8 @@ public class OwnerAccountServiceImpl implements OwnerAccountService { ...@@ -710,8 +710,8 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
marginAccount.setRelationId(null); marginAccount.setRelationId(null);
marginAccount.setAlterationBalance(ensureBalance); marginAccount.setAlterationBalance(ensureBalance);
marginAccount.setFrozenBalance(ensureBalance); marginAccount.setFrozenBalance(ownerAccount.getFrozenBalance().add(ensureBalance));
marginAccount.setUsableBalance(ownerAccount.getUsableBalance()); marginAccount.setUsableBalance(ownerAccount.getUsableBalance().subtract(ensureBalance));
marginAccount.setTakeOutBalance(BigDecimal.ZERO); marginAccount.setTakeOutBalance(BigDecimal.ZERO);
marginAccount.setAccountBalance(ownerAccount.getAccountBalance()); marginAccount.setAccountBalance(ownerAccount.getAccountBalance());
marginAccount.setOwnerUserNo(userNo); marginAccount.setOwnerUserNo(userNo);
...@@ -731,8 +731,8 @@ public class OwnerAccountServiceImpl implements OwnerAccountService { ...@@ -731,8 +731,8 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
prepaidFreight.setRelationId(null); prepaidFreight.setRelationId(null);
prepaidFreight.setAlterationBalance(frozenBalance); prepaidFreight.setAlterationBalance(frozenBalance);
prepaidFreight.setFrozenBalance(frozenBalance); prepaidFreight.setFrozenBalance(ownerAccount.getFrozenBalance().add(frozenBalance));
prepaidFreight.setUsableBalance(ownerAccount.getUsableBalance()); prepaidFreight.setUsableBalance(ownerAccount.getUsableBalance().subtract(frozenBalance));
prepaidFreight.setTakeOutBalance(BigDecimal.ZERO); prepaidFreight.setTakeOutBalance(BigDecimal.ZERO);
prepaidFreight.setAccountBalance(ownerAccount.getAccountBalance()); prepaidFreight.setAccountBalance(ownerAccount.getAccountBalance());
prepaidFreight.setOwnerUserNo(userNo); prepaidFreight.setOwnerUserNo(userNo);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论