|
@@ -313,10 +313,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
}
|
|
|
BigDecimal lastCommission = BigDecimal.ZERO;
|
|
|
Agent agent = iAgentService.getById(order.getAgentId());
|
|
|
- if (agent.getPid() != null) {
|
|
|
- Agent sAgent = iAgentService.getByPid(agent.getPid());
|
|
|
+ Agent sAgent = iAgentService.getByPid(agent.getPid());
|
|
|
+ if (sAgent != null) {
|
|
|
BigDecimal sCommission = BigDecimal.ZERO;
|
|
|
- if (Objects.nonNull(sAgent) && sAgent.getPid() == 0) {
|
|
|
+ if (sAgent.getPid() == 0) {
|
|
|
// 一级代理商分佣
|
|
|
sCommission = commission.multiply(agent.getCommissonRate().divide(new BigDecimal(100),2, RoundingMode.DOWN)).setScale(2,RoundingMode.DOWN);
|
|
|
saveCommission(agent, commission, sCommission, order.getOrderId());
|
|
@@ -331,6 +331,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
}
|
|
|
lastCommission = commission.subtract(sCommission);
|
|
|
saveCommission(sAgent, commission, lastCommission, order.getOrderId());
|
|
|
+ } else {
|
|
|
+ saveCommission(agent, commission, commission, order.getOrderId());
|
|
|
}
|
|
|
}
|
|
|
|