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

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

 package com.clx.performance.service.impl.settle;
 
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.component.IdGenerateSnowFlake;
 import com.clx.performance.dao.settle.NetworkCaseOutRecordDao;
@@ -68,8 +69,9 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void generateSettlementRunningWaterRecord(Long userNo, BigDecimal money) {
+        log.info("运单同步网络货运生成司机运单结算流水");
         NetworkDriverAccount networkDriverAccount = networkDriverAccountDao.getOneByField(NetworkDriverAccount::getDriverUserNo, userNo).get();
-
+        log.info("查询出NetworkDriverAccount{}", JSONUtil.parse(networkDriverAccount));
         NetworkDriverAccount build = NetworkDriverAccount.builder().id(networkDriverAccount.getId())
                 .usableBalance(money)
                 .frozenBalance(BigDecimal.ZERO)
@@ -78,6 +80,7 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
             NetworkDriverAccount account = networkDriverAccountDao.getEntityByKey(build.getId()).get();
             build.setModifiedTime(account.getModifiedTime());
             Integer i = networkDriverAccountDao.updateAccountCAS(build, LocalDateTime.now(), true);
+            log.info("网络货运账户更新成功");
             if (i == 1) {
                 account = networkDriverAccountDao.getEntityByKey(build.getId()).get();
                 NetworkDriverRunningWaterRecord entity = NetworkDriverRunningWaterRecord.builder()
@@ -108,8 +111,9 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
      */
     @Override
     public void generateCaseOutFrozenRunningWaterRecord(Long userNo, BigDecimal money) {
+        log.info("运单同步网络货运后司机运单提现冻结流水");
         NetworkDriverAccount networkDriverAccount = networkDriverAccountDao.getOneByField(NetworkDriverAccount::getDriverUserNo, userNo).get();
-
+        log.info("查询出NetworkDriverAccount{}", JSONUtil.parse(networkDriverAccount));
         NetworkDriverAccount build = NetworkDriverAccount.builder().id(networkDriverAccount.getId())
                 .frozenBalance(money)
                 .accountBalance(BigDecimal.ZERO)
@@ -118,6 +122,7 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
             NetworkDriverAccount account = networkDriverAccountDao.getEntityByKey(build.getId()).get();
             build.setModifiedTime(account.getModifiedTime());
             Integer i = networkDriverAccountDao.updateAccountCAS(build, LocalDateTime.now(), false);
+            log.info("网络货运账户更新成功");
             if (i == 1) {
                 account = networkDriverAccountDao.getEntityByKey(build.getId()).get();
                 NetworkDriverRunningWaterRecord entity = NetworkDriverRunningWaterRecord.builder()
@@ -177,6 +182,7 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
     @Override
     public void generateNetworkDriverRunningWaterRecord(Long userNo, BigDecimal money, Integer runningWaterType) {
         if (NetworkDriverAccountEnum.RunningWaterStatus.SETTLEMENT.getCode().equals(runningWaterType)) {
+            log.info("执行生成网络货运钱包相关，参数userNo:{},money{},runningWaterType:{}", userNo, money, runningWaterType);
             strategyMap.get(NetworkDriverAccountEnum.RunningWaterStatus.SETTLEMENT.getCode()).accept(userNo, money);
             strategyMap.get(NetworkDriverAccountEnum.RunningWaterStatus.CASE_OUT_FROZEN.getCode()).accept(userNo, money);
         }