Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test

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

@@ -119,9 +119,10 @@ public class SettlementServiceImpl implements SettlementService {
 
                     } else {
                         if (subtract.subtract(ans).compareTo(BigDecimal.ZERO) >= 0) {
-                            OwnerAccount account = ownerAccountDao.getAccountByOwnerUserNoAndAccountType(orderChild.getOwnerUserNo(),
-                                    OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode());
+                            OwnerAccount account = null;
                             while (true) {
+                                account = ownerAccountDao.getAccountByOwnerUserNoAndAccountType(orderChild.getOwnerUserNo(),
+                                        OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode());
                                 OwnerAccount update = new OwnerAccount();
                                 update.setId(account.getId());
                                 update.setAccountBalance(ans);