记得上下班打卡 | git大法好,push需谨慎

Commit d9233d7f authored by 胡佳晨's avatar 胡佳晨

最大积分限制 添加

parent 6d890e29
......@@ -70,20 +70,21 @@ public class StoneScoreLogsServiceImpl implements IStoneScoreLogsService {
return "积分不能小于0";
}
StoneUserVo vo = stoneRedisUtils.getUserData(uid);
if (TaskId == 2111) {
StoneUserVo vo = stoneRedisUtils.getUserData(uid);
// Date userDay = DateUtil.parse(vo.getCurrentDay().isEmpty() ? DateUtil.getNowTime() : vo.getCurrentDay(), "yyyy-MM-dd");
Date userMonth = DateUtil.parse(vo.getCurrentMonth().isEmpty() ? DateUtil.getNowTime() : vo.getCurrentMonth(), "yyyy-MM");
int monthScore = vo.getMonthScore() == null ? 0 : vo.getMonthScore();
Date userMonth = DateUtil.parse(vo.getCurrentMonth().isEmpty() ? DateUtil.getNowTime() : vo.getCurrentMonth(), "yyyy-MM");
int monthScore = vo.getMonthScore() == null ? 0 : vo.getMonthScore();
// int dayScore = vo.getDayScore() == null ? 0 : vo.getDayScore();
if (DateUtil.compareMonth(userMonth, DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM")) == 0) {//当月
if ((monthScore + score) >= monthMax) {
score = monthMax - monthScore;
}
} else {
if (score >= monthMax) {
score = monthMax;
if (DateUtil.compareMonth(userMonth, DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM")) == 0) {//当月
if ((monthScore + score) >= monthMax) {
score = monthMax - monthScore;
}
} else {
if (score >= monthMax) {
score = monthMax;
}
}
}
// if (DateUtil.compareDay(userDay, DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM-dd")) == 0) {//当日
// if ((dayScore + score) >= dayMax) {
// score = dayMax - dayScore;
......@@ -93,10 +94,9 @@ public class StoneScoreLogsServiceImpl implements IStoneScoreLogsService {
// score = dayMax;
// }
// }
if (score == 0) {
return "成功";
}
if (TaskId == 2111) {
if (score == 0) {
return "成功";
}
changeRest(uid, score, reason, reason);
return "成功";
} else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment