新单跟进147

yd-csf-api/src/main/java/com/yd/csf/api/dto/GenerateExpectedFortuneDto.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.List;
 
 
 @Data
 @Data
@@ -86,9 +86,9 @@ public class GenerateExpectedFortuneDto {
     private String status;
     private String status;
 
 
     /**
     /**
-     * 发佣日期
+     * 预计发佣日期
      */
      */
-    private Date payoutDate;
+    private LocalDate payoutDate;
 
 
     /**
     /**
      * 基本法项目配置表唯一业务ID
      * 基本法项目配置表唯一业务ID

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiExpectedFortuneServiceImpl.java

 package com.yd.csf.api.service.impl;
 package com.yd.csf.api.service.impl;
 
 
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yd.common.constant.RedisConstants;
 import com.yd.common.constant.RedisConstants;
@@ -43,6 +45,8 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.util.StringUtils;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
@@ -243,8 +247,8 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
                 .fortuneTotalPeriod(brokerDto.getPaymentTerm())
                 .fortuneTotalPeriod(brokerDto.getPaymentTerm())
                 //发佣类型 TODO
                 //发佣类型 TODO
 //                .fortuneType()
 //                .fortuneType()
-                //发佣日期
-                .payoutDate(new Date())
+                //发佣日期 保单生效日期 + 3个月
+                .payoutDate(calculateExpectedPayoutDate(brokerDto.getEffectiveDate(), dto.getIssueNumber()))
                 //保单号
                 //保单号
                 .policyNo(brokerDto.getPolicyNo())
                 .policyNo(brokerDto.getPolicyNo())
                 //佣金发放状态 0=待出账 1=可出账 2=已出账
                 //佣金发放状态 0=待出账 1=可出账 2=已出账
@@ -258,6 +262,10 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
         return Result.success();
         return Result.success();
     }
     }
 
 
+    private static LocalDate calculateExpectedPayoutDate(LocalDate effectiveDate, Integer issueNumber) {
+        return effectiveDate.plusMonths(3).plusYears(issueNumber - 1);
+    }
+
     /**
     /**
      * 执行 - 销售佣金（销售佣金基本法）
      * 执行 - 销售佣金（销售佣金基本法）
      * @param dto
      * @param dto
@@ -304,7 +312,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
                 //发佣类型 TODO
                 //发佣类型 TODO
 //                .fortuneType()
 //                .fortuneType()
                 //发佣日期
                 //发佣日期
-                .payoutDate(new Date())
+                .payoutDate(calculateExpectedPayoutDate(brokerDto.getEffectiveDate(), dto.getIssueNumber()))
                 //保单号
                 //保单号
                 .policyNo(brokerDto.getPolicyNo())
                 .policyNo(brokerDto.getPolicyNo())
                 //佣金发放状态 0=待出账 1=可出账 2=已出账
                 //佣金发放状态 0=待出账 1=可出账 2=已出账

yd-csf-feign/src/main/java/com/yd/csf/feign/response/expectedfortune/ApiExpectedFortunePageResponse.java

@@ -2,6 +2,7 @@ package com.yd.csf.feign.response.expectedfortune;
 
 
 import lombok.Data;
 import lombok.Data;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 
 
 @Data
 @Data
@@ -73,6 +74,16 @@ public class ApiExpectedFortunePageResponse {
     private String currency;
     private String currency;
 
 
     /**
     /**
+     * 发佣状态 0=待出账 1=可出帐 2=完成出账 3=部分出账 4=保留 5=已失效
+     */
+    private String status;
+
+    /**
+     * 预计发佣日期
+     */
+    private LocalDate payoutDate;
+
+    /**
      * 基本法项目配置表唯一业务ID
      * 基本法项目配置表唯一业务ID
      */
      */
     private String ruleItemBizId;
     private String ruleItemBizId;

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

 package com.yd.csf.service.dto;
 package com.yd.csf.service.dto;
 
 
 import lombok.Data;
 import lombok.Data;
+import org.apache.tomcat.jni.Local;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.Date;
 
 
 /**
 /**
@@ -42,6 +44,11 @@ public class QueryPolicyAndBrokerDto {
      */
      */
     private String currency;
     private String currency;
 
 
+     /**
+     * 生效日期
+     */
+    private LocalDate effectiveDate;
+
     //======保单信息end=======
     //======保单信息end=======
 
 
     //======保单转介人信息start=======
     //======保单转介人信息start=======

yd-csf-service/src/main/java/com/yd/csf/service/model/ExpectedFortune.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
@@ -121,6 +122,12 @@ public class ExpectedFortune implements Serializable {
     @TableField("status")
     @TableField("status")
     private String status;
     private String status;
 
 
+     /**
+     * 预计发佣日期
+     */
+    @TableField("payout_date")
+    private LocalDate payoutDate;
+
     /**
     /**
      * 是否含税 0=No, 1=Yes
      * 是否含税 0=No, 1=Yes
      */
      */