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

@@ -37,6 +37,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
 
@@ -122,7 +123,7 @@ 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());
@@ -137,13 +138,25 @@ public class SettlementServiceImpl implements SettlementService {
                             runningWaterRecord.setFrozenBalance(subtract.subtract(ans));
                             runningWaterRecord.setUsableBalance(account.getUsableBalance());
                             runningWaterRecord.setTakeOutBalance(ans);
-                            runningWaterRecord.setAccountBalance(account.getAccountBalance().subtract(ans));
+                            runningWaterRecord.setAccountBalance(accountBalance);
                             runningWaterRecord.setOwnerUserNo(account.getOwnerUserNo());
 
                             runningWaterRecord.setAccountType(OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode());
                             runningWaterRecord.setRunningWaterType(OwnerAccountEnum.RunningWaterStatus.TAKE_OUT.getCode());
                             runningWaterRecord.setRunningWaterNo(idGenerateSnowFlake.nextId(IdTypeEnum.Type.TAKE_OUT.getCode()));
                             ownerRunningWaterRecordDao.saveEntity(runningWaterRecord);
+                            while (true) {
+                                OwnerAccount update = new OwnerAccount();
+                                update.setId(account.getId());
+                                update.setAccountBalance(ans);
+                                update.setModifiedTime(account.getModifiedTime());
+                                update.setFrozenBalance(BigDecimal.ZERO);
+                                update.setUsableBalance(BigDecimal.ZERO);
+                                Integer i = ownerAccountDao.updateAccountCAS(update, LocalDateTime.now(), false);
+                                if (null != i && i >0 ) {
+                                    break;
+                                }
+                            }
                         } else {
                             settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
                         }