|
@@ -273,14 +273,37 @@ public class UserTicketController extends BaseApiController {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- // 获取除该用户外,最近中奖的 20 条弹幕信息
|
|
|
+ // 获取除该用户外,最近中奖的 40 条弹幕信息
|
|
|
List<TicketHitPrizeBarrageVO> ticketHitPrizeBarrageVOList = userHitPrizeService.hitPrizeBarrage(userId);
|
|
|
|
|
|
+ // 获取除该用户外,近 6 个月,8 条高级中奖弹幕信息
|
|
|
+ List<TicketHitPrizeBarrageVO> expensiveHitPrizeBarrageList = userHitPrizeService.expensiveHitPrizeBarrage(userId);
|
|
|
+ int count = 0;
|
|
|
+ int index = 0;
|
|
|
+ if (CollectionUtils.isNotEmpty(expensiveHitPrizeBarrageList)) {
|
|
|
+ count = expensiveHitPrizeBarrageList.size();
|
|
|
+ // 去重
|
|
|
+ ticketHitPrizeBarrageVOList.removeAll(expensiveHitPrizeBarrageList);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
for (int i = 0; i < ticketHitPrizeBarrageVOList.size(); i++) {
|
|
|
// 类型为盲豆则拼接数量
|
|
|
if(TicketPrizeTypeEnum.COIN.getValue().equals(ticketHitPrizeBarrageVOList.get(i).getPrizeType())){
|
|
|
ticketHitPrizeBarrageVOList.get(i).setPrizeInfo(ticketHitPrizeBarrageVOList.get(i).getPrizeInfo() + ticketHitPrizeBarrageVOList.get(i).getValue() + "颗");
|
|
|
}
|
|
|
+
|
|
|
+ // 插入大奖弹幕
|
|
|
+ if (count != 0 && i % 5 == 0) {
|
|
|
+ if (index % 2 == 0) {
|
|
|
+ listOne.add(expensiveHitPrizeBarrageList.get(index));
|
|
|
+ }else {
|
|
|
+ listTwo.add(expensiveHitPrizeBarrageList.get(index));
|
|
|
+ }
|
|
|
+ count--;
|
|
|
+ index++;
|
|
|
+ }
|
|
|
+
|
|
|
if (i % 2 == 0) {
|
|
|
listOne.add(ticketHitPrizeBarrageVOList.get(i));
|
|
|
}else {
|