前端对接问题修复71

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

 package com.yd.csf.service.service.impl;
 package com.yd.csf.service.service.impl;
 import java.math.RoundingMode;
 import java.math.RoundingMode;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Date;
 
 
@@ -280,6 +281,7 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
         if (CollectionUtils.isNotEmpty(fortunes)) {
         if (CollectionUtils.isNotEmpty(fortunes)) {
             fortunes.forEach(f -> {
             fortunes.forEach(f -> {
                 f.setStatus(FortuneStatusEnum.SENT.getItemValue());
                 f.setStatus(FortuneStatusEnum.SENT.getItemValue());
+                f.setActualPayoutDate(LocalDate.now());
                 f.setUpdaterId(loginUserId.toString());
                 f.setUpdaterId(loginUserId.toString());
                 f.setUpdateTime(new Date());
                 f.setUpdateTime(new Date());
             });
             });

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

@@ -146,6 +146,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
             if (policy != null) {
             if (policy != null) {
                 fortuneVO.setPremium(policy.getPaymentPremium());
                 fortuneVO.setPremium(policy.getPaymentPremium());
                 fortuneVO.setInsuranceCompany(policy.getInsuranceCompany());
                 fortuneVO.setInsuranceCompany(policy.getInsuranceCompany());
+                fortuneVO.setProductName(policy.getProductName());
             }
             }
             // 设置预计出账信息
             // 设置预计出账信息
             ExpectedFortune expectedFortune = expectedFortuneMap.get(fortuneVO.getExpectedFortuneBizId());
             ExpectedFortune expectedFortune = expectedFortuneMap.get(fortuneVO.getExpectedFortuneBizId());

yd-csf-service/src/main/java/com/yd/csf/service/vo/FortuneVO.java

@@ -3,7 +3,6 @@ package com.yd.csf.service.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yd.csf.service.model.ExpectedFortune;
 import com.yd.csf.service.model.ExpectedFortune;
 import com.yd.csf.service.model.Fortune;
 import com.yd.csf.service.model.Fortune;
-import com.yd.csf.service.model.FortuneAccount;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.Data;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
@@ -11,6 +10,7 @@ import org.springframework.beans.BeanUtils;
 import java.io.Serializable;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.math.RoundingMode;
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.Date;
 
 
 @Data
 @Data
@@ -59,6 +59,12 @@ public class FortuneVO implements Serializable {
     private BigDecimal premium;
     private BigDecimal premium;
 
 
     /**
     /**
+     * 产品名称
+     */
+    @Schema(description = "产品名称")
+    private String productName;
+
+    /**
      * 保险公司
      * 保险公司
      */
      */
     @Schema(description = "保险公司")
     @Schema(description = "保险公司")
@@ -179,11 +185,18 @@ public class FortuneVO implements Serializable {
     private String status;
     private String status;
 
 
     /**
     /**
+     * 出账日(估)
+     */
+    @Schema(description = "出账日(估)")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate payoutDate;
+
+    /**
      * 出账日(实)
      * 出账日(实)
      */
      */
     @Schema(description = "出账日(实)")
     @Schema(description = "出账日(实)")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date payoutDate;
+    private LocalDate actualPayoutDate;
 
 
     /**
     /**
      * 是否含税 0=No, 1=Yes
      * 是否含税 0=No, 1=Yes