push

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/appointment/ApiProductPlanMainInfoDto.java

@@ -119,4 +119,9 @@ public class ApiProductPlanMainInfoDto {
      * 是否参加递增保障权益: 0-否, 1-是（字典）
      * 是否参加递增保障权益: 0-否, 1-是（字典）
      */
      */
     private Integer isJoin;
     private Integer isJoin;
+
+    /**
+     * 保单征费
+     */
+    private BigDecimal policyLevy;
 }
 }

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/appointmentfile/ItineraryDto.java

@@ -72,12 +72,6 @@ public class ItineraryDto {
     private String eachIssuePremium;
     private String eachIssuePremium;
 
 
     /**
     /**
-     * 保单证费（产品计划-保单证费）
-     */
-    @PdfField("policyFee")
-    private String policyFee;
-
-    /**
      * 币种（产品计划-货币（字典））
      * 币种（产品计划-货币（字典））
      */
      */
     @PdfField("currency")
     @PdfField("currency")
@@ -112,4 +106,10 @@ public class ItineraryDto {
      */
      */
     @PdfField("confirmAppointmentTime")
     @PdfField("confirmAppointmentTime")
     private String confirmAppointmentTime;
     private String confirmAppointmentTime;
+
+    /**
+     * 保单征费
+     */
+    @PdfField("policyFee")
+    private String policyFee;
 }
 }

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

@@ -141,6 +141,12 @@ public class ProductPlan implements Serializable {
     private Integer isJoin;
     private Integer isJoin;
 
 
     /**
     /**
+     * 保单征费
+     */
+    @TableField("policy_levy")
+    private BigDecimal policyLevy;
+
+    /**
      * 通用备注
      * 通用备注
      */
      */
     @TableField("remark")
     @TableField("remark")

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

@@ -67,8 +67,8 @@
         a.arrival_time,a.meeting_point,a.confirm_appointment_time,
         a.arrival_time,a.meeting_point,a.confirm_appointment_time,
         a.signing_address,a.business_represent_name1,
         a.signing_address,a.business_represent_name1,
         a.business_represent_mobile1_code,a.business_represent_mobile1,
         a.business_represent_mobile1_code,a.business_represent_mobile1,
-        t.name,i.name as insurantName,pp.payment_term,pp.each_issue_premium,
-        pp.currency,pp.product_name,(pp.payment_term*pp.each_issue_premium) as total
+        t.name,i.name as insurantName,pp.payment_term,pp.each_issue_premium,pp.policy_levy as policyFee,
+        pp.currency,pp.product_name,(pp.each_issue_premium + pp.policy_levy) as total
         from appointment a
         from appointment a
         left join product_plan pp on a.appointment_biz_id = pp.appointment_biz_id and pp.is_deleted = 0
         left join product_plan pp on a.appointment_biz_id = pp.appointment_biz_id and pp.is_deleted = 0
         left join insurant i on a.appointment_biz_id = i.appointment_biz_id and i.is_deleted = 0
         left join insurant i on a.appointment_biz_id = i.appointment_biz_id and i.is_deleted = 0