用户中奖列表增加地址信息

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

@@ -188,7 +188,7 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
         PagedResult<IntegralActivityDrawVo> sweetIntegralActivityDrawPagedResult = SweetNewObjectUtil.getSweetIntegralActivityDrawVoPagedResult();
         long count = 0;
         if (pageNum <= 1) {
-            List<IntegralActivityDrawVo> integralActivityDrawAll = redisDataUtils.getIntegralActivityDrawList(type, currentUid, integralActivityId, pageNum);
+            List<IntegralActivityDrawVo> integralActivityDrawAll = redisDataUtils.getIntegralActivityDrawList(type, currentUid, integralActivityId);
             count = integralActivityDrawAll.size();
             sweetIntegralActivityDrawPagedResult.setList(integralActivityDrawAll).setTotal(count, 20).setPageSize(20).setCurrentPage(pageNum);
         } else {// page大于1 去mongo里面取
@@ -224,7 +224,7 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
         IntegralActivityDrawVo drawVo = redisDataUtils.getIntegralActivityDrawInfo(drawId);
         drawVo.setReceivingAddressesId(receivingAddressesId);
         // 获取地址数据
-        ResponseDto<AdamAddressesVo> queryAddresses = feignAdamBaseClient.queryAddresses(receivingAddressesId, CurrentUtil.getCurrentUid());
+        ResponseDto<AdamAddressesVo> queryAddresses = feignAdamBaseClient.queryAddresses(receivingAddressesId, drawVo.getUserId());
         if (!queryAddresses.getCode().equals("0")) {
             return ResponseDto.failure("获取地址信息失败");
         }
@@ -258,6 +258,20 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
                         .append("updatedAt", DateUtil.Formatter.yyyyMMddHHmmss.format(nowTime)))
         );
 
+        LinkedList<IntegralActivityDrawVo> integralActivityDrawList = redisDataUtils.getIntegralActivityDrawList(1, drawVo.getUserId(), drawVo.getIntegralActivityId());
+        for (IntegralActivityDrawVo info : integralActivityDrawList) {
+            if (info.getDrawId().equals(drawId)) {
+                info.setReceivingName(receivingName);
+                info.setReceivingPhone(receivingPhone);
+                info.setReceivingProvince(receivingProvince);
+                info.setReceivingCity(receivingCity);
+                info.setReceivingCounty(receivingCounty);
+                info.setReceivingAddress(receivingAddress);
+                info.setUpdatedAt(nowTime);
+            }
+        }
+        redisDataUtils.setIntegralActivityDrawList(drawVo.getUserId(), drawVo.getIntegralActivityId(), integralActivityDrawList);
+
         // mysql
         LinkedList<String> sqls = CollectionUtil.linkedListString();
         LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();

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

@@ -586,7 +586,7 @@ public class RedisDataUtils {
                     .concat(integralActivityId)
                     .concat(":userId:")
                     .concat(userId);
-            LinkedList<IntegralActivityDrawVo> activityDrawArrayListIn = this.getIntegralActivityDrawList(1, userId, integralActivityId, 1);
+            LinkedList<IntegralActivityDrawVo> activityDrawArrayListIn = this.getIntegralActivityDrawList(1, userId, integralActivityId);
             // 先获取set到20条
             if (!CollectionUtil.isEmpty(activityDrawArrayListIn)) {
                 if (activityDrawArrayListIn.size() >= 20) {
@@ -613,7 +613,7 @@ public class RedisDataUtils {
                 .concat(integralActivityId)
                 .concat(":userId:")
                 .concat(userId);
-        LinkedList<IntegralActivityDrawVo> activityDrawArrayList = this.getIntegralActivityDrawList(2, userId, integralActivityId, 1);
+        LinkedList<IntegralActivityDrawVo> activityDrawArrayList = this.getIntegralActivityDrawList(2, userId, integralActivityId);
         // 先获取set到20条
         if (!CollectionUtil.isEmpty(activityDrawArrayList)) {
             if (activityDrawArrayList.size() >= 20) {
@@ -641,7 +641,7 @@ public class RedisDataUtils {
         }
     }
 
-    public LinkedList<IntegralActivityDrawVo> getIntegralActivityDrawList(Integer type, String uid, String integralActivityId, Integer pageNum) {
+    public LinkedList<IntegralActivityDrawVo> getIntegralActivityDrawList(Integer type, String uid, String integralActivityId) {
         String redisKey = "";
         if (type == 1) { // 中奖列表
             redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_IN_USER
@@ -662,6 +662,14 @@ public class RedisDataUtils {
         }
     }
 
+    public void setIntegralActivityDrawList(String uid, String integralActivityId, LinkedList<IntegralActivityDrawVo> integralActivityDrawList) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_IN_USER
+                    .concat(integralActivityId)
+                    .concat(":userId:")
+                    .concat(uid);
+        redisUtil.set(redisKey, integralActivityDrawList);
+    }
+
     public int getIntegralActivityPrizeNum(String integralActivityId, String prizeId) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_PRIZE_NUM
                 .concat(integralActivityId)