新单跟进142

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionController.java

@@ -203,7 +203,7 @@ public class ApiCommissionController {
         Page<CommissionCompareRecord> page = commissionCompareRecordService.page(new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()),
         Page<CommissionCompareRecord> page = commissionCompareRecordService.page(new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()),
                 new LambdaQueryWrapper<CommissionCompareRecord>()
                 new LambdaQueryWrapper<CommissionCompareRecord>()
                         .eq(CommissionCompareRecord::getCommissionBizId, queryRequest.getCommissionBizId())
                         .eq(CommissionCompareRecord::getCommissionBizId, queryRequest.getCommissionBizId())
-                        .orderByAsc(CommissionCompareRecord::getCommissionPeriod));
+                        .orderByAsc(CommissionCompareRecord::getCreateTime));
 
 
         return Result.success(page);
         return Result.success(page);
     }
     }
@@ -296,7 +296,7 @@ public class ApiCommissionController {
         // 查询来佣操作记录
         // 查询来佣操作记录
         Page<CommissionEditRecord> page = commissionEditRecordService.page(new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()), new LambdaQueryWrapper<CommissionEditRecord>()
         Page<CommissionEditRecord> page = commissionEditRecordService.page(new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()), new LambdaQueryWrapper<CommissionEditRecord>()
                 .eq(CommissionEditRecord::getCommissionBizId, queryRequest.getCommissionBizId())
                 .eq(CommissionEditRecord::getCommissionBizId, queryRequest.getCommissionBizId())
-                .orderByAsc(CommissionEditRecord::getSeq));
+                .orderByAsc(CommissionEditRecord::getCreateTime));
         return Result.success(page);
         return Result.success(page);
     }
     }
 
 

yd-csf-service/src/main/java/com/yd/csf/service/dto/CommissionAddRequest.java

@@ -79,7 +79,7 @@ public class CommissionAddRequest implements Serializable {
      * 来佣日期
      * 来佣日期
      */
      */
     @Schema(description = "来佣日期", requiredMode = Schema.RequiredMode.REQUIRED, format = "yyyy-MM-dd")
     @Schema(description = "来佣日期", requiredMode = Schema.RequiredMode.REQUIRED, format = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date commissionDate;
     private Date commissionDate;
 
 
     /**
     /**

yd-csf-service/src/main/java/com/yd/csf/service/dto/CommissionUpdateRequest.java

 package com.yd.csf.service.dto;
 package com.yd.csf.service.dto;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.Data;
 
 
@@ -91,6 +92,7 @@ public class CommissionUpdateRequest implements Serializable {
      * 来佣日期
      * 来佣日期
      */
      */
     @Schema(description = "来佣日期")
     @Schema(description = "来佣日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date commissionDate;
     private Date commissionDate;
 
 
     /**
     /**