Merge remote-tracking branch 'origin/test' into test

performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java

@@ -862,8 +862,8 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
 
                         prepaidFreight.setRelationId(null);
                         prepaidFreight.setAlterationBalance(frozenBalance);
-                        prepaidFreight.setFrozenBalance(ownerAccount.getFrozenBalance());
-                        prepaidFreight.setUsableBalance(ownerAccount.getUsableBalance());
+                        prepaidFreight.setFrozenBalance(ownerAccount.getFrozenBalance().add(frozenBalance));
+                        prepaidFreight.setUsableBalance(ownerAccount.getUsableBalance().subtract(frozenBalance));
                         prepaidFreight.setTakeOutBalance(BigDecimal.ZERO);
                         prepaidFreight.setAccountBalance(ownerAccount.getAccountBalance());
                         prepaidFreight.setOwnerUserNo(userNo);

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementServiceImpl.java

@@ -123,7 +123,6 @@ public class SettlementServiceImpl implements SettlementService {
                             settlementDriverDetail.setPrepayFreightFlag(1);
 
                             settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode());
-                            BigDecimal accountBalance = account.getAccountBalance().subtract(ans);
                             //生成扣除流水
                             OwnerRunningWaterRecord runningWaterRecord = new OwnerRunningWaterRecord();
                             runningWaterRecord.setOwnerUserName(orderChild.getOwnerName());
@@ -135,10 +134,10 @@ public class SettlementServiceImpl implements SettlementService {
                             runningWaterRecord.setOrderChildNo(orderChild.getChildNo());
                             runningWaterRecord.setRelationId(null);
                             runningWaterRecord.setAlterationBalance(ans);
-                            runningWaterRecord.setFrozenBalance(subtract.subtract(ans));
+                            runningWaterRecord.setFrozenBalance(account.getFrozenBalance().subtract(ans));
                             runningWaterRecord.setUsableBalance(account.getUsableBalance());
                             runningWaterRecord.setTakeOutBalance(ans);
-                            runningWaterRecord.setAccountBalance(accountBalance);
+                            runningWaterRecord.setAccountBalance(account.getFrozenBalance().subtract(ans).add(account.getUsableBalance()));
                             runningWaterRecord.setOwnerUserNo(account.getOwnerUserNo());
 
                             runningWaterRecord.setAccountType(OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode());