Skip to content

Y
yd-backend
Commit b8979a1d by jianan
Options

续年佣金计算-来佣比对检核年月6

parent 0b29b20a
Showing with 7 additions and 10 deletions
yd-api/src/main/java/com/yd/api/commission/service/impl/LifeCommissionServiceImpl.java
...@@ -140,9 +140,6 @@ public class LifeCommissionServiceImpl implements LifeCommissionService { ...@@ -140,9 +140,6 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
} }
private void updateOrderCommission(List<ComeCommissionParams> paramsList, String status, String loginId, String checkBatch) { private void updateOrderCommission(List<ComeCommissionParams> paramsList, String status, String loginId, String checkBatch) {
if (!"2".equals(status)) {
return;
}
// 获取续年度来佣编号 // 获取续年度来佣编号
List<String> commissionNos = new ArrayList<>(); List<String> commissionNos = new ArrayList<>();
...@@ -157,7 +154,7 @@ public class LifeCommissionServiceImpl implements LifeCommissionService { ...@@ -157,7 +154,7 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
AgPoOrderCommission orderCommission = new AgPoOrderCommission(); AgPoOrderCommission orderCommission = new AgPoOrderCommission();
orderCommission.setCommissionCheckId(checkBatchId); orderCommission.setCommissionCheckId(checkBatchId);
orderCommission.setCommissionStatus("1"); orderCommission.setCommissionStatus(status);
orderCommission.setCommissionTime(CommonUtil.dateParseString(new Date(), "yyyy-MM-dd HH:mm:ss")); orderCommission.setCommissionTime(CommonUtil.dateParseString(new Date(), "yyyy-MM-dd HH:mm:ss"));
orderCommission.setUpdatedBy(Long.valueOf(loginId)); orderCommission.setUpdatedBy(Long.valueOf(loginId));
orderCommission.setUpdatedAt(new Date()); orderCommission.setUpdatedAt(new Date());
......
yd-api/src/main/resources/mapper/lifecommission/LifeCommissionMapper.xml
...@@ -28,14 +28,14 @@ ...@@ -28,14 +28,14 @@
(case o.config_level when 2 then p2.pName2 else p3.pName3 END) categoryName, (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 (case o.config_level when 2 then p2.cName2 else p3.cName3 END) planCategoryName
from (SELECT o.*, from (SELECT o.*,
policyNo, commission_no, amount, commission_time, rate, policyNo, commission_no, amount, commission_time, rate, commission_check_id,
IFNULL(commission_year, o.order_date) commissionYear, IFNULL(commission_year, o.order_date) commissionYear,
IFNULL(commission_status, o.commission_check_status) commissionCheckStatus, IFNULL(commission_status, o.commission_check_status) commissionCheckStatus,
IFNULL(amount, o.commission_amount) commissionAmount, IFNULL(amount, o.commission_amount) commissionAmount,
IFNULL(rate, o.commission_rate) commissionRate, IFNULL(rate, o.commission_rate) commissionRate,
commission_period commission_period
from from
(SELECT id, policy_no, order_price, commission_check_id, product_id, commission_rate, commission_amount, commission_check_status, (SELECT id, policy_no, order_price, product_id, commission_rate, commission_amount, commission_check_status,
plan_id, insurer_id, order_date, commission_check_at, config_level, cover_term, 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(payment_term, (case payment_term_unit when 'Y' then '年' when 'M' then '月' else '日' END)) payTerm,
cover_term_type coverageTerm cover_term_type coverageTerm
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
and (t.plan_id not in (424,453,464) or t.plan_id is null) and (t.plan_id not in (424,453,464) or t.plan_id is null)
) o ) o
LEFT JOIN 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, commission_check_id,
commission_period, rate commission_period, rate
from ag_po_order_commission t from ag_po_order_commission t
) orderCommission ) orderCommission
...@@ -154,14 +154,14 @@ ...@@ -154,14 +154,14 @@
IFNULL(sum(o.order_price),0) totalOrderPrice, IFNULL(sum(o.order_price),0) totalOrderPrice,
IFNULL(sum(o.commissionAmount),0) totalCommission IFNULL(sum(o.commissionAmount),0) totalCommission
from (SELECT o.*, from (SELECT o.*,
policyNo, commission_no, amount, commission_time, rate, policyNo, commission_no, amount, commission_time, rate, commission_check_id,
IFNULL(commission_year, o.order_date) commissionYear, IFNULL(commission_year, o.order_date) commissionYear,
IFNULL(commission_status, o.commission_check_status) commissionCheckStatus, IFNULL(commission_status, o.commission_check_status) commissionCheckStatus,
IFNULL(amount, o.commission_amount) commissionAmount, IFNULL(amount, o.commission_amount) commissionAmount,
IFNULL(rate, o.commission_rate) commissionRate, IFNULL(rate, o.commission_rate) commissionRate,
commission_period commission_period
from from
(SELECT id, policy_no, order_price, commission_rate, commission_amount, commission_check_status, commission_check_id, product_id, (SELECT id, policy_no, order_price, commission_rate, commission_amount, commission_check_status, product_id,
plan_id, insurer_id, order_date, commission_check_at, config_level, plan_id, insurer_id, order_date, commission_check_at, config_level,
CONCAT(payment_term, (case payment_term_unit when 'Y' then '年' when 'M' then '月' else '日' END)) payTerm, CONCAT(payment_term, (case payment_term_unit when 'Y' then '年' when 'M' then '月' else '日' END)) payTerm,
CONCAT(cover_term, cover_term_type) coverageTerm CONCAT(cover_term, cover_term_type) coverageTerm
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
and (t.plan_id not in (424,453,464) or t.plan_id is null) and (t.plan_id not in (424,453,464) or t.plan_id is null)
) o ) o
LEFT JOIN LEFT JOIN
(SELECT policy_no policyNo, commission_no, commission_year, amount, commission_status, commission_time, rate, (SELECT policy_no policyNo, commission_no, commission_year, amount, commission_status, commission_time, rate, commission_check_id,
commission_period commission_period
from ag_po_order_commission t from ag_po_order_commission t
) orderCommission ) orderCommission
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment