Skip to content

Y
yd-backend
Commit 25fb738d by jianan
Options

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

parent b8979a1d
Showing with 14 additions and 14 deletions
yd-api/src/main/java/com/yd/api/commission/service/impl/LifeCommissionServiceImpl.java
...@@ -155,7 +155,7 @@ public class LifeCommissionServiceImpl implements LifeCommissionService { ...@@ -155,7 +155,7 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
AgPoOrderCommission orderCommission = new AgPoOrderCommission(); AgPoOrderCommission orderCommission = new AgPoOrderCommission();
orderCommission.setCommissionCheckId(checkBatchId); orderCommission.setCommissionCheckId(checkBatchId);
orderCommission.setCommissionStatus(status); orderCommission.setCommissionStatus(status);
orderCommission.setCommissionTime(CommonUtil.dateParseString(new Date(), "yyyy-MM-dd HH:mm:ss")); orderCommission.setCommissionTime(checkBatch);
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
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
IFNULL(a.name,p.name) planName, IFNULL(a.name,p.name) planName,
o.policy_no policyNo, o.policy_no policyNo,
o.order_price orderPrice, o.order_price orderPrice,
o.commissionRate commissionRate, o.commissionRate,
o.commissionAmount commissionAmount, o.commissionAmount,
o.commissionCheckStatus commissionCheckStatus, o.commissionCheckStatus,
o.order_date orderDate, o.order_date orderDate,
o.commission_no commissionNo, o.commission_no commissionNo,
o.amount , o.amount ,
...@@ -29,10 +29,10 @@ ...@@ -29,10 +29,10 @@
(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, commission_check_id, policyNo, commission_no, amount, commission_time, rate, commission_check_id,
IFNULL(commission_year, o.order_date) commissionYear, commission_year commissionYear,
IFNULL(commission_status, o.commission_check_status) commissionCheckStatus, commission_status commissionCheckStatus,
IFNULL(amount, o.commission_amount) commissionAmount, amount commissionAmount,
IFNULL(rate, o.commission_rate) commissionRate, rate commissionRate,
commission_period commission_period
from from
(SELECT id, policy_no, order_price, product_id, commission_rate, commission_amount, commission_check_status, (SELECT id, policy_no, order_price, product_id, commission_rate, commission_amount, commission_check_status,
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
and f.practitioner_type_id = #{practitionerTypeId} and f.practitioner_type_id = #{practitionerTypeId}
</if> </if>
<if test="commissionCheckStatus != null"> <if test="commissionCheckStatus != null">
and o.commission_check_status = #{commissionCheckStatus} and o.commissionCheckStatus = #{commissionCheckStatus}
</if> </if>
<choose> <choose>
<when test="historyDate != null "> <when test="historyDate != null ">
...@@ -155,10 +155,10 @@ ...@@ -155,10 +155,10 @@
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, commission_check_id, policyNo, commission_no, amount, commission_time, rate, commission_check_id,
IFNULL(commission_year, o.order_date) commissionYear, commission_year commissionYear,
IFNULL(commission_status, o.commission_check_status) commissionCheckStatus, commission_status commissionCheckStatus,
IFNULL(amount, o.commission_amount) commissionAmount, amount commissionAmount,
IFNULL(rate, o.commission_rate) commissionRate, rate commissionRate,
commission_period commission_period
from from
(SELECT id, policy_no, order_price, commission_rate, commission_amount, commission_check_status, product_id, (SELECT id, policy_no, order_price, commission_rate, commission_amount, commission_check_status, product_id,
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
and f.practitioner_type_id = #{practitionerTypeId} and f.practitioner_type_id = #{practitionerTypeId}
</if> </if>
<if test="commissionCheckStatus != null"> <if test="commissionCheckStatus != null">
and o.commission_check_status = #{commissionCheckStatus} and o.commissionCheckStatus = #{commissionCheckStatus}
</if> </if>
<choose> <choose>
<when test="historyDate != null "> <when test="historyDate != null ">
......
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