|
|
@@ -248,7 +248,6 @@ public class DesignerServiceImpl implements IDesignerService {
|
|
|
}
|
|
|
|
|
|
public JSONObject getDesignerCommission(String userId, String yearTime, String monthTime, List<Map<String, Integer>> timeMap) {
|
|
|
- DecimalFormat df = new DecimalFormat("#.00");
|
|
|
String roleCode = roleService.getRoleCodeByUserId(userId);
|
|
|
|
|
|
//人员离职信息
|
|
|
@@ -304,9 +303,9 @@ public class DesignerServiceImpl implements IDesignerService {
|
|
|
Map<String, Object> bytedanceMap = new HashMap<>();
|
|
|
Map<String, Object> kuaishouMap = new HashMap<>();
|
|
|
bytedanceMap.put("type", "byteDance");
|
|
|
- bytedanceMap.put("cost", df.format(bytedanceCost));
|
|
|
+ bytedanceMap.put("cost", String.format("%.2f", bytedanceCost));
|
|
|
kuaishouMap.put("type", "kuaiShou");
|
|
|
- kuaishouMap.put("cost", df.format(kuaishouCost));
|
|
|
+ kuaishouMap.put("cost", String.format("%.2f", kuaishouCost));
|
|
|
quarterCostList.add(bytedanceMap);
|
|
|
quarterCostList.add(kuaishouMap);
|
|
|
|
|
|
@@ -315,12 +314,12 @@ public class DesignerServiceImpl implements IDesignerService {
|
|
|
|
|
|
//季度素材 总消耗
|
|
|
Double tatolCost = quarterCostList.stream().mapToDouble(json -> new Double(json.get("cost") + "")).reduce(Double::sum).orElse(new Double("0"));
|
|
|
- userFrozen.put("tatolQuarterCost", df.format(tatolCost));
|
|
|
+ userFrozen.put("tatolQuarterCost", String.format("%.2f", tatolCost));
|
|
|
|
|
|
//季度 管理消耗汇总
|
|
|
Double bytedanceLeaderCost = leaderCostList.stream().mapToDouble(json -> new Double(json.get("bytedanceCost") + "")).reduce(Double::sum).orElse(new Double("0"));
|
|
|
Double kuaishouLeaderCost = leaderCostList.stream().mapToDouble(json -> new Double(json.get("kuaishouCost") + "")).reduce(Double::sum).orElse(new Double("0"));
|
|
|
- userFrozen.put("leaderCost", df.format(bytedanceLeaderCost + kuaishouLeaderCost));
|
|
|
+ userFrozen.put("leaderCost", String.format("%.2f", bytedanceLeaderCost + kuaishouLeaderCost));
|
|
|
|
|
|
|
|
|
//判断素材消耗是否达标
|
|
|
@@ -391,7 +390,7 @@ public class DesignerServiceImpl implements IDesignerService {
|
|
|
}
|
|
|
commissionJson.put("monthTime", bytedance.get(i).get(0).getBigInteger("monthTime"));
|
|
|
commissionJson.put("xishu", userHappyProbability);
|
|
|
- commissionJson.put("commission", df.format((bytedanceCommission + kuaishouCommission) * userHappyProbability));
|
|
|
+ commissionJson.put("commission", String.format("%.2f", (bytedanceCommission + kuaishouCommission) * userHappyProbability));
|
|
|
commissionList.add(commissionJson);
|
|
|
}
|
|
|
bytedanceJson.get(0);
|
|
|
@@ -410,7 +409,7 @@ public class DesignerServiceImpl implements IDesignerService {
|
|
|
Double designerLeaderCommissionKuaishou = kuaishouLeaderCost * 0.003 * 0.2;
|
|
|
designerLeaderCommission = designerLeaderCommissionBytedance + designerLeaderCommissionKuaishou;
|
|
|
}
|
|
|
- userFrozen.put("designerLeaderCommission", df.format(designerLeaderCommission));
|
|
|
+ userFrozen.put("designerLeaderCommission", String.format("%.2f", designerLeaderCommission));
|
|
|
|
|
|
//提成汇总 = 季度汇总 + 负责人提成
|
|
|
totalCommission += designerLeaderCommission;
|
|
|
@@ -443,7 +442,7 @@ public class DesignerServiceImpl implements IDesignerService {
|
|
|
|
|
|
//提成发放金额 = 总提成 * 爆款达标发放系数
|
|
|
Double userHappyGetMoney = totalCommission * coefficient;
|
|
|
- userFrozen.put("userHappyGetMoney", df.format(userHappyGetMoney));
|
|
|
+ userFrozen.put("userHappyGetMoney", String.format("%.2f", userHappyGetMoney));
|
|
|
|
|
|
return userFrozen;
|
|
|
}
|