moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

主播周任务上麦时间显示问题fixed1

Browse Source
This commit is contained in:
hokli
2025-09-09 17:49:35 +08:00
parent 3bfd4d4694
commit 8f4b511813
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberWeekLevelRewardV2Service.java
View File

@@ -152,7 +152,15 @@ public class GuildMemberWeekLevelRewardV2Service extends ServiceImpl<GuildMember
BigDecimal thisLevelMaxNum = BigDecimal.ZERO;
BigDecimal remainUserProcess = userProcess;
Long receiveGuildMemberId = userProcessMap.getOrDefault(levelRField, 0L).longValue();
//公会首页过滤R档位 || 过滤条件过滤
filterLevelR = needFilter || this.calFilterLevelR(guildMember, receiveGuildMemberId) || filterLevelR;
for (GuildMemberWeekLevelReward levelReward : levelRewardList) {
if (filterLevelR && levelReward.getLevel() == 0) {
continue;
}
String levelId = levelReward.getLevel().toString();
String id = String.join("_" , guildMemberId.toString(), mondayDateStr, levelId);
String statusId = String.join("_" , guildMemberId.toString(), levelId);
@@ -203,7 +211,7 @@ public class GuildMemberWeekLevelRewardV2Service extends ServiceImpl<GuildMember
itemVo.setBonusPreMaxNum(0);
itemVo.setBonusRewardNum(levelReward.getBonusNum());
itemVo.setBonusStatus(bonusStatus);
if (bonusStatus.equals(Constant.status.valid) || bonusStatus.equals(Constant.status.invalid)) {
if (bonusStatus.equals(Constant.status.valid) || bonusStatus.equals(Constant.status.invalid) || userBonusProcess >= levelReward.getMicValidDay()) {
vo.setBonusProcessNum(micDurationMinutes);
}
@@ -220,14 +228,6 @@ public class GuildMemberWeekLevelRewardV2Service extends ServiceImpl<GuildMember
return vo;
}
Long receiveGuildMemberId = userProcessMap.getOrDefault(levelRField, 0L).longValue();
//公会首页过滤R档位 || 过滤条件过滤
Boolean realFilterLevelR = needFilter || this.calFilterLevelR(guildMember, receiveGuildMemberId) || filterLevelR;
if (realFilterLevelR) {
itemVoList = itemVoList.stream().filter(item -> !(realFilterLevelR && item.getLevel() == 0)).collect(Collectors.toList());
vo.setItemList(itemVoList);
}
GuildMemberWeekLevelRewardItemVo curLevelReward = null;
vo.setCurLevel(curLevel);
vo.setCurLevelName(curLevelName);