弹幕优化

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserTicketController.java

@@ -398,7 +398,6 @@ public class UserTicketController extends BaseApiController {
 
     // 弹幕列表
     List<TicketHitPrizeBarrageVO> listOne = new ArrayList<>();
-    List<TicketHitPrizeBarrageVO> listTwo = new ArrayList<>();
 
     // 获取除当前用户外最近10条盲豆大于1000的商品兑换数据
     QueryWrapper<TicketHitPrizeBarrageVO> queryWrapper = new QueryWrapper<>();
@@ -441,11 +440,9 @@ public class UserTicketController extends BaseApiController {
           // 设置类型为中奖
           ticketHitPrizeBarrageVOList.get(i).setType(1);
 
-          if (i % 2 == 0) {
-            listOne.add(ticketHitPrizeBarrageVOList.get(i));
-          }else {
-            listTwo.add(ticketHitPrizeBarrageVOList.get(i));
-          }
+
+          listOne.add(ticketHitPrizeBarrageVOList.get(i));
+
         }
       }
     }
@@ -484,24 +481,18 @@ public class UserTicketController extends BaseApiController {
       if (count != 0 && i % 5 == 0) {
         // 设置类型为中奖
         expensiveHitPrizeBarrageList.get(index).setType(1);
-        if (index % 2 == 0) {
-          listOne.add(expensiveHitPrizeBarrageList.get(index));
-        }else {
-          listTwo.add(expensiveHitPrizeBarrageList.get(index));
-        }
+        listOne.add(expensiveHitPrizeBarrageList.get(index));
+
         count--;
         index++;
       }
 
-      if (i % 2 == 0) {
-        listOne.add(ticketHitPrizeBarrageVOList.get(i));
-      }else {
-        listTwo.add(ticketHitPrizeBarrageVOList.get(i));
-      }
+
+      listOne.add(ticketHitPrizeBarrageVOList.get(i));
+
     }
     Map<String,List<TicketHitPrizeBarrageVO>> ticketHitPrizeBarrageMap = new HashMap<>();
     ticketHitPrizeBarrageMap.put("listOne",listOne);
-    ticketHitPrizeBarrageMap.put("listTwo",listTwo);
 
     return AjaxResult.success(ticketHitPrizeBarrageMap);
   }