Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test

performance-api/src/main/java/com/clx/performance/param/pc/owner/PageCarrierSettlementPlatformServiceFeeParam.java

@@ -19,12 +19,12 @@ public class PageCarrierSettlementPlatformServiceFeeParam extends PageParam {
     @ApiModelProperty(value = "运单编号", example = "JS415")
     private String childNo;
 
-    @ApiModelProperty(value="车主编码",example = "201457878")
+    @ApiModelProperty(value="司机编码",example = "201457878")
     private Long driverUserNo;
 
-    @ApiModelProperty(value="车主姓名",example = "张三")
-    private String driverUserName;
-    @ApiModelProperty(value="车主手机",example = "13000000000")
+    @ApiModelProperty(value="司机姓名",example = "张三")
+    private String driverName;
+    @ApiModelProperty(value="司机手机",example = "13000000000")
     private String driverMobile;
 
     @ApiModelProperty(value = "开始时间")

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

@@ -20,10 +20,11 @@ public class SettlementPlatformServiceFeeSqlProvider {
             FROM(TABLE);
 
             if (StringUtils.isNotBlank(param.getChildNo())) {WHERE("child_no = #{param.childNo}");}
-            if (StringUtils.isNotBlank(param.getDriverUserName())) {WHERE("child_no = #{param.childNo}");}
+            if (StringUtils.isNotBlank(param.getDriverName())) {WHERE("driver_name like CONCAT(#{param.driverName},'%')");}
             if (StringUtils.isNotBlank(param.getDriverMobile())) {WHERE("driver_mobile = #{param.driverMobile}");}
             if (Objects.nonNull(param.getDriverUserNo())) {WHERE("driver_user_no = #{param.driverUserNo}");}
 
+
             if (Objects.nonNull(param.getBeginTime())) {WHERE("create_time >= #{param.beginTime}");}
             if (Objects.nonNull(param.getEndTime())) {WHERE("create_time <= #{param.endTime}");}