push

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

@@ -257,6 +257,9 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         vo.setRevenueRatio(null);
         vo.setRevenueRatio(null);
         vo.setRealRemark(expected.getRemark());
         vo.setRealRemark(expected.getRemark());
         vo.setCommissionExpectedBizId(expected.getCommissionExpectedBizId());
         vo.setCommissionExpectedBizId(expected.getCommissionExpectedBizId());
+        vo.setCommissionExpectedDate(expected.getCommissionDate());
+        vo.setCurrency(expected.getCurrency());
+        vo.setCommissionType(expected.getCommissionType());
 
 
         // 填充保单信息
         // 填充保单信息
         Policy policy = policyMap.get(expected.getPolicyNo());
         Policy policy = policyMap.get(expected.getPolicyNo());

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

@@ -84,6 +84,11 @@ public class CommissionExpectedNewVO implements Serializable {
     private Integer totalPeriod;
     private Integer totalPeriod;
 
 
     /**
     /**
+     * 预计来佣-入账项目类型(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等)
+     */
+    private String commissionType;
+
+    /**
      * 预计来佣-来佣名称(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等)
      * 预计来佣-来佣名称(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等)
      */
      */
 //    @Schema(description = "来佣名称(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等)")
 //    @Schema(description = "来佣名称(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等)")
@@ -97,6 +102,11 @@ public class CommissionExpectedNewVO implements Serializable {
     private Date commissionDateMonth;
     private Date commissionDateMonth;
 
 
     /**
     /**
+     * 预计来佣-入账日（同预计来佣表commissionDate）
+     */
+    private Date commissionExpectedDate;
+
+    /**
      * 入账检核记录-入账年月实（来佣日期 yyyyMM）
      * 入账检核记录-入账年月实（来佣日期 yyyyMM）
      */
      */
     @JsonFormat(pattern = "yyyyMM", timezone = "GMT+8")
     @JsonFormat(pattern = "yyyyMM", timezone = "GMT+8")
@@ -192,6 +202,11 @@ public class CommissionExpectedNewVO implements Serializable {
     private String policyCurrency;
     private String policyCurrency;
 
 
     /**
     /**
+     * 预计来佣-入账币种
+     */
+    private String currency;
+
+    /**
      * 预计来佣-期交保费
      * 预计来佣-期交保费
      */
      */
 //    @Schema(description = "期交保费")
 //    @Schema(description = "期交保费")