From d93aa00fbe80cee5ea3728f52badb4b6c8ea83a3 Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Tue, 14 Oct 2025 18:42:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=AF=8C=E9=AD=85=E5=8A=9B=E6=88=BF?= =?UTF-8?q?=E9=97=B4=E6=8E=92=E8=A1=8C=E6=A6=9C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GiftsReceivedLeaderboardQryExe.java | 28 +++++++++---------- .../activity/GiftsSendLeaderboardQryExe.java | 10 +++---- .../activity/RoomGiftsLeaderboardQryExe.java | 10 +++---- .../ActivityLeaderboardServiceImpl.java | 2 +- 4 files changed, 24 insertions(+), 26 deletions(-) diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/GiftsReceivedLeaderboardQryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/GiftsReceivedLeaderboardQryExe.java index f7908744..a7072c42 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/GiftsReceivedLeaderboardQryExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/GiftsReceivedLeaderboardQryExe.java @@ -12,11 +12,8 @@ import com.red.circle.other.inner.model.dto.user.UserProfileDTO; import com.red.circle.tool.core.collection.CollectionUtils; import com.red.circle.tool.core.json.JacksonUtils; import com.red.circle.tool.core.num.NumUtils; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; + +import java.util.*; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -62,15 +59,15 @@ public class GiftsReceivedLeaderboardQryExe { } public ActivityLeaderboardCO executeApp(AppExtCommand cmd) { - List hours = getListRank(cmd, RankQueenType.CHARM_RANK_HOUR,3); - List days = getListRank(cmd, RankQueenType.CHARM_RANK_DAY,3); +// List hours = getListRank(cmd, RankQueenType.CHARM_RANK_HOUR,3); +// List days = getListRank(cmd, RankQueenType.CHARM_RANK_DAY,3); List weeks = getListRank(cmd, RankQueenType.CHARM_RANK_WEEK,3); - List months = getListRank(cmd, RankQueenType.CHARM_RANK_MONTH,3); +// List months = getListRank(cmd, RankQueenType.CHARM_RANK_MONTH,3); - Set userIds = getUserIds(days); - userIds.addAll(getUserIds(weeks)); - userIds.addAll(getUserIds(months)); - userIds.addAll(getUserIds(hours)); + Set userIds = getUserIds(weeks); +// userIds.addAll(getUserIds(days)); +// userIds.addAll(getUserIds(months)); +// userIds.addAll(getUserIds(hours)); if (CollectionUtils.isEmpty(userIds)) { return ActivityLeaderboardCO.empty(); } @@ -78,11 +75,12 @@ public class GiftsReceivedLeaderboardQryExe { userProfileGateway.mapByUserIds(userIds) ); + List emptyList = Collections.emptyList(); return new ActivityLeaderboardCO() - .setHourly(toLeaderboardUserCO(hours, userProfileMap)) - .setDaily(toLeaderboardUserCO(days, userProfileMap)) + .setHourly(toLeaderboardUserCO(emptyList, userProfileMap)) + .setDaily(toLeaderboardUserCO(emptyList, userProfileMap)) .setWeekly(toLeaderboardUserCO(weeks, userProfileMap)) - .setMonthly(toLeaderboardUserCO(months, userProfileMap)) + .setMonthly(toLeaderboardUserCO(emptyList, userProfileMap)) ; } diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/GiftsSendLeaderboardQryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/GiftsSendLeaderboardQryExe.java index 4d85a68f..c169770a 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/GiftsSendLeaderboardQryExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/GiftsSendLeaderboardQryExe.java @@ -59,11 +59,11 @@ public class GiftsSendLeaderboardQryExe { public ActivityLeaderboardCO executeApp(AppExtCommand cmd) { - List days = getListRank(cmd, RankQueenType.WEALTH_RANK_DAY,3); +// List days = getListRank(cmd, RankQueenType.WEALTH_RANK_DAY,3); List weeks = getListRank(cmd, RankQueenType.WEALTH_RANK_WEEK,3); - List months = getListRank(cmd, RankQueenType.WEALTH_RANK_MONTH,3); +// List months = getListRank(cmd, RankQueenType.WEALTH_RANK_MONTH,3); - Set userIds = getAllUserIds(days, weeks, months); + Set userIds = getAllUserIds(null, weeks, null); if (CollectionUtils.isEmpty(userIds)) { return ActivityLeaderboardCO.empty(); } @@ -72,9 +72,9 @@ public class GiftsSendLeaderboardQryExe { ); return new ActivityLeaderboardCO() - .setDaily(toLeaderboardUserCO(days, userProfileMap)) + .setDaily(toLeaderboardUserCO(null, userProfileMap)) .setWeekly(toLeaderboardUserCO(weeks, userProfileMap)) - .setMonthly(toLeaderboardUserCO(months, userProfileMap)); + .setMonthly(toLeaderboardUserCO(null, userProfileMap)); } private Set getAllUserIds(List days, List weeks, diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/RoomGiftsLeaderboardQryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/RoomGiftsLeaderboardQryExe.java index b13c9df0..9e2ab46f 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/RoomGiftsLeaderboardQryExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/RoomGiftsLeaderboardQryExe.java @@ -55,20 +55,20 @@ public class RoomGiftsLeaderboardQryExe { public ActivityLeaderboardCO executeApp(AppExtCommand cmd) { - List days = getListRank(cmd, RankQueenType.ROOM_RANK_DAY,3); +// List days = getListRank(cmd, RankQueenType.ROOM_RANK_DAY,3); List weeks = getListRank(cmd, RankQueenType.ROOM_RANK_WEEK,3); - List months = getListRank(cmd, RankQueenType.ROOM_RANK_MONTH,3); +// List months = getListRank(cmd, RankQueenType.ROOM_RANK_MONTH,3); - Set roomIds = getAllUserIds(days, weeks, months); + Set roomIds = getAllUserIds(null, weeks, null); if (CollectionUtils.isEmpty(roomIds)) { return ActivityLeaderboardCO.empty(); } Map roomProfileMap = roomProfileManagerService.mapProfileByRoomIds(roomIds); return new ActivityLeaderboardCO() - .setDaily(toLeaderboardUserCO(days, roomProfileMap)) + .setDaily(toLeaderboardUserCO(null, roomProfileMap)) .setWeekly(toLeaderboardUserCO(weeks, roomProfileMap)) - .setMonthly(toLeaderboardUserCO(months, roomProfileMap)); + .setMonthly(toLeaderboardUserCO(null, roomProfileMap)); } private Set getAllUserIds(List days, List weeks, diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/activity/ActivityLeaderboardServiceImpl.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/activity/ActivityLeaderboardServiceImpl.java index 1ea1bdc4..71b15dce 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/activity/ActivityLeaderboardServiceImpl.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/activity/ActivityLeaderboardServiceImpl.java @@ -182,7 +182,7 @@ public class ActivityLeaderboardServiceImpl implements ActivityLeaderboardServic co.setRoomGiftsLeaderboard(roomGiftsLeaderboardQryExe.executeApp(cmd)); co.setGiftsSendLeaderboard(giftsSendLeaderboardQryExe.executeApp(cmd)); co.setGiftsReceivedLeaderboard(giftsReceivedLeaderboardQryExe.executeApp(cmd)); - co.setRechargeLeaderboard(rechargeLeaderboardQryExe.executeApp(cmd)); +// co.setRechargeLeaderboard(rechargeLeaderboardQryExe.executeApp(cmd)); return co; }