日常任务-主播周奖励总进度条
This commit is contained in:
@@ -149,6 +149,7 @@ public class GuildMemberWeekLevelRewardV2Service extends ServiceImpl<GuildMember
|
||||
String curLevelName = "-" , preLevelName = "-";
|
||||
|
||||
BigDecimal preLevelMaxNum = BigDecimal.ZERO;
|
||||
BigDecimal thisLevelMaxNum = BigDecimal.ZERO;
|
||||
BigDecimal remainUserProcess = userProcess;
|
||||
|
||||
Long receiveGuildMemberId = userProcessMap.getOrDefault(levelRField, 0L).longValue();
|
||||
@@ -189,6 +190,8 @@ public class GuildMemberWeekLevelRewardV2Service extends ServiceImpl<GuildMember
|
||||
break;
|
||||
}
|
||||
|
||||
thisLevelMaxNum = thisLevelMaxNum.add(levelReward.getProcessNum());
|
||||
|
||||
GuildMemberWeekLevelRewardItemVo itemVo = new GuildMemberWeekLevelRewardItemVo();
|
||||
itemVo.setId(id);
|
||||
itemVo.setLevel(levelReward.getLevel());
|
||||
@@ -196,7 +199,7 @@ public class GuildMemberWeekLevelRewardV2Service extends ServiceImpl<GuildMember
|
||||
itemVo.setPreLevel(preLevel);
|
||||
itemVo.setPreLevelName(preLevelName);
|
||||
itemVo.setProcessNum(processNum);
|
||||
itemVo.setMaxNum(levelReward.getProcessNum());
|
||||
itemVo.setMaxNum(thisLevelMaxNum);
|
||||
itemVo.setPreMaxNum(preLevelMaxNum);
|
||||
itemVo.setRewardNum(levelReward.getRewardNum());
|
||||
itemVo.setStatus(status);
|
||||
@@ -216,6 +219,7 @@ public class GuildMemberWeekLevelRewardV2Service extends ServiceImpl<GuildMember
|
||||
|
||||
preLevelName = levelReward.getLevelName();
|
||||
preLevel = levelReward.getLevel();
|
||||
preLevelMaxNum = preLevelMaxNum.add(levelReward.getProcessNum());
|
||||
}
|
||||
|
||||
if (CollectionUtils.isEmpty(vo.getItemList())) {
|
||||
@@ -240,7 +244,7 @@ public class GuildMemberWeekLevelRewardV2Service extends ServiceImpl<GuildMember
|
||||
vo.setPreLevelName(curLevelReward.getPreLevelName());
|
||||
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