Merge remote-tracking branch 'origin/dev_stone' into dev_stone

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/service/ISweetIntegralActivityDrawService.java

 package com.liquidnet.service.sweet.service;
 
+import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.sweet.dto.vo.admin.SweetIntegralActivityPrizeVo;
 import com.liquidnet.service.sweet.entity.SweetIntegralActivityDraw;
@@ -19,7 +20,7 @@ public interface ISweetIntegralActivityDrawService extends IService<SweetIntegra
 
     ResponseDto<SweetIntegralActivityPrizeVo> create(String integralActivityId);
 
-    ResponseDto<List<SweetIntegralActivityDraw>> winPrize(Integer type);
+    ResponseDto<PagedResult<SweetIntegralActivityDraw>> drawList(Integer type, String integralActivityId, Integer pageNum);
 
     ResponseDto<List<SweetIntegralActivityDraw>> winPrizeUser(String integralActivityId);
 

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

 package com.liquidnet.service.sweet.utils;
 
+import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.sweet.dto.vo.admin.SweetIntegralActivityPrizeVo;
+import com.liquidnet.service.sweet.entity.SweetIntegralActivityDraw;
 
 import java.util.ArrayList;
 
 public class SweetNewObjectUtil {
     private static final ArrayList<SweetIntegralActivityPrizeVo> sweetIntegralActivityPrizeVoArrayList = new ArrayList<>();
-
+    private static final ArrayList<SweetIntegralActivityDraw> sweetIntegralActivityDrawArrayList = new ArrayList<>();
+    private static final PagedResult<SweetIntegralActivityDraw> sweetIntegralActivityDrawPagedResult = new PagedResult<>();
 
     public static ArrayList<SweetIntegralActivityPrizeVo> getSweetIntegralActivityPrizeVoArrayList() {
         return (ArrayList<SweetIntegralActivityPrizeVo>) sweetIntegralActivityPrizeVoArrayList.clone();
     }
 
+    public static ArrayList<SweetIntegralActivityDraw> getSweetIntegralActivityDrawArrayList() {
+        return (ArrayList<SweetIntegralActivityDraw>) sweetIntegralActivityDrawArrayList.clone();
+    }
+
+    public static PagedResult<SweetIntegralActivityDraw> getSweetIntegralActivityDrawPagedResult() {
+        return (PagedResult<SweetIntegralActivityDraw>) sweetIntegralActivityDrawPagedResult.clone();
+    }
+
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/utils/SweetRedisAdminUtils.java

@@ -19,11 +19,11 @@ public class SweetRedisAdminUtils {
 
     public void setIntegralActivityList(List<IntegralActivityVo> voList) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_LIST;
-        boolean set = redisUtil.set(redisKey, voList, 15);
+        boolean set = redisUtil.set(redisKey, voList);
     }
     public void setIntegralActivityInfo(IntegralActivityVo integralActivityVo) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_INFO.concat(integralActivityVo.getIntegralActivityId());
-        boolean set = redisUtil.set(redisKey, integralActivityVo, 15);
+        boolean set = redisUtil.set(redisKey, integralActivityVo);
     }
 
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetIntegralActivityDrawController.java

 package com.liquidnet.service.sweet.controller;
 
 
+import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.sweet.dto.vo.admin.SweetIntegralActivityPrizeVo;
 import com.liquidnet.service.sweet.entity.SweetIntegralActivityDraw;
@@ -40,15 +41,19 @@ public class SweetIntegralActivityDrawController {
         return activityDrawService.create(integralActivityId);
     }
 
-    @GetMapping("winPrize")
+    @GetMapping("drawList")
     @ApiOperation("用户(中奖、抽奖)记录列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(type = "query", dataType = "Integer", name = "type", value = "1中奖记录 2抽奖记录", required = true)
+            @ApiImplicitParam(type = "query", dataType = "Integer", name = "type", value = "1中奖记录 2抽奖记录", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "integralActivityId", value = "活动id", required = true),
+            @ApiImplicitParam(type = "query", dataType = "Integer", name = "pageNum", value = "分页", required = true)
     })
-    public ResponseDto<List<SweetIntegralActivityDraw>> winPrize(
-            @RequestParam("type") Integer type
-    ) {
-        return activityDrawService.winPrize(type);
+    public ResponseDto<PagedResult<SweetIntegralActivityDraw>> drawList(
+            @RequestParam("type") Integer type,
+            @RequestParam("integralActivityId") String integralActivityId,
+            @RequestParam("pageNum") Integer pageNum
+            ) {
+        return activityDrawService.drawList(type, integralActivityId, pageNum);
     }
 
     @GetMapping("winPrizeUser")

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

@@ -2,6 +2,7 @@ package com.liquidnet.service.sweet.service.impl;
 
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityVo;
 import com.liquidnet.service.sweet.dto.vo.admin.SweetIntegralActivityPrizeVo;
@@ -11,6 +12,7 @@ import com.liquidnet.service.sweet.mapper.SweetIntegralActivityDrawMapper;
 import com.liquidnet.service.sweet.service.ISweetIntegralActivityDrawService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.service.sweet.utils.RedisDataUtils;
+import com.liquidnet.service.sweet.utils.SweetNewObjectUtil;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,13 +71,18 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
     }
 
     @Override
-    public ResponseDto<List<SweetIntegralActivityDraw>> winPrize(Integer type) {
-        return null;
+    public ResponseDto<PagedResult<SweetIntegralActivityDraw>> drawList(Integer type, String integralActivityId, Integer pageNum) {
+        String currentUid = CurrentUtil.getCurrentUid();
+        List<SweetIntegralActivityDraw> integralActivityDrawAll = redisDataUtils.getIntegralActivityDrawList(type, currentUid, integralActivityId, pageNum);
+        PagedResult<SweetIntegralActivityDraw> sweetIntegralActivityDrawPagedResult = SweetNewObjectUtil.getSweetIntegralActivityDrawPagedResult();
+        sweetIntegralActivityDrawPagedResult.setList(integralActivityDrawAll).setTotal(100, 20).setPageSize(20).setCurrentPage(pageNum);
+        return ResponseDto.success(sweetIntegralActivityDrawPagedResult);
     }
 
     @Override
     public ResponseDto<List<SweetIntegralActivityDraw>> winPrizeUser(String integralActivityId) {
-        return null;
+        List<SweetIntegralActivityDraw> integralActivityDrawAll = redisDataUtils.getIntegralActivityDrawAll(integralActivityId);
+        return ResponseDto.success(integralActivityDrawAll);
     }
 
     @Override

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

@@ -633,8 +633,45 @@ public class RedisDataUtils {
                 .concat(":userId:")
                 .concat(sweetIntegralActivityDraw.getUserId());
         // TODO: 2021/10/26 先获取set到10条
-        redisUtil.set(redisKey, sweetIntegralActivityDraw);
-        redisUtil.set(redisKey1, sweetIntegralActivityDraw);
-        redisUtil.set(redisKey2, sweetIntegralActivityDraw);
+        // TODO: 2021/10/27 判断是否中奖 再看写入中奖还是抽奖
+        ArrayList<SweetIntegralActivityDraw> sweetIntegralActivityDrawArrayList = SweetNewObjectUtil.getSweetIntegralActivityDrawArrayList();
+        sweetIntegralActivityDrawArrayList.add(sweetIntegralActivityDraw);
+        redisUtil.set(redisKey, sweetIntegralActivityDrawArrayList);
+        redisUtil.set(redisKey1, sweetIntegralActivityDrawArrayList);
+        redisUtil.set(redisKey2, sweetIntegralActivityDrawArrayList);
     }
+
+    public List<SweetIntegralActivityDraw> getIntegralActivityDrawAll(String integralActivityId) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_ALL_LIST
+                .concat(integralActivityId);
+        Object obj = redisUtil.get(redisKey);
+        if (null == obj) {
+            return null;
+        } else {
+            return (List<SweetIntegralActivityDraw>) obj;
+        }
+    }
+
+    public List<SweetIntegralActivityDraw> getIntegralActivityDrawList(Integer type, String uid, String integralActivityId, Integer pageNum) {
+        String redisKey = "";
+        if (type == 1) {
+            redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_IN_USER
+                    .concat(integralActivityId)
+                    .concat(":userId:")
+                    .concat(uid);
+        } else {
+            redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_USER
+                    .concat(integralActivityId)
+                    .concat(":userId:")
+                    .concat(uid);
+        }
+        Object obj = redisUtil.get(redisKey);
+        if (null == obj) {
+            return null;
+        } else {
+            return (List<SweetIntegralActivityDraw>) obj;
+        }
+        // TODO: 2021/10/27 page大于1 去mongo里面取
+    }
+
 }