预计来佣和预计发佣规则

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

@@ -682,7 +682,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
                     commissionExpected.setCommissionRatio(item.getCommissionRate());
                     commissionExpected.setCommissionRatio(item.getCommissionRate());
                     commissionExpected.setAmount(null);
                     commissionExpected.setAmount(null);
                     commissionExpected.setCurrency(item.getCurrency());
                     commissionExpected.setCurrency(item.getCurrency());
-                    commissionExpected.setCommissionDate(calculateCommissionDate(i, coolingOffEndDate));
+                    commissionExpected.setCommissionDate(calculateCommissionDate(i, effectiveDate));
                     commissionExpected.setStatus(CommissionExpectedStatusEnum.PENDING.getItemValue());
                     commissionExpected.setStatus(CommissionExpectedStatusEnum.PENDING.getItemValue());
                     commissionExpected.setStatusDesc(null);
                     commissionExpected.setStatusDesc(null);
                     commissionExpected.setDefaultExchangeRate(queryExchangeRateByFeign(policy.getCurrency(), item.getCurrency()));
                     commissionExpected.setDefaultExchangeRate(queryExchangeRateByFeign(policy.getCurrency(), item.getCurrency()));

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

@@ -222,10 +222,10 @@ public class FortuneVO implements Serializable {
     private String status;
     private String status;
 
 
     /**
     /**
-     * 出账日(估)
+     * 出账日(估) / 预计发佣月
      */
      */
-    @Schema(description = "出账日(估)")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Schema(description = "出账日(估) / 预计发佣月")
+    @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
     private LocalDate payoutDate;
     private LocalDate payoutDate;
 
 
     /**
     /**

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

@@ -51,10 +51,10 @@ public class PayableReportVO {
     private Integer fortuneTotalPeriod;
     private Integer fortuneTotalPeriod;
 
 
     /**
     /**
-     * 出账日
+     * 出账日 / 预计发佣月
      */
      */
-    @Schema(description = "出账日 (保单日+2个月)")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Schema(description = "出账日 (保单生效日+2个月) / 预计发佣月")
+    @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
     private LocalDate payoutDate;
     private LocalDate payoutDate;
 
 
     /**
     /**

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

@@ -55,10 +55,10 @@ public class ReceivableReportVO {
     private Integer totalPeriod;
     private Integer totalPeriod;
 
 
     /**
     /**
-     * 入账日（估）
+     * 入账日（估）/ 预计来佣月
      */
      */
-    @Schema(description = "入账日（估）(保单生效日+2个月+(期数-1)年)")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Schema(description = "入账日（估）(保单生效日+1个月)")
+    @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
     private LocalDate commissionDate;
     private LocalDate commissionDate;
 
 
     /**
     /**