寿险经纪人发佣关账新增字段

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

@@ -62,4 +62,22 @@ public class WithdrawLabelInfo {
      * 发佣时间
      */
     private String  payDate;
+
+    /**
+     * 经纪人id
+     */
+    private Long  practitionerId;
+
+    /**
+     * 含税额
+     */
+    private BigDecimal  taxAmount;
+
+    /**
+     * 税后税金额
+     */
+    private BigDecimal  afterTaxAmount;
+
 }
+
+

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

@@ -246,6 +246,10 @@
         <result column="subordinateSystemName" jdbcType="VARCHAR" property="subordinateSystemName" />
         <result column="commissionPayoutStatus" jdbcType="VARCHAR" property="commissionPayoutStatus" />
         <result column="payDate" jdbcType="VARCHAR" property="payDate" />
+        <result column="practitionerId" jdbcType="BIGINT" property="practitionerId" />
+        <result column="taxAmount" jdbcType="DECIMAL" property="taxAmount" />
+        <result column="afterTaxAmount" jdbcType="DECIMAL" property="afterTaxAmount" />
+
     </resultMap>
     <select id="transformForWithdrawLabel"
             parameterType="com.yd.dal.entity.agms.fortune.WithdrawQueryInfo"
@@ -261,7 +265,10 @@
         dept.name                    insurerBranchDeptName,
         sub.name                     subordinateSystemName,
         if(pay.pay_status = 0, 2, 4) commissionPayoutStatus,
-        date_format(pay.pay_date, '%Y-%m-%d %H:%i:%s') payDate
+        date_format(pay.pay_date, '%Y-%m-%d %H:%i:%s') payDate,
+        pra.ID practitionerId,
+        if(salary.taxout_amount is null,0,salary.taxout_amount) taxAmount,
+        if(salary.net_amount is null,0,salary.net_amount) afterTaxAmount
         from ag_acl_customer_fortune_pay pay
         inner join ag_acl_customer_fortune f on f.fortune_payed_id = pay.id
 <!--         inner JOIN ag_po_order o on o.id = f.order_id -->
@@ -272,6 +279,8 @@
         LEFT JOIN ag_acl_practitioner_subordinate_system sub ON sub.id = pra.subordinate_system_id
         inner join ag_acl_practitioner_setting setting on pra.id = setting.practitioner_id
         left join ag_md_drop_options opt on opt.id = setting.practitioner_level
+        left join ag_acl_life_practitioner_salary salary on salary.practitioner_id=pra.id and salary.`year_month`=REPLACE (pb.payout_yearmonth, '-', '')
+
         where
            setting.practitioner_type_id = 28
           and pay.withdraw_amount != 0