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

Skip to content

L
liquidnet-bus-v1
Commit b5e9a300 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

Merge branch 'dev_stone_umlimit' into pre

parents ffea378f 11439fef
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/src/main/java/com/liquidnet/service/stone/service/impl/StoneScoreLogsServiceImpl.java
View file @ b5e9a300
...@@ -88,15 +88,15 @@ public class StoneScoreLogsServiceImpl implements IStoneScoreLogsService { ...@@ -88,15 +88,15 @@ public class StoneScoreLogsServiceImpl implements IStoneScoreLogsService {
} }
Date userMonth = DateUtil.parse(vo.getCurrentMonth() == null ? DateUtil.getNowTime() : vo.getCurrentMonth(), "yyyy-MM"); Date userMonth = DateUtil.parse(vo.getCurrentMonth() == null ? DateUtil.getNowTime() : vo.getCurrentMonth(), "yyyy-MM");
int monthScore = vo.getMonthScore() == null ? 0 : vo.getMonthScore(); int monthScore = vo.getMonthScore() == null ? 0 : vo.getMonthScore();
if (DateUtil.compareMonth(userMonth, DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM")) == 0) {//当月 // if (DateUtil.compareMonth(userMonth, DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM")) == 0) {//当月
if ((monthScore + score) >= monthMax) { // if ((monthScore + score) >= monthMax) {
score = monthMax - monthScore; // score = monthMax - monthScore;
} // }
} else { // } else {
if (score >= monthMax) { // if (score >= monthMax) {
score = monthMax; // score = monthMax;
} // }
} // }
// Date userDay = DateUtil.parse(vo.getCurrentDay() == null ? DateUtil.getNowTime() : vo.getCurrentDay(), "yyyy-MM-dd"); // Date userDay = DateUtil.parse(vo.getCurrentDay() == null ? DateUtil.getNowTime() : vo.getCurrentDay(), "yyyy-MM-dd");
// int dayScore = vo.getDayScore() == null ? 0 : vo.getDayScore(); // int dayScore = vo.getDayScore() == null ? 0 : vo.getDayScore();
// if (DateUtil.compareDay(userDay, DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM-dd")) == 0) {//当日 // if (DateUtil.compareDay(userDay, DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM-dd")) == 0) {//当日
......
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