|
@@ -221,17 +221,25 @@ public class DesignerServiceImpl implements IDesignerService {
|
|
|
String endDay = DateUtils.getQuarterEndDay(frozenTime);
|
|
|
//离职月份
|
|
|
String month = DateUtils.getMonth("yyyy-MM-dd",frozenTime);
|
|
|
- // 离职时间 > = 最后一天 发放比例为1
|
|
|
- if (DateUtils.str2Date(frozenTime,new SimpleDateFormat("yyyy-MM-dd")).getTime() >=
|
|
|
- DateUtils.str2Date(endDay,new SimpleDateFormat("yyyy-MM-dd")).getTime()){
|
|
|
- userHappyProbability = new Double("1");
|
|
|
- }
|
|
|
+
|
|
|
//15日之前离职 不发
|
|
|
+ if (Integer.valueOf(month) < 15){
|
|
|
+ userHappyProbability = new Double("0");
|
|
|
+ }
|
|
|
+
|
|
|
// 15号之后离职,发50%
|
|
|
if (Integer.valueOf(month) >= 15){
|
|
|
userHappyProbability = new Double("0.5");
|
|
|
}
|
|
|
|
|
|
+ //最后一天离职 发放比例为1
|
|
|
+ // 离职时间 > = 最后一天
|
|
|
+ if (DateUtils.str2Date(frozenTime,new SimpleDateFormat("yyyy-MM-dd")).getTime() >=
|
|
|
+ DateUtils.str2Date(endDay,new SimpleDateFormat("yyyy-MM-dd")).getTime()){
|
|
|
+ userHappyProbability = new Double("1");
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|
|
|
return userHappyProbability;
|
|
@@ -352,7 +360,7 @@ public class DesignerServiceImpl implements IDesignerService {
|
|
|
|
|
|
//提成发放金额 = 总提成* 发放系数 * 离职发放比例
|
|
|
Double userHappyGetMoney = totalCommission * coefficient * userHappyProbability;
|
|
|
- userFrozen.put("userHappyGetMoney",0);
|
|
|
+ userFrozen.put("userHappyGetMoney",userHappyGetMoney);
|
|
|
|
|
|
return userFrozen;
|
|
|
|