drawList pageSize 10

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

@@ -184,6 +184,7 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
 
     @Override
     public ResponseDto<PagedResult<IntegralActivityDrawVo>> drawList(Integer type, String integralActivityId, Integer pageNum) {
+        Integer pageSize = 10;
         String currentUid = CurrentUtil.getCurrentUid();
         PagedResult<IntegralActivityDrawVo> sweetIntegralActivityDrawPagedResult = SweetNewObjectUtil.getSweetIntegralActivityDrawVoPagedResult();
         long count = 0;
@@ -197,17 +198,17 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
             query.addCriteria(Criteria.where("prizeType").is(1));
         }
         if (pageNum <= 1) {
-            List<IntegralActivityDrawVo> integralActivityDrawAll = redisDataUtils.getIntegralActivityDrawList(type, currentUid, integralActivityId);
+            LinkedList<IntegralActivityDrawVo> integralActivityDrawList = redisDataUtils.getIntegralActivityDrawList(type, currentUid, integralActivityId);
             count = mongoTemplate.count(query, IntegralActivityDrawVo.class, IntegralActivityDrawVo.class.getSimpleName());
-            sweetIntegralActivityDrawPagedResult.setList(integralActivityDrawAll).setTotal(count, 20).setPageSize(20).setCurrentPage(pageNum);
+            sweetIntegralActivityDrawPagedResult.setList(integralActivityDrawList).setTotal(count, pageSize).setPageSize(pageSize).setCurrentPage(pageNum);
         } else {// page大于1 去mongo里面取
             HashMap<String, Object> info = CollectionUtil.mapStringObject();
             // 排序 分页
-            Pageable pageable = PageRequest.of(pageNum - 1, 20, Sort.by(Sort.Direction.DESC, "createdAt"));
+            Pageable pageable = PageRequest.of(pageNum - 1, pageSize, Sort.by(Sort.Direction.DESC, "createdAt"));
             count = mongoTemplate.count(query, IntegralActivityDrawVo.class, IntegralActivityDrawVo.class.getSimpleName());
             query.with(pageable);
             List<IntegralActivityDrawVo> integralActivityDrawVos = mongoTemplate.find(query, IntegralActivityDrawVo.class, IntegralActivityDrawVo.class.getSimpleName());
-            sweetIntegralActivityDrawPagedResult.setList(integralActivityDrawVos).setTotal(count, 20).setPageSize(20).setCurrentPage(pageNum);
+            sweetIntegralActivityDrawPagedResult.setList(integralActivityDrawVos).setTotal(count, pageSize).setPageSize(pageSize).setCurrentPage(pageNum);
         }
         return ResponseDto.success(sweetIntegralActivityDrawPagedResult);
     }

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

@@ -578,18 +578,20 @@ public class RedisDataUtils {
     }
 
     public void setIntegralActivityDraw(IntegralActivityDrawVo integralActivityDrawVo) {
+        int redisListSizeUser = 10;
+        int redisListSizeAll = 20;
         Integer prizeType = integralActivityDrawVo.getPrizeType();
         String userId = integralActivityDrawVo.getUserId();
         String integralActivityId = integralActivityDrawVo.getIntegralActivityId();
-        if (prizeType > 1) {// 写入中奖列表
+        if (prizeType > 1) {// 写入中奖列表 1是谢谢惠顾
             String redisKeyIn = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_IN_USER
                     .concat(integralActivityId)
                     .concat(":userId:")
                     .concat(userId);
             LinkedList<IntegralActivityDrawVo> activityDrawArrayListIn = this.getIntegralActivityDrawList(1, userId, integralActivityId);
-            // 先获取set到20条
+            // 先获取set到redisListSize条
             if (!CollectionUtil.isEmpty(activityDrawArrayListIn)) {
-                if (activityDrawArrayListIn.size() >= 20) {
+                if (activityDrawArrayListIn.size() >= redisListSizeUser) {
                     activityDrawArrayListIn.remove(0);
                 }
             }
@@ -601,22 +603,22 @@ public class RedisDataUtils {
                     .concat(integralActivityId);
             LinkedList<IntegralActivityDrawVo> integralActivityDrawAll = this.getIntegralActivityDrawAll(integralActivityId);
             if (!CollectionUtil.isEmpty(integralActivityDrawAll)) {
-                if (integralActivityDrawAll.size() >= 20) {
+                if (integralActivityDrawAll.size() >= redisListSizeAll) {
                     integralActivityDrawAll.remove(0);
                 }
             }
             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);
-        // 先获取set到20条
+        // 先获取set到redisListSizeUser条
         if (!CollectionUtil.isEmpty(activityDrawArrayList)) {
-            if (activityDrawArrayList.size() >= 20) {
+            if (activityDrawArrayList.size() >= redisListSizeUser) {
                 activityDrawArrayList.remove(0);
             }
         }