续年佣金计算-来佣比对续年费率5

yd-api/src/main/resources/mapper/lifecommission/LifeCommissionMapper.xml

@@ -11,38 +11,41 @@
             IFNULL(a.name,p.name) planName,
             o.policy_no policyNo,
             o.order_price orderPrice,
-            o.commission_rate commissionRate,
-            o.commission_amount commissionAmount,
-            o.commission_check_status commissionCheckStatus,
+            o.commissionRate commissionRate,
+            o.commissionAmount commissionAmount,
+            o.commissionCheckStatus commissionCheckStatus,
             o.order_date orderDate,
             o.commission_no commissionNo,
             o.amount ,
             date_format(o.commissionYear, '%Y-%m-%d') commissionYear,
-            o.commission_status commissionStatus,
+            o.commissionCheckStatus commissionStatus,
             o.commission_time commissionTime,
             o.commission_period commissionPeriod,
-            IFNULL(o.coverageTerm,e.coverageTerm) coverageTerm,
+            (case when o.cover_term in ('1','2','3') then o.coverageTerm  else e.coverageTerm END) coverageTerm,
             IFNULL(o.payTerm,e.payTerm) payTerm,
             f.name,
             f.practitioner_type_id practitionerTypeId,
             (case o.config_level when 2 then p2.pName2 else p3.pName3 END) categoryName,
             (case o.config_level when 2 then p2.cName2 else p3.cName3 END) planCategoryName
         from (SELECT o.*,
-                    policyNo, commission_no, amount, commission_status, commission_time,
+                    policyNo, commission_no, amount, commission_time, rate,
                     IFNULL(commission_year, o.order_date) commissionYear,
+                    IFNULL(commission_status, o.commission_check_status) commissionCheckStatus,
+                    IFNULL(amount, o.commission_amount) commissionAmount,
+                    IFNULL(rate, o.commission_rate) commissionRate,
                     commission_period
                 from
-                    (SELECT id, policy_no, order_price, commission_rate, commission_amount, commission_check_status, commission_check_id, product_id,
-                        plan_id, insurer_id, order_date, commission_check_at, config_level,
+                    (SELECT id, policy_no, order_price, commission_check_id, product_id, commission_rate, commission_amount, commission_check_status,
+                        plan_id, insurer_id, order_date, commission_check_at, config_level, cover_term,
                         CONCAT(payment_term, (case payment_term_unit when 'Y' then '年' when 'M' then '月' else '日' END)) payTerm,
-                        CONCAT(cover_term, cover_term_type) coverageTerm
+                        cover_term_type coverageTerm
                         from ag_po_order t
                         where t.status in (3,4) and policy_no is not null
                         and (t.plan_id not in (424,453,464) or t.plan_id is null)
                     ) o
                 LEFT JOIN
                     (SELECT policy_no policyNo, commission_no, commission_year, amount, commission_status, commission_time,
-                        commission_period
+                        commission_period, rate
                         from ag_po_order_commission t
                     ) orderCommission
                 ON o.policy_no = orderCommission.policyNo
@@ -145,14 +148,17 @@
     <select id="getSummaries" resultType="java.util.Map">
         select
             count(1) totalSingular,
-            IFNULL(sum(CASE WHEN o.commission_check_status = '1' THEN 1 ELSE 0 END),0) totalDaiLaiYong,
-            IFNULL(sum(CASE WHEN o.commission_check_status = '2' THEN 1 ELSE 0 END),0) totalYiBiDui,
-            IFNULL(sum(CASE WHEN o.commission_check_status = '3' THEN 1 ELSE 0 END),0) totalYiTuiBao,
+            IFNULL(sum(CASE WHEN o.commissionCheckStatus = '1' THEN 1 ELSE 0 END),0) totalDaiLaiYong,
+            IFNULL(sum(CASE WHEN o.commissionCheckStatus = '2' THEN 1 ELSE 0 END),0) totalYiBiDui,
+            IFNULL(sum(CASE WHEN o.commissionCheckStatus = '3' THEN 1 ELSE 0 END),0) totalYiTuiBao,
             IFNULL(sum(o.order_price),0) totalOrderPrice,
-            IFNULL(sum(o.commission_amount),0) totalCommission
+            IFNULL(sum(o.commissionAmount),0) totalCommission
         from (SELECT o.*,
-                    policyNo, commission_no, amount, commission_status, commission_time,
+                    policyNo, commission_no, amount, commission_time, rate,
                     IFNULL(commission_year, o.order_date) commissionYear,
+                    IFNULL(commission_status, o.commission_check_status) commissionCheckStatus,
+                    IFNULL(amount, o.commission_amount) commissionAmount,
+                    IFNULL(rate, o.commission_rate) commissionRate,
                     commission_period
                 from
                 (SELECT id, policy_no, order_price, commission_rate, commission_amount, commission_check_status, commission_check_id, product_id,
@@ -164,7 +170,7 @@
                     and (t.plan_id not in (424,453,464) or t.plan_id is null)
                 ) o
                 LEFT JOIN
-                (SELECT policy_no policyNo, commission_no, commission_year, amount, commission_status, commission_time,
+                (SELECT policy_no policyNo, commission_no, commission_year, amount, commission_status, commission_time, rate,
                     commission_period
                     from ag_po_order_commission t
                 ) orderCommission