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

日常任务-公会页面主播周奖励过滤R档

Browse Source
This commit is contained in:
hokli
2025-09-04 21:43:22 +08:00
parent 0a3b7ae1e0
commit efd6503229
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/handler/GuildWeekRewardHandler.java
View File

@@ -40,7 +40,7 @@ public class GuildWeekRewardHandler extends AbstractDailyTaskHandler {
return null;
}
List<GuildMemberWeekLevelRewardVo> guildMemberWeekLevelRewardVos =
guildMemberWeekLevelRewardSelectService.listHistory(guildMember, partitionId);
guildMemberWeekLevelRewardSelectService.listHistory(guildMember, partitionId, Boolean.FALSE);
if (CollectionUtils.isEmpty(guildMemberWeekLevelRewardVos)) {
return null;
}

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberWeekLevelRewardSelectService.java
View File

@@ -38,9 +38,9 @@ public class GuildMemberWeekLevelRewardSelectService {
}
}
public List<GuildMemberWeekLevelRewardVo> listHistory(GuildMember guildMember, Integer partitionId) {
public List<GuildMemberWeekLevelRewardVo> listHistory(GuildMember guildMember, Integer partitionId, Boolean filterLevelR) {
if (PartitionEnum.ENGLISH2.getId() == partitionId) {
return guildMemberWeekLevelRewardV2Service.listHistory(guildMember, partitionId);
return guildMemberWeekLevelRewardV2Service.listHistory(guildMember, partitionId, filterLevelR);
} else {
return guildMemberWeekLevelRewardService.listHistory(guildMember.getId(), partitionId, 4);
}

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

@@ -81,11 +81,11 @@ public class GuildMemberWeekLevelRewardV2Service extends ServiceImpl<GuildMember
}
ZonedDateTime zdt = DateTimeUtil.getDateTimeByZoneId(partitionEnum.getZoneId());
return getVo(guildMember, partitionId, zdt, levelRewardList, true, true);
return getVo(guildMember, partitionId, zdt, levelRewardList, true, true,true);
}
private GuildMemberWeekLevelRewardVo getVo(GuildMember guildMember, Integer partitionId, ZonedDateTime zdt,
List<GuildMemberWeekLevelReward> levelRewardList, boolean needFilter, boolean thisWeek) {
List<GuildMemberWeekLevelReward> levelRewardList, boolean needFilter, boolean thisWeek, Boolean filterLevelR) {
Long guildMemberId = guildMember.getId();
Long uid = guildMember.getUid();
GuildMemberWeekLevelRewardVo vo = new GuildMemberWeekLevelRewardVo();
@@ -154,7 +154,7 @@ public class GuildMemberWeekLevelRewardV2Service extends ServiceImpl<GuildMember
Long receiveGuildMemberId = userProcessMap.getOrDefault(levelRField, 0L).longValue();
if (needFilter || this.calFilterLevelR(guildMember, receiveGuildMemberId)) {//公会首页过滤R档位 || 过滤条件过滤
if (needFilter || this.calFilterLevelR(guildMember, receiveGuildMemberId) || filterLevelR) {//公会首页过滤R档位 || 过滤条件过滤
levelRewardList.removeIf(levelReward -> levelReward.getLevel() == 0);
}
@@ -358,7 +358,7 @@ public class GuildMemberWeekLevelRewardV2Service extends ServiceImpl<GuildMember
processMap.expireAsync(30L, TimeUnit.DAYS);
}
public List<GuildMemberWeekLevelRewardVo> listHistory(GuildMember guildMember, Integer partitionId) {
public List<GuildMemberWeekLevelRewardVo> listHistory(GuildMember guildMember, Integer partitionId, Boolean filterLevelR) {
List<GuildMemberWeekLevelReward> levelRewardList = lambdaQuery()
.eq(GuildMemberWeekLevelReward::getPartitionId, partitionId)
.orderByAsc(GuildMemberWeekLevelReward::getLevel)
@@ -389,7 +389,7 @@ public class GuildMemberWeekLevelRewardV2Service extends ServiceImpl<GuildMember
}
Map<String, GuildMemberWeekLevelRewardVo> map = timeList.parallelStream().map(t ->
getVo(guildMember, partitionId, t, levelRewardList, false, t.equals(zdt)))
getVo(guildMember, partitionId, t, levelRewardList, false, t.equals(zdt), filterLevelR))
.collect(Collectors.toMap(GuildMemberWeekLevelRewardVo::getDateRange, t -> t));
return dateRangeList.stream()

2
accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/guild/GuildMemberWeekLevelRewardController.java
View File

@@ -48,7 +48,7 @@ public class GuildMemberWeekLevelRewardController {
throw new ServiceException(BusiStatus.FAMILY_PERMISSION_DENIED);
}
List<GuildMemberWeekLevelRewardVo> list = guildMemberWeekLevelRewardSelectService.listHistory(guildMember, u.getPartitionId());
List<GuildMemberWeekLevelRewardVo> list = guildMemberWeekLevelRewardSelectService.listHistory(guildMember, u.getPartitionId(), Boolean.TRUE);
return BusiResult.success(list);
}