出账检核-增加币种40

yd-csf-service/src/main/java/com/yd/csf/service/dto/FortuneAddRequest.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;
 
 
@@ -143,12 +144,18 @@ public class FortuneAddRequest implements Serializable {
     private BigDecimal hkdAmount;
     private BigDecimal hkdAmount;
 
 
     /**
     /**
-     * 出账年月 yyyy-MM
+     * 出账年月(估)
      */
      */
-    @Schema(description = "出账年月 yyyy-MM", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "出账年月(估)", requiredMode = Schema.RequiredMode.REQUIRED)
     private String payoutDate;
     private String payoutDate;
 
 
     /**
     /**
+     * 出账年月(实)
+     */
+    @Schema(description = "出账年月(实)", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String actualPayoutDate;
+
+    /**
      * 出账备注
      * 出账备注
      */
      */
     @Schema(description = "出账备注")
     @Schema(description = "出账备注")

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

@@ -805,7 +805,8 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
             // 生成发佣业务ID
             // 生成发佣业务ID
             fortune.setFortuneBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_FORTUNE.getCode()));
             fortune.setFortuneBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_FORTUNE.getCode()));
             fortune.setCurrentPaymentAmount(fortuneAddRequest.getPayoutAmount());
             fortune.setCurrentPaymentAmount(fortuneAddRequest.getPayoutAmount());
-            fortune.setActualPayoutDate(LocalDate.parse(fortuneAddRequest.getPayoutDate() + "-01"));
+            fortune.setPayoutDate(LocalDate.parse(fortuneAddRequest.getPayoutDate() + "-01"));
+            fortune.setActualPayoutDate(LocalDate.parse(fortuneAddRequest.getActualPayoutDate() + "-01"));
             fortune.setIsPart(0);
             fortune.setIsPart(0);
             fortuneList.add(fortune);
             fortuneList.add(fortune);
         }
         }