前端对接问题修复60

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

@@ -119,16 +119,6 @@ public class Commission implements Serializable {
     private BigDecimal currentCommissionRatio;
     private BigDecimal currentCommissionRatio;
 
 
     /**
     /**
-     * 当期已入账来佣比例
-     */
-    private BigDecimal periodPaidRatio;
-
-    /**
-     * 当期剩余来佣比例
-     */
-    private BigDecimal periodPendingRatio;
-
-    /**
      * 来佣日期
      * 来佣日期
      */
      */
     private Date commissionDate;
     private Date commissionDate;
@@ -149,21 +139,6 @@ public class Commission implements Serializable {
     private String commissionExpectedBizId;
     private String commissionExpectedBizId;
 
 
     /**
     /**
-     * 总金额
-     */
-    private BigDecimal expectedAmount;
-
-    /**
-     * 已入账金额
-     */
-    private BigDecimal paidAmount;
-
-    /**
-     * 待入账金额
-     */
-    private BigDecimal pendingAmount;
-
-    /**
      * 通用备注
      * 通用备注
      */
      */
     private String remark;
     private String remark;

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

@@ -153,18 +153,6 @@ public class CommissionVO implements Serializable {
     private BigDecimal currentCommissionRatio;
     private BigDecimal currentCommissionRatio;
 
 
     /**
     /**
-     * 当期已入账比例
-     */
-    @Schema(description = "已入账来佣比例")
-    private BigDecimal periodPaidRatio;
-
-    /**
-     * 待入账来佣比例
-     */
-    @Schema(description = "当期剩余来佣比例")
-    private BigDecimal periodPendingRatio;
-
-    /**
      * 比对状态
      * 比对状态
      */
      */
     @Schema(description = "比对状态 0=未比对 1=比对成功 2=比对失败 3=未匹配到预计入账记录 字典值: csf_commission_status")
     @Schema(description = "比对状态 0=未比对 1=比对成功 2=比对失败 3=未匹配到预计入账记录 字典值: csf_commission_status")

yd-csf-service/src/main/resources/mappers/CommissionMapper.xml

@@ -26,8 +26,7 @@
             <result property="currency" column="currency" />
             <result property="currency" column="currency" />
             <result property="commissionDate" column="commission_date" />
             <result property="commissionDate" column="commission_date" />
             <result property="currentCommissionRatio" column="current_commission_ratio" />
             <result property="currentCommissionRatio" column="current_commission_ratio" />
-            <result property="periodPaidRatio" column="period_paid_ratio" />
-            <result property="periodPendingRatio" column="period_pending_ratio" />
+            <result property="commissionExpectedBizId" column="commission_expected_biz_id" />
             <result property="status" column="status" />
             <result property="status" column="status" />
             <result property="statusDesc" column="status_desc" />
             <result property="statusDesc" column="status_desc" />
             <result property="remark" column="remark" />
             <result property="remark" column="remark" />
@@ -43,7 +42,7 @@
         insurance_company_biz_id,product_launch_biz_id,
         insurance_company_biz_id,product_launch_biz_id,
         reconciliation_company,reconciliation_company_code,reconciliation_company_biz_id,commission_period,
         reconciliation_company,reconciliation_company_code,reconciliation_company_biz_id,commission_period,
         total_period,commission_name,commission_type,exchange_rate,amount,currency,
         total_period,commission_name,commission_type,exchange_rate,amount,currency,
-        commission_date,current_commission_ratio,period_paid_ratio,period_pending_ratio,
+        commission_date,current_commission_ratio,commission_expected_biz_id,
         status,status_desc,remark,is_deleted,creator_id,
         status,status_desc,remark,is_deleted,creator_id,
         updater_id,create_time,update_time
         updater_id,create_time,update_time
     </sql>
     </sql>