202201:薪资单:calculation_amount 匹配佣奖率的金额

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java

@@ -1184,6 +1184,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                     commission.setCalculationFormula(withdrawLabelInfo.getCalculationFormula());//佣金计算公式
                     commission.setSalestaff(withdrawLabelInfo.getPractitionerName());//经纪人名称
                     commission.setSalaryCode(transformationType(withdrawLabelInfo.getDropOptionCode()));
+                    commission.setCalculationAmount(withdrawLabelInfo.getCalculationAmount().doubleValue());
                     //C02:续年度直接销售佣金;C03:续年度销售加码奖金;C04:月度销售加码奖金; 没有orderid
                     if ("C02".equals(withdrawLabelInfo.getDropOptionCode())) {
                         c02List.add(commission);
@@ -1235,6 +1236,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                     renewalYearPerformanceCommission.setPolicyno(withdrawLabelInfo.getPolicyNo());//保单号
                     renewalYearPerformanceCommission.setSalestaff(withdrawLabelInfo.getPractitionerName());//经纪人名称
                     renewalYearPerformanceCommission.setYearPREMIUM(withdrawLabelInfo.getOrderPrice().intValue());//保费
+                    renewalYearPerformanceCommission.setCalculationAmount(withdrawLabelInfo.getCalculationAmount().doubleValue());
 
 
                     if ("C06".equals(withdrawLabelInfo.getDropOptionCode())) {

yd-api/src/main/java/com/yd/dal/entity/agms/fortune/WithdrawLabelInfo.java

@@ -154,7 +154,10 @@ public class WithdrawLabelInfo {
      *计算公式拆分出来的rate
      */
     private BigDecimal calculationRate;
-
+    /**
+     *匹配佣奖率的金额
+     */
+    private BigDecimal calculationAmount;
 
 }
 

yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/Commission.java

@@ -36,6 +36,9 @@ public class Commission {
 
     private String calculationFormula;
     private String salaryCode;
+    private double calculationAmount;
+
+
 
     public Commission() {
     }
@@ -180,4 +183,12 @@ public class Commission {
     public void setSalaryCode(String salaryCode) {
         this.salaryCode = salaryCode;
     }
+
+    public double getCalculationAmount() {
+        return calculationAmount;
+    }
+
+    public void setCalculationAmount(double calculationAmount) {
+        this.calculationAmount = calculationAmount;
+    }
 }

yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/RenewalYearPerformanceCommission.java

@@ -2,6 +2,8 @@ package com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import java.math.BigDecimal;
+
 public class RenewalYearPerformanceCommission {
     private String SaleSystem;
     private String FYC_RYC;
@@ -16,6 +18,10 @@ public class RenewalYearPerformanceCommission {
     private int YearPREMIUM;//保费
     private String Salestaff;//经纪人
     /**
+     *匹配佣奖率的金额
+     */
+    private Double calculationAmount;
+    /**
      *薪资类型code
      */
     private String salaryCode;
@@ -133,4 +139,12 @@ public class RenewalYearPerformanceCommission {
     public void setSalestaff(String salestaff) {
         Salestaff = salestaff;
     }
+
+    public Double getCalculationAmount() {
+        return calculationAmount;
+    }
+
+    public void setCalculationAmount(Double calculationAmount) {
+        this.calculationAmount = calculationAmount;
+    }
 }

yd-api/src/main/resources/mapper/agms/AgmsFortuneMapper.xml

@@ -297,6 +297,9 @@
         <result column="commissionType" jdbcType="VARCHAR" property="commissionType"/>
         <result column="calculationFormula" jdbcType="VARCHAR" property="calculationFormula"/>
         <result column="calculationRate" jdbcType="DECIMAL" property="calculationRate" />
+        <result column="calculationAmount" jdbcType="DECIMAL" property="calculationAmount" />
+
+
     </resultMap>
     <select id="transformForWithdrawLabel"
             parameterType="com.yd.dal.entity.agms.fortune.WithdrawQueryInfo"
@@ -385,7 +388,10 @@
             if(f.referral_amount is null,0,f.referral_amount)  referralAmount,
             f.calculation_formula calculationFormula,
             f.withdrawed_id   withdrawId,
-            if(f.calculation_rate is null,0,f.calculation_rate) calculationRate
+            if(f.calculation_rate is null,0,f.calculation_rate) calculationRate,
+            if(f.calculation_amount is null,0,f.calculation_amount) calculationAmount
+
+
         from ag_acl_customer_fortune f
                  left join ag_po_order o on o.id = f.order_id
                  left join ag_product_plan pp on pp.id = o.plan_id