主播周奖励-在麦时长-vo-preMaxNum和thisMaxNum
This commit is contained in:
@@ -124,6 +124,7 @@ public class GuildMemberWeekLevelRewardService extends ServiceImpl<GuildMemberWe
|
||||
String curLevel = "-", preLevel = "-";
|
||||
|
||||
BigDecimal preLevelMaxNum = BigDecimal.ZERO;
|
||||
BigDecimal thisLevelMaxNum = BigDecimal.ZERO;
|
||||
BigDecimal remainUserProcess = userProcess;
|
||||
|
||||
for (GuildMemberWeekLevelReward levelReward: levelRewardList) {
|
||||
@@ -157,12 +158,14 @@ public class GuildMemberWeekLevelRewardService extends ServiceImpl<GuildMemberWe
|
||||
break;
|
||||
}
|
||||
|
||||
thisLevelMaxNum = thisLevelMaxNum.add(levelReward.getProcessNum());
|
||||
|
||||
GuildMemberWeekLevelRewardItemVo itemVo = new GuildMemberWeekLevelRewardItemVo();
|
||||
itemVo.setId(id);
|
||||
itemVo.setLevel(levelReward.getLevelName());
|
||||
itemVo.setPreLevel(preLevel);
|
||||
itemVo.setProcessNum(processNum);
|
||||
itemVo.setMaxNum(levelReward.getProcessNum());
|
||||
itemVo.setMaxNum(thisLevelMaxNum);
|
||||
itemVo.setPreMaxNum(preLevelMaxNum);
|
||||
itemVo.setRewardNum(levelReward.getRewardNum());
|
||||
itemVo.setStatus(status);
|
||||
@@ -178,6 +181,8 @@ public class GuildMemberWeekLevelRewardService extends ServiceImpl<GuildMemberWe
|
||||
remainUserProcess = remainUserProcess.subtract(levelReward.getProcessNum());
|
||||
|
||||
preLevel = levelReward.getLevelName();
|
||||
|
||||
preLevelMaxNum = preLevelMaxNum.add(levelReward.getProcessNum());
|
||||
}
|
||||
|
||||
if (CollectionUtils.isEmpty(vo.getItemList())){
|
||||
@@ -202,7 +207,7 @@ public class GuildMemberWeekLevelRewardService extends ServiceImpl<GuildMemberWe
|
||||
vo.setPreLevel(curLevelReward.getPreLevel());
|
||||
vo.setPreMaxNum(curLevelReward.getPreMaxNum());
|
||||
vo.setCurLevel(curLevelReward.getLevel());
|
||||
vo.setProcessNum(curLevelReward.getProcessNum());
|
||||
vo.setProcessNum(userProcess.compareTo(thisLevelMaxNum) > 0? thisLevelMaxNum: userProcess);
|
||||
vo.setMaxNum(curLevelReward.getMaxNum());
|
||||
|
||||
return vo;
|
||||
|
Reference in New Issue
Block a user