|
@@ -273,7 +273,6 @@ public class DesignerServiceImpl implements IDesignerService {
|
|
|
JSONObject leaderCost = designerMapper.getDesignerManagerLeaderCost(userId,Integer.valueOf(yearTime),Integer.valueOf(monthTime));
|
|
|
userFrozen.put("leaderCost",leaderCost.getString("cost"));
|
|
|
|
|
|
-
|
|
|
//离职时间
|
|
|
String frozenTime = userFrozen.getString("frozenTime");
|
|
|
//入职时间
|
|
@@ -340,11 +339,12 @@ public class DesignerServiceImpl implements IDesignerService {
|
|
|
BigDecimal totalCommissionBd = commissionList.stream().map(json -> json.getBigDecimal("commission")).reduce(BigDecimal.ZERO,BigDecimal::add);
|
|
|
Double totalCommission = totalCommissionBd.doubleValue();
|
|
|
|
|
|
- //如果是负责人 (设计组长) 负责人提成千三的20%
|
|
|
+ //负责人提成 如果是负责人 (设计组长) 管理消耗 千三的20%
|
|
|
Double designerLeaderCommission = new Double("0");
|
|
|
String roleCode = roleService.getRoleCodeByUserId(userId);
|
|
|
if (roleCode.equalsIgnoreCase("designTeamLeader")){
|
|
|
- designerLeaderCommission = totalCommission * 0.003 * 0.2;
|
|
|
+
|
|
|
+ designerLeaderCommission = new Double(leaderCost.getString("cost")) * 0.003 * 0.2;
|
|
|
}
|
|
|
userFrozen.put("designerLeaderCommission",designerLeaderCommission);
|
|
|
|