新单跟进144

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

@@ -91,9 +91,8 @@ public class CommissionUpdateRequest implements Serializable {
     /**
     /**
      * 来佣日期
      * 来佣日期
      */
      */
-    @Schema(description = "来佣日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date commissionDate;
+    @Schema(description = "来佣日期 格式: yyyy-MM-dd")
+    private String commissionDate;
 
 
     /**
     /**
      * 备注
      * 备注

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java

 package com.yd.csf.service.service.impl;
 package com.yd.csf.service.service.impl;
 
 
+import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yd.auth.core.dto.AuthUserDto;
 import com.yd.auth.core.dto.AuthUserDto;
@@ -237,10 +238,10 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
             CommissionEditRecord commissionRecord = getCommissionEditRecord("结算汇率", commission.getExchangeRate(), commissionUpdateRequest.getExchangeRate(), commission.getCommissionBizId(), currentLoginUser);
             CommissionEditRecord commissionRecord = getCommissionEditRecord("结算汇率", commission.getExchangeRate(), commissionUpdateRequest.getExchangeRate(), commission.getCommissionBizId(), currentLoginUser);
             commissionEditRecords.add(commissionRecord);
             commissionEditRecords.add(commissionRecord);
         }
         }
-        if (!Objects.equals(commission.getCommissionDate(), commissionUpdateRequest.getCommissionDate())) {
-            CommissionEditRecord commissionRecord = getCommissionEditRecord("来佣日期",
-                    DateUtil.formatDate(commission.getCommissionDate()),
-                    DateUtil.formatDate(commissionUpdateRequest.getCommissionDate()), commission.getCommissionBizId(), currentLoginUser);
+        String commissionDate = DateUtil.formatDate(commission.getCommissionDate());
+        String requestCommissionDate = commissionUpdateRequest.getCommissionDate();
+        if (!Objects.equals(commissionDate, requestCommissionDate)) {
+            CommissionEditRecord commissionRecord = getCommissionEditRecord("来佣日期", commissionDate, requestCommissionDate, commission.getCommissionBizId(), currentLoginUser);
             commissionEditRecords.add(commissionRecord);
             commissionEditRecords.add(commissionRecord);
         }
         }
         if (!Objects.equals(commission.getStatus(), commissionUpdateRequest.getStatus())) {
         if (!Objects.equals(commission.getStatus(), commissionUpdateRequest.getStatus())) {