hy/aslan-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

抽奖 活动列表去重

Browse Source
This commit is contained in:
tianfeng 2025-10-20 19:50:10 +08:00
parent 5b43823751
commit a7dc52bb90
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/LotteryActivityDetailQryExe.java
View File

@ -16,7 +16,7 @@ import com.red.circle.other.infra.database.rds.service.activity.LotteryUserCount
import com.red.circle.other.inner.asserts.lottery.LotteryErrorCode; import com.red.circle.other.inner.asserts.lottery.LotteryErrorCode;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -52,6 +52,22 @@ public class LotteryActivityDetailQryExe {
.orderByAsc(LotteryPrize::getSortOrder) .orderByAsc(LotteryPrize::getSortOrder)
.list(); .list();
// 去重：按照 prize_name 去重，优先保留 EARLY 池的奖品（用户首次看到的）
Map<String, LotteryPrize> uniquePrizes = new LinkedHashMap<>();
for (LotteryPrize prize : prizes) {
String prizeName = prize.getPrizeName();
if (!uniquePrizes.containsKey(prizeName)) {
// 如果这个奖品名称还没有，就添加
uniquePrizes.put(prizeName, prize);
} else {
// 如果已存在，优先保留 EARLY 池的
LotteryPrize existingPrize = uniquePrizes.get(prizeName);
if ("EARLY".equals(prize.getPrizePool()) && !"EARLY".equals(existingPrize.getPrizePool())) {
uniquePrizes.put(prizeName, prize);
}
}
}
// 查询用户抽奖券数量 // 查询用户抽奖券数量
int ticketCount = 0; int ticketCount = 0;
if (activity.getNeedTicket() == 1) { if (activity.getNeedTicket() == 1) {
@ -81,7 +97,7 @@ public class LotteryActivityDetailQryExe {
// 组装返回数据 // 组装返回数据
LotteryActivityDetailCO detail = new LotteryActivityDetailCO(); LotteryActivityDetailCO detail = new LotteryActivityDetailCO();
detail.setActivity(convertActivityToCO(activity, usedCount)); detail.setActivity(convertActivityToCO(activity, usedCount));
detail.setPrizeList(prizes.stream() detail.setPrizeList(uniquePrizes.values().stream()
.map(this::convertPrizeToCO) .map(this::convertPrizeToCO)
.collect(Collectors.toList())); .collect(Collectors.toList()));
detail.setUserTicketCount(ticketCount); detail.setUserTicketCount(ticketCount);