抽奖列表

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

@@ -428,6 +428,7 @@ public class RedisDataUtils {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_ANSWER_PHONE.concat(sweetAnswerVo.getPhone());
         redisUtil.set(redisKey, sweetAnswerVo);
     }
+
     public SweetAnswerVo getSweetAnswer(String phone) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_ANSWER_PHONE.concat(phone);
         SweetAnswerVo sweetAnswerVo = (SweetAnswerVo) redisUtil.get(redisKey);
@@ -440,6 +441,7 @@ public class RedisDataUtils {
                 .concat(SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_STAT_LIST);
         redisUtil.set(redisKey, sweetCItyVoteStatVo);
     }
+
     public List<SweetCItyVoteStatVo> getSweetCityVoteStatList(Integer type) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_CITY_VOTE.concat(String.valueOf(type))
                 .concat(SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_STAT_LIST);
@@ -450,11 +452,13 @@ public class RedisDataUtils {
         }
         return sweetCityVoteStatList;
     }
+
     public void incrSweetCityVote(String cityCode, Integer type) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_CITY_VOTE.concat(String.valueOf(type))
                 .concat(SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_CITY_CODE).concat(cityCode);
         redisUtil.incr(redisKey, 1);
     }
+
     public Integer getSweetCityVote(String cityCode, Integer type) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_CITY_VOTE.concat(String.valueOf(type))
                 .concat(SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_CITY_CODE).concat(cityCode);
@@ -465,11 +469,13 @@ public class RedisDataUtils {
             return (Integer) obj;
         }
     }
+
     public void setUserVote(String phone, String openId, SweetCityVoteParam param) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_CITY_VOTE.concat(String.valueOf(param.getType()))
                 .concat(SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_USER).concat(phone).concat("-").concat(openId);
         redisUtil.set(redisKey, param);
     }
+
     public SweetCityVoteParam getUserVote(String phone, String openId, Integer type) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_CITY_VOTE.concat(String.valueOf(type))
                 .concat(SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_USER).concat(phone).concat("-").concat(openId);
@@ -480,11 +486,13 @@ public class RedisDataUtils {
             return (SweetCityVoteParam) obj;
         }
     }
+
     public void setSweetCityVoteStatUpdateTime(Integer type) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_CITY_VOTE.concat(String.valueOf(type))
                 .concat(SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_STAT_UPDATE_TIME);
         redisUtil.set(redisKey, DateUtil.getNowTime());
     }
+
     public String getSweetCityVoteStatUpdateTime(Integer type) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_CITY_VOTE.concat(String.valueOf(type))
                 .concat(SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_STAT_UPDATE_TIME);
@@ -509,14 +517,17 @@ public class RedisDataUtils {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_UNIONID_PHONE.concat(phone);
         redisUtil.set(redisKey, unionId);
     }
+
     public void setUnionIdByUserId(String userId, String unionId) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_UNIONID_UID.concat(userId);
         redisUtil.set(redisKey, unionId);
     }
+
     public void setUnionIdByPhoneSky(String phone, String unionId) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_UNIONID_PHONE_MODERNSKY.concat(phone);
         redisUtil.set(redisKey, unionId);
     }
+
     public void setUnionIdByUserIdSky(String userId, String unionId) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_UNIONID_UID_MODERNSKY.concat(userId);
         redisUtil.set(redisKey, unionId);
@@ -568,22 +579,22 @@ public class RedisDataUtils {
 
     public void setIntegralActivityDraw(IntegralActivityDrawVo integralActivityDrawVo) {
         Integer prizeType = integralActivityDrawVo.getPrizeType();
-        String redisKey = "";
         String userId = integralActivityDrawVo.getUserId();
         String integralActivityId = integralActivityDrawVo.getIntegralActivityId();
-        LinkedList<IntegralActivityDrawVo> activityDrawArrayList = SweetNewObjectUtil.getSweetIntegralActivityDrawVoLinkedList();
-        if (prizeType == 1) {// 谢谢惠顾 写入抽奖列表
-            redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_USER
+        if (prizeType > 1) {// 写入中奖列表
+            String redisKeyIn = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_IN_USER
                     .concat(integralActivityId)
                     .concat(":userId:")
                     .concat(userId);
-            activityDrawArrayList = this.getIntegralActivityDrawList(2, userId, integralActivityId, 1);
-        } else {// 中奖列表
-            redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_IN_USER
-                    .concat(integralActivityId)
-                    .concat(":userId:")
-                    .concat(userId);
-            activityDrawArrayList = this.getIntegralActivityDrawList(1, userId, integralActivityId, 1);
+            LinkedList<IntegralActivityDrawVo> activityDrawArrayListIn = this.getIntegralActivityDrawList(1, userId, integralActivityId, 1);
+            // 先获取set到20条
+            if (!CollectionUtil.isEmpty(activityDrawArrayListIn)) {
+                if (activityDrawArrayListIn.size() >= 20) {
+                    activityDrawArrayListIn.remove(0);
+                }
+            }
+            activityDrawArrayListIn.addFirst(integralActivityDrawVo);
+            redisUtil.set(redisKeyIn, activityDrawArrayListIn);
 
             // all用户中奖列表
             String redisKeyAll = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_ALL_LIST
@@ -597,6 +608,12 @@ public class RedisDataUtils {
             integralActivityDrawAll.addFirst(integralActivityDrawVo);
             redisUtil.set(redisKeyAll, integralActivityDrawAll);
         }
+        // 写入抽奖列表
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_USER
+                .concat(integralActivityId)
+                .concat(":userId:")
+                .concat(userId);
+        LinkedList<IntegralActivityDrawVo> activityDrawArrayList = this.getIntegralActivityDrawList(2, userId, integralActivityId, 1);
         // 先获取set到20条
         if (!CollectionUtil.isEmpty(activityDrawArrayList)) {
             if (activityDrawArrayList.size() >= 20) {
@@ -605,7 +622,7 @@ public class RedisDataUtils {
         }
         activityDrawArrayList.addFirst(integralActivityDrawVo);
         redisUtil.set(redisKey, activityDrawArrayList);
-
+        // 抽奖详情
         String redisKeyDraw = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_INFO
                 .concat(integralActivityDrawVo.getDrawId());
         redisUtil.set(redisKeyDraw, integralActivityDrawVo);
@@ -699,6 +716,7 @@ public class RedisDataUtils {
             return (IntegralActivityDrawVo) obj;
         }
     }
+
     public void setIntegralActivityDrawInfo(String drawId, IntegralActivityDrawVo drawVo) {
         String redisKeyDraw = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_INFO
                 .concat(drawId);