Commit 3b47ad87 by jianan

续年佣金计算-缴费年限12

parent f319a9fb
...@@ -187,7 +187,7 @@ public class LifeCommissionServiceImpl implements LifeCommissionService { ...@@ -187,7 +187,7 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
orderCommission.setCommissionNo(commissionNo); orderCommission.setCommissionNo(commissionNo);
orderCommission.setCommissionCheckId(checkBatchId); orderCommission.setCommissionCheckId(checkBatchId);
orderCommission.setCommissionStatus(status); orderCommission.setCommissionStatus(status);
orderCommission.setCommissionTime(checkBatch); orderCommission.setCommissionTime(null);
orderCommission.setUpdatedBy(Long.valueOf(loginId)); orderCommission.setUpdatedBy(Long.valueOf(loginId));
orderCommission.setUpdatedAt(new Date()); orderCommission.setUpdatedAt(new Date());
...@@ -200,7 +200,9 @@ public class LifeCommissionServiceImpl implements LifeCommissionService { ...@@ -200,7 +200,9 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
orderCommission.setCommissionNo(commissionNo); orderCommission.setCommissionNo(commissionNo);
orderCommission.setCommissionCheckId(checkBatchId); orderCommission.setCommissionCheckId(checkBatchId);
orderCommission.setCommissionStatus(status); orderCommission.setCommissionStatus(status);
if ("2".equals(status)) {
orderCommission.setCommissionTime(checkBatch); orderCommission.setCommissionTime(checkBatch);
}
orderCommission.setUpdatedBy(Long.valueOf(loginId)); orderCommission.setUpdatedBy(Long.valueOf(loginId));
orderCommission.setUpdatedAt(new Date()); orderCommission.setUpdatedAt(new Date());
......
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