|
@@ -380,10 +380,40 @@ public class DesignerServiceImpl implements IDesignerService {
|
|
|
List<JSONObject> kuaishouJson = designerMapper.getDesignerAchievementsKuaishou(userId, month.get("startTime"),month.get("endTime"));
|
|
|
Double kuaishouCommission = kuaishouJson.stream().mapToDouble(json -> json.getDouble("commission")).reduce(Double::sum).orElse(new Double("0"));
|
|
|
|
|
|
- commissionJson.put("monthTime", month);
|
|
|
+ commissionJson.put("monthTime", month.get("startTime"));
|
|
|
commissionJson.put("yearTime", yearTime);
|
|
|
commissionJson.put("commission", bytedanceCommission+kuaishouCommission);
|
|
|
+
|
|
|
+
|
|
|
+ //离职 提成系数
|
|
|
+ //Double a = userHappyProbability(frozenTime,Integer.valueOf(monthTime));
|
|
|
+ Double userHappyProbability = new Double(1);
|
|
|
+ if (!Check.isNull(frozenTime)){
|
|
|
+ //离职时间
|
|
|
+ int frozenT = DateUtils.getDateInteger(frozenTime);
|
|
|
+
|
|
|
+ // 日期转换 20221021 ===>>> 2022-10-21
|
|
|
+ String day = DateUtils.getStrDateToInt(month.get("startTime"));
|
|
|
+ //获取月份的 中间的日期 20221015
|
|
|
+ int middleDay = DateUtils.subMonthMiddleDay(day);
|
|
|
+
|
|
|
+ if (frozenT < middleDay){
|
|
|
+ userHappyProbability = new Double(0);
|
|
|
+ }
|
|
|
+ if (frozenT > middleDay && frozenT < month.get("endTime")){
|
|
|
+ userHappyProbability = new Double(0.5);
|
|
|
+ }
|
|
|
+ if (frozenT == month.get("endTime")){
|
|
|
+ userHappyProbability = new Double(1);
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ commissionJson.put("xishu", userHappyProbability);
|
|
|
+ commissionJson.put("ticheng", (bytedanceCommission+kuaishouCommission) * userHappyProbability);
|
|
|
commissionList.add(commissionJson);
|
|
|
+
|
|
|
}
|
|
|
userFrozen.put("commissionList",commissionList);
|
|
|
|
|
@@ -414,7 +444,7 @@ public class DesignerServiceImpl implements IDesignerService {
|
|
|
|
|
|
|
|
|
//提成发放金额 = 总提成* 发放系数 * 离职发放比例
|
|
|
- Double userHappyGetMoney = totalCommission * coefficient * userHappyProbability;
|
|
|
+ Double userHappyGetMoney = totalCommission * coefficient;
|
|
|
userFrozen.put("userHappyGetMoney",userHappyGetMoney);
|
|
|
|
|
|
return userFrozen;
|