Merge remote-tracking branch 'origin/test' into test

performance-api/src/main/java/com/clx/performance/vo/app/APPNetworkDriverRunningWaterRecordVO.java

 package com.clx.performance.vo.app;
 
+import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -27,51 +28,53 @@ public class APPNetworkDriverRunningWaterRecordVO {
     private Integer runningWaterType;
 
     @ApiModelProperty("流水类型简介")
-    private Integer runningWaterTypeMsg;
+    private String runningWaterTypeMsg;
 
     @ApiModelProperty("资金类型 10：收入 20：冻结 30：支出")
     private Integer fundType;
 
     @ApiModelProperty("资金类型简介")
-    private Integer fundTypeMsg;
+    private String fundTypeMsg;
 
     @ApiModelProperty("")
     private Long relationId;
 
-    @ApiModelProperty("订单ID")
-    private Integer orderId;
+    @ApiModelProperty("货单编号")
+    private String orderGoodsNo;
 
     @ApiModelProperty("订单编号")
     private String orderNo;
 
-    @ApiModelProperty("运单ID")
-    private Integer orderChildId;
-
     @ApiModelProperty("运单编号")
-    private String orderChildNo;
+    private String childNo;
 
     @ApiModelProperty("变动金额")
+    @MoneyOutConvert
     private BigDecimal alterationBalance;
 
     @ApiModelProperty("冻结金额")
+    @MoneyOutConvert
     private BigDecimal frozenBalance;
 
     @ApiModelProperty("可用余额")
+    @MoneyOutConvert
     private BigDecimal usableBalance;
 
     @ApiModelProperty("账户余额")
+    @MoneyOutConvert
     private BigDecimal accountBalance;
 
     @ApiModelProperty("扣除金额")
+    @MoneyOutConvert
     private BigDecimal takeOutBalance;
 
     @ApiModelProperty("操作人")
     private String createBy;
 
     @ApiModelProperty("创建时间")
-    private LocalDateTime createTime;
+    private String createTime;
 
     @ApiModelProperty("修改时间")
-    private LocalDateTime modifiedTime;
+    private String modifiedTime;
 
 }

performance-api/src/main/java/com/clx/performance/vo/pc/NetworkCaseOutRecordVO.java

 package com.clx.performance.vo.pc;
 
+import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -60,6 +61,7 @@ public class NetworkCaseOutRecordVO {
     private String childNo;
 
     @ApiModelProperty("变动金额")
+    @MoneyOutConvert
     private BigDecimal alterationBalance;
 
     @ApiModelProperty("操作人")

performance-api/src/main/java/com/clx/performance/vo/pc/NetworkDriverRunningWaterRecordVO.java

 package com.clx.performance.vo.pc;
 
+import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -35,13 +36,13 @@ public class NetworkDriverRunningWaterRecordVO{
     private Integer runningWaterType;
 
     @ApiModelProperty("流水类型简介")
-    private Integer runningWaterTypeMsg;
+    private String runningWaterTypeMsg;
 
     @ApiModelProperty("资金类型 10：收入 20：冻结 30：支出")
     private Integer fundType;
 
     @ApiModelProperty("资金类型简介")
-    private Integer fundTypeMsg;
+    private String fundTypeMsg;
 
     @ApiModelProperty("")
     private Long relationId;
@@ -59,18 +60,23 @@ public class NetworkDriverRunningWaterRecordVO{
     private String orderChildNo;
 
     @ApiModelProperty("变动金额")
+    @MoneyOutConvert
     private BigDecimal alterationBalance;
 
     @ApiModelProperty("冻结金额")
+    @MoneyOutConvert
     private BigDecimal frozenBalance;
 
     @ApiModelProperty("可用余额")
+    @MoneyOutConvert
     private BigDecimal usableBalance;
 
     @ApiModelProperty("账户余额")
+    @MoneyOutConvert
     private BigDecimal accountBalance;
 
     @ApiModelProperty("扣除金额")
+    @MoneyOutConvert
     private BigDecimal takeOutBalance;
 
     @ApiModelProperty("操作人")

performance-web/src/main/java/com/clx/performance/controller/pc/driver/NetworkDriverAccountController.java

@@ -44,7 +44,7 @@ public class NetworkDriverAccountController {
     @ApiOperation(value = "网络货运账户详情", notes = "<br>By:胡宇帆")
     @PostMapping("/networkAccountInfoList")
     @UnitCovert(param = false)
-    public Result<PageData<NetworkDriverRunningWaterRecordVO>> networkAccountInfoList(PageNetworkAccountInfoListParam param) {
+    public Result<PageData<NetworkDriverRunningWaterRecordVO>> networkAccountInfoList(@RequestBody PageNetworkAccountInfoListParam param) {
         IPage<NetworkDriverRunningWaterRecordVO> page = networkDriverRunningWaterRecordService.networkDriverRunningWaterRecordList(param);
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }
@@ -52,7 +52,7 @@ public class NetworkDriverAccountController {
     @ApiOperation(value = "车主提现", notes = "<br>By:胡宇帆")
     @PostMapping("/networkCaseOutRecord")
     @UnitCovert(param = false)
-    public Result<PageData<NetworkCaseOutRecordVO>> networkCaseOutRecord(PageNetworkCaseOutRecordListParam param) {
+    public Result<PageData<NetworkCaseOutRecordVO>> networkCaseOutRecord(@RequestBody PageNetworkCaseOutRecordListParam param) {
         IPage<NetworkCaseOutRecordVO> page = networkCaseOutRecordService.networkCaseOutRecord(param);
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }

performance-web/src/main/java/com/clx/performance/dao/impl/settle/NetworkDriverRunningWaterRecordDaoImpl.java

@@ -4,6 +4,7 @@ package com.clx.performance.dao.impl.settle;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.settle.NetworkDriverRunningWaterRecordDao;
+import com.clx.performance.enums.NetworkDriverAccountEnum;
 import com.clx.performance.mapper.settle.NetworkDriverRunningWaterRecordMapper;
 import com.clx.performance.model.settle.NetworkDriverRunningWaterRecord;
 import com.clx.performance.param.app.NetworkDriverPageParam;
@@ -39,4 +40,12 @@ public class NetworkDriverRunningWaterRecordDaoImpl extends BaseDaoImpl<NetworkD
         Page<APPNetworkDriverRunningWaterRecordVO> page = Page.of(param.getPage(), param.getPageSize());
         return baseMapper.runningWaterList(page, param);
     }
+
+    @Override
+    public void updateFrozenFlagByChildNo(String childNo) {
+        update(lUdWrapper().set(NetworkDriverRunningWaterRecord::getFrozenFlag, 1)
+                .eq(NetworkDriverRunningWaterRecord::getChildNo, childNo)
+                .eq(NetworkDriverRunningWaterRecord::getRunningWaterType, NetworkDriverAccountEnum.RunningWaterStatus.CASE_OUT_FROZEN.getCode())
+        );
+    }
 }

performance-web/src/main/java/com/clx/performance/dao/settle/NetworkDriverRunningWaterRecordDao.java

@@ -22,4 +22,6 @@ public interface NetworkDriverRunningWaterRecordDao extends BaseDao<NetworkDrive
     IPage<APPNetworkDriverRunningWaterRecordVO> pageFrozenList(NetworkDriverPageParam param);
 
     IPage<APPNetworkDriverRunningWaterRecordVO> runningWaterList(NetworkDriverPageParam param);
+
+    void updateFrozenFlagByChildNo(String childNo);
 }

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/NetworkDriverAccountServiceImpl.java

@@ -21,6 +21,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 /**
  * @author kavin
@@ -58,6 +59,7 @@ public class NetworkDriverAccountServiceImpl implements NetworkDriverAccountServ
                 .accountBalance(BigDecimal.ZERO)
                 .usableBalance(BigDecimal.ZERO)
                 .frozenBalance(BigDecimal.ZERO)
+                .createTime(LocalDateTime.now())
                 .createBy("系统")
                 .walletCode(walletCode).build();
         networkDriverAccountDao.saveEntity(entity);

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

@@ -64,8 +64,7 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
 
     /**
      * 运单同步网络货运生成司机运单结算流水
-     * @param userNo
-     * @param money
+     * @param settlementDriverDetail
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -74,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.getPrepayFreight())
+                .usableBalance(settlementDriverDetail.getSettlementFreight())
                 .frozenBalance(BigDecimal.ZERO)
-                .accountBalance(settlementDriverDetail.getPrepayFreight()).build();
+                .accountBalance(settlementDriverDetail.getSettlementFreight()).build();
         while (true) {
             NetworkDriverAccount account = networkDriverAccountDao.getEntityByKey(build.getId()).get();
             build.setModifiedTime(account.getModifiedTime());
@@ -85,8 +84,10 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
             if (i == 1) {
                 account = networkDriverAccountDao.getEntityByKey(build.getId()).get();
                 NetworkDriverRunningWaterRecord entity = NetworkDriverRunningWaterRecord.builder()
+                        .mobile(networkDriverAccount.getMobile())
                         .usableBalance(account.getUsableBalance())
-                        .alterationBalance(settlementDriverDetail.getPrepayFreight()).accountBalance(account.getAccountBalance())
+                        .alterationBalance(settlementDriverDetail.getSettlementFreight())
+                        .accountBalance(account.getAccountBalance())
                         .frozenBalance(account.getFrozenBalance()).createBy("系统")
                         .fundType(NetworkDriverAccountEnum.FundType.INCOME.getCode())
                         .fundTypeMsg(NetworkDriverAccountEnum.FundType.INCOME.getMsg())
@@ -109,18 +110,18 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
 
     /**
      * 运单同步网络货运后司机运单提现冻结流水
-     * @param userNo
-     * @param money
+     * @param settlementDriverDetail
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void generateCaseOutFrozenRunningWaterRecord(SettlementDriverDetail settlementDriverDetail) {
         log.info("运单同步网络货运后司机运单提现冻结流水");
         NetworkDriverAccount networkDriverAccount = networkDriverAccountDao.getOneByField(NetworkDriverAccount::getDriverUserNo, settlementDriverDetail.getDriverUserNo()).get();
         log.info("查询出NetworkDriverAccount{}", JSONUtil.parse(networkDriverAccount));
         NetworkDriverAccount build = NetworkDriverAccount.builder().id(networkDriverAccount.getId())
-                .frozenBalance(settlementDriverDetail.getPrepayFreight())
+                .frozenBalance(settlementDriverDetail.getSettlementFreight())
                 .accountBalance(BigDecimal.ZERO)
-                .usableBalance(settlementDriverDetail.getPrepayFreight()).build();
+                .usableBalance(settlementDriverDetail.getSettlementFreight()).build();
         while (true) {
             NetworkDriverAccount account = networkDriverAccountDao.getEntityByKey(build.getId()).get();
             build.setModifiedTime(account.getModifiedTime());
@@ -130,7 +131,9 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
                 account = networkDriverAccountDao.getEntityByKey(build.getId()).get();
                 NetworkDriverRunningWaterRecord entity = NetworkDriverRunningWaterRecord.builder()
                         .usableBalance(account.getUsableBalance())
-                        .alterationBalance(settlementDriverDetail.getPrepayFreight()).accountBalance(account.getAccountBalance())
+                        .mobile(networkDriverAccount.getMobile())
+                        .alterationBalance(settlementDriverDetail.getSettlementFreight())
+                        .accountBalance(account.getAccountBalance())
                         .frozenBalance(account.getFrozenBalance()).createBy("系统")
                         .fundType(NetworkDriverAccountEnum.FundType.FROZEN.getCode())
                         .fundTypeMsg(NetworkDriverAccountEnum.FundType.FROZEN.getMsg())
@@ -138,6 +141,7 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
                         .driverUserNo(account.getDriverUserNo())
                         .runningWaterNo(idGenerateSnowFlake.nextId(3L))
                         .runningWaterTypeMsg(NetworkDriverAccountEnum.RunningWaterStatus.CASE_OUT_FROZEN.getMsg())
+                        .frozenFlag(0)
                         .runningWaterType(NetworkDriverAccountEnum.RunningWaterStatus.CASE_OUT_FROZEN.getCode())
                         .childNo(settlementDriverDetail.getChildNo())
                         .orderNo(settlementDriverDetail.getOrderNo())
@@ -151,22 +155,29 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void generateCaseOutSuccessRunningWaterRecord(SettlementDriverDetail settlementDriverDetail) {
+        log.info("运单同步网络货运生成司机运单提现成功流水");
         NetworkDriverAccount networkDriverAccount = networkDriverAccountDao.getOneByField(NetworkDriverAccount::getDriverUserNo, settlementDriverDetail.getDriverUserNo()).get();
-
+        log.info("查询出NetworkDriverAccount{}", JSONUtil.parse(networkDriverAccount));
         NetworkDriverAccount build = NetworkDriverAccount.builder().id(networkDriverAccount.getId())
-                .frozenBalance(settlementDriverDetail.getPrepayFreight().negate())
+                .frozenBalance(settlementDriverDetail.getSettlementFreight().negate())
                 .usableBalance(BigDecimal.ZERO)
-                .accountBalance(settlementDriverDetail.getPrepayFreight()).build();
+                .accountBalance(settlementDriverDetail.getSettlementFreight()).build();
         while (true) {
             NetworkDriverAccount account = networkDriverAccountDao.getEntityByKey(build.getId()).get();
             build.setModifiedTime(account.getModifiedTime());
             Integer i = networkDriverAccountDao.updateAccountCAS(build, LocalDateTime.now(), false);
             if (i == 1) {
+                networkDriverRunningWaterRecordDao.updateFrozenFlagByChildNo(settlementDriverDetail.getChildNo());
+
+
                 account = networkDriverAccountDao.getEntityByKey(build.getId()).get();
                 NetworkDriverRunningWaterRecord entity = NetworkDriverRunningWaterRecord.builder()
                         .usableBalance(account.getUsableBalance())
-                        .alterationBalance(settlementDriverDetail.getPrepayFreight()).accountBalance(account.getAccountBalance())
+                        .mobile(networkDriverAccount.getMobile())
+                        .alterationBalance(settlementDriverDetail.getSettlementFreight())
+                        .accountBalance(account.getAccountBalance())
                         .frozenBalance(account.getFrozenBalance()).createBy("系统")
                         .fundType(NetworkDriverAccountEnum.FundType.EXPENDITURE.getCode())
                         .fundTypeMsg(NetworkDriverAccountEnum.FundType.EXPENDITURE.getMsg())
@@ -189,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);
         }
@@ -219,8 +230,8 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
                 .driverUserName(settlementDriverDetail.getDriverName()).mobile(bankCardVO.getMobile())
                 .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.getPrepayFreight())
+                .bank(bankCardVO.getBank()).collectionBankCode(bankCardVO.getCardNo())
+                .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/service/impl/settle/OrderChildSyncTransportRecordServiceImpl.java

@@ -7,7 +7,10 @@ import com.clx.performance.dto.PayStatusNotifyDTO;
 import com.clx.performance.enums.NetworkDriverAccountEnum;
 import com.clx.performance.model.settle.OrderChildSyncTransportRecord;
 import com.clx.performance.model.settle.SettlementDriverDetail;
+import com.clx.performance.service.settle.NetworkDriverRunningWaterRecordService;
 import com.clx.performance.service.settle.OrderChildSyncTransportRecordService;
+import com.clx.performance.service.settle.SettlementDriverDetailService;
+import com.clx.performance.service.settle.SettlementDriverService;
 import com.clx.performance.struct.settle.SettlementDriverDetailStruct;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -29,6 +32,10 @@ public class OrderChildSyncTransportRecordServiceImpl implements OrderChildSyncT
 
     private final NetworkCaseOutRecordDao networkCaseOutRecordDao;
 
+    private final NetworkDriverRunningWaterRecordService networkDriverRunningWaterRecordService;
+
+    private final SettlementDriverDetailService settlementDriverDetailService;
+
     @Override
     public void addOrderChildSyncTransportRecord(SettlementDriverDetail detail) {
         OrderChildSyncTransportRecord record = struct.convertRecord(detail);
@@ -45,5 +52,7 @@ public class OrderChildSyncTransportRecordServiceImpl implements OrderChildSyncT
                 NetworkDriverAccountEnum.CaseOutRecordStatus.PAYED.getCode(),
                 NetworkDriverAccountEnum.CaseOutRecordStatus.PAYED.getMsg()
         );
+        SettlementDriverDetail driverDetail = settlementDriverDetailService.selectOneByChildNo(childNo);
+        networkDriverRunningWaterRecordService.generateCaseOutSuccessRunningWaterRecord(driverDetail);
     }
 }

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

@@ -115,4 +115,9 @@ public class SettlementDriverDetailServiceImpl  implements SettlementDriverDetai
         List<CarrierPageSettlementDriverDetailVO> list = settlementOwnerDetailStruct.covertList(result.getRecords());
         return new Page<CarrierPageSettlementDriverDetailVO>().setRecords(list).setTotal(result.getTotal()).setPages(result.getPages());
     }
+
+    @Override
+    public SettlementDriverDetail selectOneByChildNo(String childNo) {
+        return settlementDriverDetailDao.getByChildNo(childNo).get();
+    }
 }

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

@@ -2,6 +2,7 @@ package com.clx.performance.service.settle;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.model.OrderChild;
+import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.param.pc.driver.PageCarrierSettlementDriverDetailParam;
 import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementDriverDetailVO;
 
@@ -15,4 +16,6 @@ public interface SettlementDriverDetailService  {
     Integer saveSettlementDetail(OrderChild orderChild);
 
     IPage<CarrierPageSettlementDriverDetailVO> pageSettlementDriverDetail(PageCarrierSettlementDriverDetailParam param);
+
+    SettlementDriverDetail selectOneByChildNo(String childNo);
 }

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, " +

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

@@ -15,8 +15,8 @@ public class NetworkDriverRunningWaterRecordProvider {
         String sql = new SQL() {{
             SELECT("a.id, a.running_water_no," +
                     " a.driver_user_no,a.driver_user_name, a.mobile,a.running_water_type,a.running_water_type_msg,a.fund_type_msg,a.account_balance, " +
-                    " a.fund_type,a.order_no,a.order_goods_no,a.child_no,a.alteration_balance" +
-                    "a.usable_balance,a.frozen_balance,a.take_out_balance,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time");
+                    " a.fund_type,a.order_no,a.order_goods_no,a.child_no,a.alteration_balance," +
+                    "a.usable_balance,a.frozen_balance,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time");
             FROM("network_driver_running_water_record a");
 
             if (StringUtils.isNotBlank(param.getDriverUserNo())) {
@@ -37,8 +37,8 @@ public class NetworkDriverRunningWaterRecordProvider {
         String sql = new SQL() {{
             SELECT("a.id, a.running_water_no," +
                     " a.driver_user_no,a.driver_user_name, a.mobile,a.running_water_type,a.running_water_type_msg,a.fund_type_msg, a.account_balance,a.frozen_flag, " +
-                    " a.fund_type,a.order_no,a.order_goods_no,a.child_no,a.alteration_balance" +
-                    "a.usable_balance,a.frozen_balance,a.take_out_balance,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time");
+                    " a.fund_type,a.order_no,a.order_goods_no,a.child_no,a.alteration_balance," +
+                    "a.usable_balance,a.frozen_balance,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time");
             FROM("network_driver_running_water_record a");
 
             WHERE("a.driver_user_no = #{param.userNo}");
@@ -54,8 +54,8 @@ public class NetworkDriverRunningWaterRecordProvider {
         String sql = new SQL() {{
             SELECT("a.id, a.running_water_no," +
                     " a.driver_user_no,a.driver_user_name, a.mobile,a.running_water_type,a.running_water_type_msg,a.fund_type_msg,a.account_balance, " +
-                    " a.fund_type,a.order_no,a.order_goods_no,a.child_no,a.alteration_balance" +
-                    "a.usable_balance,a.frozen_balance,a.take_out_balance,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time");
+                    " a.fund_type,a.order_no,a.order_goods_no,a.child_no,a.alteration_balance," +
+                    "a.usable_balance,a.frozen_balance,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time");
             FROM("network_driver_running_water_record a");
             if (ObjectUtil.isNotNull(param.getUserNo())) {
                 WHERE("a.driver_user_no = #{param.userNo}");