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

@@ -127,8 +127,7 @@ public class SettlementServiceImpl implements SettlementService {
                                 update.setAccountBalance(ans);
                                 update.setModifiedTime(account.getModifiedTime());
                                 update.setFrozenBalance(ans);
-                                update.setUsableBalance(BigDecimal.ZERO);
-                                Integer i = ownerAccountDao.updateAccountCAS(update, LocalDateTime.now(), false);
+                                Integer i = ownerAccountDao.updateOwnerAccountForConfirm(update);
                                 if (null != i && i >0 ) {
                                     break;
                                 }