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

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/sqlProvider/settle/NetworkDriverRunningWaterRecordProvider.java

@@ -16,7 +16,7 @@ public class NetworkDriverRunningWaterRecordProvider {
             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.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())) {
@@ -38,7 +38,7 @@ public class NetworkDriverRunningWaterRecordProvider {
             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.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}");
@@ -55,7 +55,7 @@ public class NetworkDriverRunningWaterRecordProvider {
             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.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}");