|
@@ -443,8 +443,9 @@ public class DesignerServiceImpl implements IDesignerService {
|
|
|
userFrozen.put("userHappyProbability",userHappyProbability);
|
|
|
|
|
|
|
|
|
- //提成发放金额 = 总提成* 发放系数 * 离职发放比例
|
|
|
- Double userHappyGetMoney = totalCommission * coefficient;
|
|
|
+ //提成发放金额 = 总提成 * 发放系数
|
|
|
+ BigDecimal ticheng = commissionList.stream().map(json -> json.getBigDecimal("ticheng")).reduce(BigDecimal.ZERO,BigDecimal::add);
|
|
|
+ Double userHappyGetMoney = ticheng.doubleValue() * coefficient;
|
|
|
userFrozen.put("userHappyGetMoney",userHappyGetMoney);
|
|
|
|
|
|
return userFrozen;
|