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

performance-web/src/main/java/com/clx/performance/mapper/settle/NetworkDriverAccountMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.model.settle.NetworkDriverAccount;
 import com.clx.performance.param.pc.PageNetworkAccountListParam;
 import com.clx.performance.sqlProvider.settle.NetworkDriverAccountProvider;
+import com.clx.performance.vo.pc.IntegralRecordVO;
 import com.clx.performance.vo.pc.NetworkDriverAccountVO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.SelectProvider;
@@ -19,7 +20,7 @@ import org.apache.ibatis.annotations.Update;
 public interface NetworkDriverAccountMapper extends BaseMapper<NetworkDriverAccount> {
 
     @SelectProvider(type = NetworkDriverAccountProvider.class, method = "networkAccountList")
-    IPage<NetworkDriverAccountVO> networkAccountList(Page<NetworkDriverAccountVO> page, PageNetworkAccountListParam param);
+    IPage<NetworkDriverAccountVO> networkAccountList(@Param("page")Page<NetworkDriverAccountVO> page, @Param("param")PageNetworkAccountListParam param);
 
     @Update("update network_driver_account set usable_balance = usable_balance + #{account.usableBalance}"
             + ",account_balance = account_balance + #{account.accountBalance}"

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

@@ -160,10 +160,11 @@ public class OrderChildServiceImpl implements OrderChildService {
     private ZjxlGpsService zjxlGpsService;
 
     @Autowired
-    private OwnerRunningWaterRecordDao ownerRunningWaterRecordDao;
+    private UserService userService;
+
 
     @Autowired
-    private UserService userService;
+    private OwnerRunningWaterRecordDao ownerRunningWaterRecordDao;
 
 
     @Override

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

@@ -71,6 +71,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j

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

@@ -73,9 +73,9 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
         NetworkDriverAccount networkDriverAccount = networkDriverAccountDao.getOneByField(NetworkDriverAccount::getDriverUserNo, settlementDriverDetail.getDriverUserNo()).get();
         log.info("查询出NetworkDriverAccount{}", JSONUtil.parse(networkDriverAccount));
         NetworkDriverAccount build = NetworkDriverAccount.builder().id(networkDriverAccount.getId())
-                .usableBalance(settlementDriverDetail.getFreight())
+                .usableBalance(settlementDriverDetail.getSettlementFreight())
                 .frozenBalance(BigDecimal.ZERO)
-                .accountBalance(settlementDriverDetail.getFreight()).build();
+                .accountBalance(settlementDriverDetail.getSettlementFreight()).build();
         while (true) {
             NetworkDriverAccount account = networkDriverAccountDao.getEntityByKey(build.getId()).get();
             build.setModifiedTime(account.getModifiedTime());
@@ -86,7 +86,8 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
                 NetworkDriverRunningWaterRecord entity = NetworkDriverRunningWaterRecord.builder()
                         .mobile(networkDriverAccount.getMobile())
                         .usableBalance(account.getUsableBalance())
-                        .alterationBalance(settlementDriverDetail.getFreight()).accountBalance(account.getAccountBalance())
+                        .alterationBalance(settlementDriverDetail.getSettlementFreight())
+                        .accountBalance(account.getAccountBalance())
                         .frozenBalance(account.getFrozenBalance()).createBy("系统")
                         .fundType(NetworkDriverAccountEnum.FundType.INCOME.getCode())
                         .fundTypeMsg(NetworkDriverAccountEnum.FundType.INCOME.getMsg())
@@ -118,9 +119,9 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
         NetworkDriverAccount networkDriverAccount = networkDriverAccountDao.getOneByField(NetworkDriverAccount::getDriverUserNo, settlementDriverDetail.getDriverUserNo()).get();
         log.info("查询出NetworkDriverAccount{}", JSONUtil.parse(networkDriverAccount));
         NetworkDriverAccount build = NetworkDriverAccount.builder().id(networkDriverAccount.getId())
-                .frozenBalance(settlementDriverDetail.getFreight())
+                .frozenBalance(settlementDriverDetail.getSettlementFreight())
                 .accountBalance(BigDecimal.ZERO)
-                .usableBalance(settlementDriverDetail.getFreight()).build();
+                .usableBalance(settlementDriverDetail.getSettlementFreight()).build();
         while (true) {
             NetworkDriverAccount account = networkDriverAccountDao.getEntityByKey(build.getId()).get();
             build.setModifiedTime(account.getModifiedTime());
@@ -131,7 +132,8 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
                 NetworkDriverRunningWaterRecord entity = NetworkDriverRunningWaterRecord.builder()
                         .usableBalance(account.getUsableBalance())
                         .mobile(networkDriverAccount.getMobile())
-                        .alterationBalance(settlementDriverDetail.getFreight()).accountBalance(account.getAccountBalance())
+                        .alterationBalance(settlementDriverDetail.getSettlementFreight())
+                        .accountBalance(account.getAccountBalance())
                         .frozenBalance(account.getFrozenBalance()).createBy("系统")
                         .fundType(NetworkDriverAccountEnum.FundType.FROZEN.getCode())
                         .fundTypeMsg(NetworkDriverAccountEnum.FundType.FROZEN.getMsg())
@@ -159,9 +161,9 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
         NetworkDriverAccount networkDriverAccount = networkDriverAccountDao.getOneByField(NetworkDriverAccount::getDriverUserNo, settlementDriverDetail.getDriverUserNo()).get();
         log.info("查询出NetworkDriverAccount{}", JSONUtil.parse(networkDriverAccount));
         NetworkDriverAccount build = NetworkDriverAccount.builder().id(networkDriverAccount.getId())
-                .frozenBalance(settlementDriverDetail.getFreight().negate())
+                .frozenBalance(settlementDriverDetail.getSettlementFreight().negate())
                 .usableBalance(BigDecimal.ZERO)
-                .accountBalance(settlementDriverDetail.getFreight()).build();
+                .accountBalance(settlementDriverDetail.getSettlementFreight()).build();
         while (true) {
             NetworkDriverAccount account = networkDriverAccountDao.getEntityByKey(build.getId()).get();
             build.setModifiedTime(account.getModifiedTime());
@@ -174,7 +176,8 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
                 NetworkDriverRunningWaterRecord entity = NetworkDriverRunningWaterRecord.builder()
                         .usableBalance(account.getUsableBalance())
                         .mobile(networkDriverAccount.getMobile())
-                        .alterationBalance(settlementDriverDetail.getFreight()).accountBalance(account.getAccountBalance())
+                        .alterationBalance(settlementDriverDetail.getSettlementFreight())
+                        .accountBalance(account.getAccountBalance())
                         .frozenBalance(account.getFrozenBalance()).createBy("系统")
                         .fundType(NetworkDriverAccountEnum.FundType.EXPENDITURE.getCode())
                         .fundTypeMsg(NetworkDriverAccountEnum.FundType.EXPENDITURE.getMsg())
@@ -197,7 +200,7 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
     @Override
     public void generateNetworkDriverRunningWaterRecord(SettlementDriverDetail settlementDriverDetail, Integer runningWaterType) {
         if (NetworkDriverAccountEnum.RunningWaterStatus.SETTLEMENT.getCode().equals(runningWaterType)) {
-            log.info("执行生成网络货运钱包相关，参数userNo:{},money{},runningWaterType:{}", settlementDriverDetail.getDriverUserNo(), settlementDriverDetail.getPrepayFreight(), runningWaterType);
+            log.info("执行生成网络货运钱包相关，参数userNo:{},money{},runningWaterType:{}", settlementDriverDetail.getDriverUserNo(), settlementDriverDetail.getSettlementFreight(), runningWaterType);
             strategyMap.get(NetworkDriverAccountEnum.RunningWaterStatus.SETTLEMENT.getCode()).accept(settlementDriverDetail);
             strategyMap.get(NetworkDriverAccountEnum.RunningWaterStatus.CASE_OUT_FROZEN.getCode()).accept(settlementDriverDetail);
         }
@@ -228,7 +231,7 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
                 .status(NetworkDriverAccountEnum.CaseOutRecordStatus.WAIT_PLATFORM_PAY.getCode())
                 .statusMsg(NetworkDriverAccountEnum.CaseOutRecordStatus.WAIT_PLATFORM_PAY.getMsg())
                 .bank(bankCardVO.getBank()).collectionBankCode(bankCardVO.getBankCode())
-                .payee(bankCardVO.getName()).alterationBalance(settlementDriverDetail.getFreight())
+                .payee(bankCardVO.getName()).alterationBalance(settlementDriverDetail.getSettlementFreight())
                 .orderNo(settlementDriverDetail.getOrderNo()).orderGoodsNo(settlementDriverDetail.getOrderGoodsNo())
                 .childNo(settlementDriverDetail.getChildNo())
                 .platform("网运平台").createBy("系统").build();

performance-web/src/main/java/com/clx/performance/sqlProvider/settle/NetworkDriverAccountProvider.java

 package com.clx.performance.sqlProvider.settle;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.param.pc.PageNetworkAccountListParam;
+import com.clx.performance.vo.pc.NetworkDriverAccountVO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.jdbc.SQL;
 
 public class NetworkDriverAccountProvider {
 
-    public String networkAccountList(@Param("param") PageNetworkAccountListParam param) {
+    public String networkAccountList(@Param("page") Page<NetworkDriverAccountVO> page, @Param("param") PageNetworkAccountListParam param) {
         String sql = new SQL() {{
             SELECT("a.id, a.driver_user_no," +
                     " a.driver_user_name, a.mobile, a.account_balance, " +