财富魅力房间排行榜修改

This commit is contained in:
tianfeng 2025-10-14 18:42:41 +08:00
parent 7907ab9024
commit d93aa00fbe
4 changed files with 24 additions and 26 deletions

View File

@ -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.collection.CollectionUtils;
import com.red.circle.tool.core.json.JacksonUtils; import com.red.circle.tool.core.json.JacksonUtils;
import com.red.circle.tool.core.num.NumUtils; import com.red.circle.tool.core.num.NumUtils;
import java.util.List;
import java.util.Map; import java.util.*;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -62,15 +59,15 @@ public class GiftsReceivedLeaderboardQryExe {
} }
public ActivityLeaderboardCO executeApp(AppExtCommand cmd) { public ActivityLeaderboardCO executeApp(AppExtCommand cmd) {
List<RankQueenCount> hours = getListRank(cmd, RankQueenType.CHARM_RANK_HOUR,3); // List<RankQueenCount> hours = getListRank(cmd, RankQueenType.CHARM_RANK_HOUR,3);
List<RankQueenCount> days = getListRank(cmd, RankQueenType.CHARM_RANK_DAY,3); // List<RankQueenCount> days = getListRank(cmd, RankQueenType.CHARM_RANK_DAY,3);
List<RankQueenCount> weeks = getListRank(cmd, RankQueenType.CHARM_RANK_WEEK,3); List<RankQueenCount> weeks = getListRank(cmd, RankQueenType.CHARM_RANK_WEEK,3);
List<RankQueenCount> months = getListRank(cmd, RankQueenType.CHARM_RANK_MONTH,3); // List<RankQueenCount> months = getListRank(cmd, RankQueenType.CHARM_RANK_MONTH,3);
Set<Long> userIds = getUserIds(days); Set<Long> userIds = getUserIds(weeks);
userIds.addAll(getUserIds(weeks)); // userIds.addAll(getUserIds(days));
userIds.addAll(getUserIds(months)); // userIds.addAll(getUserIds(months));
userIds.addAll(getUserIds(hours)); // userIds.addAll(getUserIds(hours));
if (CollectionUtils.isEmpty(userIds)) { if (CollectionUtils.isEmpty(userIds)) {
return ActivityLeaderboardCO.empty(); return ActivityLeaderboardCO.empty();
} }
@ -78,11 +75,12 @@ public class GiftsReceivedLeaderboardQryExe {
userProfileGateway.mapByUserIds(userIds) userProfileGateway.mapByUserIds(userIds)
); );
List<RankQueenCount> emptyList = Collections.emptyList();
return new ActivityLeaderboardCO() return new ActivityLeaderboardCO()
.setHourly(toLeaderboardUserCO(hours, userProfileMap)) .setHourly(toLeaderboardUserCO(emptyList, userProfileMap))
.setDaily(toLeaderboardUserCO(days, userProfileMap)) .setDaily(toLeaderboardUserCO(emptyList, userProfileMap))
.setWeekly(toLeaderboardUserCO(weeks, userProfileMap)) .setWeekly(toLeaderboardUserCO(weeks, userProfileMap))
.setMonthly(toLeaderboardUserCO(months, userProfileMap)) .setMonthly(toLeaderboardUserCO(emptyList, userProfileMap))
; ;
} }

View File

@ -59,11 +59,11 @@ public class GiftsSendLeaderboardQryExe {
public ActivityLeaderboardCO executeApp(AppExtCommand cmd) { public ActivityLeaderboardCO executeApp(AppExtCommand cmd) {
List<RankQueenCount> days = getListRank(cmd, RankQueenType.WEALTH_RANK_DAY,3); // List<RankQueenCount> days = getListRank(cmd, RankQueenType.WEALTH_RANK_DAY,3);
List<RankQueenCount> weeks = getListRank(cmd, RankQueenType.WEALTH_RANK_WEEK,3); List<RankQueenCount> weeks = getListRank(cmd, RankQueenType.WEALTH_RANK_WEEK,3);
List<RankQueenCount> months = getListRank(cmd, RankQueenType.WEALTH_RANK_MONTH,3); // List<RankQueenCount> months = getListRank(cmd, RankQueenType.WEALTH_RANK_MONTH,3);
Set<Long> userIds = getAllUserIds(days, weeks, months); Set<Long> userIds = getAllUserIds(null, weeks, null);
if (CollectionUtils.isEmpty(userIds)) { if (CollectionUtils.isEmpty(userIds)) {
return ActivityLeaderboardCO.empty(); return ActivityLeaderboardCO.empty();
} }
@ -72,9 +72,9 @@ public class GiftsSendLeaderboardQryExe {
); );
return new ActivityLeaderboardCO() return new ActivityLeaderboardCO()
.setDaily(toLeaderboardUserCO(days, userProfileMap)) .setDaily(toLeaderboardUserCO(null, userProfileMap))
.setWeekly(toLeaderboardUserCO(weeks, userProfileMap)) .setWeekly(toLeaderboardUserCO(weeks, userProfileMap))
.setMonthly(toLeaderboardUserCO(months, userProfileMap)); .setMonthly(toLeaderboardUserCO(null, userProfileMap));
} }
private Set<Long> getAllUserIds(List<RankQueenCount> days, List<RankQueenCount> weeks, private Set<Long> getAllUserIds(List<RankQueenCount> days, List<RankQueenCount> weeks,

View File

@ -55,20 +55,20 @@ public class RoomGiftsLeaderboardQryExe {
public ActivityLeaderboardCO executeApp(AppExtCommand cmd) { public ActivityLeaderboardCO executeApp(AppExtCommand cmd) {
List<RankQueenCount> days = getListRank(cmd, RankQueenType.ROOM_RANK_DAY,3); // List<RankQueenCount> days = getListRank(cmd, RankQueenType.ROOM_RANK_DAY,3);
List<RankQueenCount> weeks = getListRank(cmd, RankQueenType.ROOM_RANK_WEEK,3); List<RankQueenCount> weeks = getListRank(cmd, RankQueenType.ROOM_RANK_WEEK,3);
List<RankQueenCount> months = getListRank(cmd, RankQueenType.ROOM_RANK_MONTH,3); // List<RankQueenCount> months = getListRank(cmd, RankQueenType.ROOM_RANK_MONTH,3);
Set<Long> roomIds = getAllUserIds(days, weeks, months); Set<Long> roomIds = getAllUserIds(null, weeks, null);
if (CollectionUtils.isEmpty(roomIds)) { if (CollectionUtils.isEmpty(roomIds)) {
return ActivityLeaderboardCO.empty(); return ActivityLeaderboardCO.empty();
} }
Map<Long, RoomProfile> roomProfileMap = roomProfileManagerService.mapProfileByRoomIds(roomIds); Map<Long, RoomProfile> roomProfileMap = roomProfileManagerService.mapProfileByRoomIds(roomIds);
return new ActivityLeaderboardCO() return new ActivityLeaderboardCO()
.setDaily(toLeaderboardUserCO(days, roomProfileMap)) .setDaily(toLeaderboardUserCO(null, roomProfileMap))
.setWeekly(toLeaderboardUserCO(weeks, roomProfileMap)) .setWeekly(toLeaderboardUserCO(weeks, roomProfileMap))
.setMonthly(toLeaderboardUserCO(months, roomProfileMap)); .setMonthly(toLeaderboardUserCO(null, roomProfileMap));
} }
private Set<Long> getAllUserIds(List<RankQueenCount> days, List<RankQueenCount> weeks, private Set<Long> getAllUserIds(List<RankQueenCount> days, List<RankQueenCount> weeks,

View File

@ -182,7 +182,7 @@ public class ActivityLeaderboardServiceImpl implements ActivityLeaderboardServic
co.setRoomGiftsLeaderboard(roomGiftsLeaderboardQryExe.executeApp(cmd)); co.setRoomGiftsLeaderboard(roomGiftsLeaderboardQryExe.executeApp(cmd));
co.setGiftsSendLeaderboard(giftsSendLeaderboardQryExe.executeApp(cmd)); co.setGiftsSendLeaderboard(giftsSendLeaderboardQryExe.executeApp(cmd));
co.setGiftsReceivedLeaderboard(giftsReceivedLeaderboardQryExe.executeApp(cmd)); co.setGiftsReceivedLeaderboard(giftsReceivedLeaderboardQryExe.executeApp(cmd));
co.setRechargeLeaderboard(rechargeLeaderboardQryExe.executeApp(cmd)); // co.setRechargeLeaderboard(rechargeLeaderboardQryExe.executeApp(cmd));
return co; return co;
} }