Merge remote-tracking branch 'origin/v5.5_settlement_20231011' into release

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

@@ -711,8 +711,8 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
 
                         marginAccount.setRelationId(null);
                         marginAccount.setAlterationBalance(ensureBalance);
-                        marginAccount.setFrozenBalance(ownerAccount.getFrozenBalance().add(ensureBalance));
-                        marginAccount.setUsableBalance(ownerAccount.getUsableBalance().subtract(ensureBalance));
+                        marginAccount.setFrozenBalance(ownerAccount.getFrozenBalance());
+                        marginAccount.setUsableBalance(ownerAccount.getUsableBalance());
                         marginAccount.setTakeOutBalance(BigDecimal.ZERO);
                         marginAccount.setAccountBalance(ownerAccount.getAccountBalance());
                         marginAccount.setOwnerUserNo(userNo);
@@ -732,8 +732,8 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
 
                         prepaidFreight.setRelationId(null);
                         prepaidFreight.setAlterationBalance(frozenBalance);
-                        prepaidFreight.setFrozenBalance(ownerAccount.getFrozenBalance().add(frozenBalance));
-                        prepaidFreight.setUsableBalance(ownerAccount.getUsableBalance().subtract(frozenBalance));
+                        prepaidFreight.setFrozenBalance(ownerAccount.getFrozenBalance());
+                        prepaidFreight.setUsableBalance(ownerAccount.getUsableBalance());
                         prepaidFreight.setTakeOutBalance(BigDecimal.ZERO);
                         prepaidFreight.setAccountBalance(ownerAccount.getAccountBalance());
                         prepaidFreight.setOwnerUserNo(userNo);
@@ -791,7 +791,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
                     OwnerAccount entity = new OwnerAccount();
                     entity.setId(account.getId());
                     entity.setModifiedTime(account.getModifiedTime());
-                    entity.setAccountBalance(runningWaterRecord.getAlterationBalance());
+                    entity.setAccountBalance(BigDecimal.ZERO);
                     entity.setUsableBalance(runningWaterRecord.getAlterationBalance());
                     entity.setFrozenBalance(runningWaterRecord.getAlterationBalance());
                     flag += ownerAccountDao.thawAccount(entity, LocalDateTime.now());
@@ -811,7 +811,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
 
                             prepaidFreight.setRelationId(null);
                             prepaidFreight.setAlterationBalance(runningWaterRecord.getAlterationBalance());
-                            prepaidFreight.setFrozenBalance(BigDecimal.ZERO);
+                            prepaidFreight.setFrozenBalance(account.getFrozenBalance());
                             prepaidFreight.setUsableBalance(account.getUsableBalance());
                             prepaidFreight.setTakeOutBalance(BigDecimal.ZERO);
                             prepaidFreight.setAccountBalance(account.getAccountBalance());
@@ -832,7 +832,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
 
                             prepaidFreight.setRelationId(null);
                             prepaidFreight.setAlterationBalance(runningWaterRecord.getAlterationBalance());
-                            prepaidFreight.setFrozenBalance(BigDecimal.ZERO);
+                            prepaidFreight.setFrozenBalance(account.getFrozenBalance());
                             prepaidFreight.setUsableBalance(account.getUsableBalance());
                             prepaidFreight.setTakeOutBalance(BigDecimal.ZERO);
                             prepaidFreight.setAccountBalance(account.getAccountBalance());