中奖用户随机

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/vo/IntegralActivityVo.java

@@ -64,7 +64,7 @@ public class IntegralActivityVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "奖品列表 积分、券")
     private List<IntegralActivityPrizeVo> prizeList1;
 
-    @ApiModelProperty(value = "奖品列表 实物、会员")
+    @ApiModelProperty(value = "奖品列表 实物、会员、优先购买券")
     private List<IntegralActivityPrizeVo> prizeList2;
 
     private static final IntegralActivityVo obj = new IntegralActivityVo();

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetIntegralActivityServiceImpl.java

@@ -17,10 +17,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
 
 /**
  * <p>
@@ -109,11 +106,20 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
         );
         ArrayList<String> asListArr = new ArrayList(asList);
 
+        IntegralActivityVo integralActivityInfo = redisDataUtils.getIntegralActivityInfo(integralActivityId);
+        List<IntegralActivityPrizeVo> prizeList2 = integralActivityInfo.getPrizeList2();
+
         Random random = new Random();
         for (int i = 0; i < 5; i++) {
-            asListArr.get(random.nextInt(asListArr.size()));
+            String name = asListArr.get(random.nextInt(asListArr.size()));
+            IntegralActivityPrizeVo activityPrizeVo = prizeList2.get(random.nextInt(prizeList2.size()));
             SweetIntegralActivityDraw activityDraw = SweetIntegralActivityDraw.getNew();
+            activityDraw.setNickname(name);
+            activityDraw.setPrizeTitle(activityPrizeVo.getPrizeTitle());
+            sweetIntegralActivityDraws.add(activityDraw);
         }
+
+        Collections.shuffle(sweetIntegralActivityDraws);
         redisDataUtils.setIntegralActivityDrawAll(integralActivityId, sweetIntegralActivityDraws);
 
         return ResponseDto.success();