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

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

@@ -82,4 +82,5 @@ public class SweetConstant {
     public final static String REDIS_KEY_SWEET_MDSK_ARTISTS_DETAILS = "sweet:mdsk:artists:details:";
     public final static String REDIS_KEY_SWEET_MDSK_SHOP = "sweet:mdsk:artists:shop:manual:";
     public static final String REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_LIST = "sweet:integralActivity:list";
+    public static final String REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_INFO = "sweet:integralActivity:integralActivityId:";
 }

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

 package com.liquidnet.service.sweet.dto.vo;
 
 import com.liquidnet.service.sweet.entity.SweetIntegralActivity;
+import com.liquidnet.service.sweet.entity.SweetIntegralActivityPrize;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -53,7 +54,7 @@ public class IntegralActivityVo implements Serializable, Cloneable {
     private LocalDateTime updatedAt;
 
     @ApiModelProperty(value = "奖品列表")
-    private List<IntegralActivityVo> prizeList;
+    private List<SweetIntegralActivityPrize> prizeList;
 
     private static final IntegralActivityVo obj = new IntegralActivityVo();
     public static IntegralActivityVo getNew() {

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

@@ -71,7 +71,7 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
                 }
             }
             // TODO: 2021/10/20 增加redis处理
-            this.integralActivityList();
+            this.integralActivityList(integralActivityId);
             return insert;
         } catch (Exception e) {
             log.error("创建活动失败 [e:{}]", e);
@@ -102,7 +102,7 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
                 }
             }
             // TODO: 2021/10/20 增加redis处理
-            this.integralActivityList();
+            this.integralActivityList(integralActivityId);
             return update;
         } catch (Exception e) {
             log.error("编辑活动失败 [e:{}]", e);
@@ -120,7 +120,7 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
                 Wrappers.lambdaUpdate(SweetIntegralActivity.class).eq(SweetIntegralActivity::getIntegralActivityId, integralActivityId)
         );
         // TODO: 2021/10/20 更新缓存
-        this.integralActivityList();
+        this.integralActivityList(integralActivityId);
         return update;
     }
 
@@ -156,7 +156,8 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
         return new PageInfo(voList);
     }
 
-    private void integralActivityList() {
+    private void integralActivityList(String integralActivityId) {
+        // 活动列表
         LambdaQueryWrapper<SweetIntegralActivity> queryWrapper = Wrappers.lambdaQuery(SweetIntegralActivity.class).eq(SweetIntegralActivity::getIsOnline, 2);
         LocalDateTime now = LocalDateTime.now();
         queryWrapper.eq(SweetIntegralActivity::getTimeType, 1).or().eq(SweetIntegralActivity::getTimeType, 2).lt(SweetIntegralActivity::getEndTime, now).gt(SweetIntegralActivity::getStartTime, now);
@@ -167,6 +168,16 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
             voList.add(copy);
         });
         sweetRedisAdminUtils.setIntegralActivityList(voList);
+        // 活动详情
+        SweetIntegralActivity sweetIntegralActivity = sweetIntegralActivityMapper.selectOne(
+                Wrappers.lambdaQuery(SweetIntegralActivity.class).eq(SweetIntegralActivity::getIntegralActivityId, integralActivityId)
+        );
+        IntegralActivityVo integralActivityVo = IntegralActivityVo.getNew().copy(sweetIntegralActivity);
+        List<SweetIntegralActivityPrize> sweetIntegralActivityPrizes = sweetIntegralActivityPrizeMapper.selectList(
+                Wrappers.lambdaQuery(SweetIntegralActivityPrize.class).eq(SweetIntegralActivityPrize::getIntegralActivityId, integralActivityId)
+        );
+        integralActivityVo.setPrizeList(sweetIntegralActivityPrizes);
+        sweetRedisAdminUtils.setIntegralActivityInfo(integralActivityVo);
     }
 
 }

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

@@ -21,5 +21,9 @@ public class SweetRedisAdminUtils {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_LIST;
         boolean set = redisUtil.set(redisKey, voList, 15);
     }
+    public void setIntegralActivityInfo(IntegralActivityVo integralActivityVo) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_INFO.concat(integralActivityVo.getIntegralActivityId());
+        boolean set = redisUtil.set(redisKey, integralActivityVo, 15);
+    }
 
 }

liquidnet-bus-config/liquidnet-config/liquidnet-service-sweet.yml

@@ -130,32 +130,32 @@ global-auth:
     - ${liquidnet.info.context}/swagger-resources/**
     - ${liquidnet.info.context}/v2/api-docs*
     # 同步数据
-    - ${liquidnet.info.context}/sync/*
-    - ${liquidnet.info.context}/wechatSync/*
+    - ${liquidnet.info.context}/sync/**
+    - ${liquidnet.info.context}/wechatSync/**
     # h5活动
-    - ${liquidnet.info.context}/sweetAnswer/*
-    - ${liquidnet.info.context}/AntigenicQuestion/*
-    - ${liquidnet.info.context}/sweetCityVote/*
+    - ${liquidnet.info.context}/sweetAnswer/**
+    - ${liquidnet.info.context}/AntigenicQuestion/**
+    - ${liquidnet.info.context}/sweetCityVote/**
     # 公众号 小程序公共接口
-    - ${liquidnet.info.context}/actionCallback/*
-    - ${liquidnet.info.context}/wechatLogin/*
-    - ${liquidnet.info.context}/wechatShareSign/*
-    - ${liquidnet.info.context}/wechatTemplate/*
+    - ${liquidnet.info.context}/actionCallback/**
+    - ${liquidnet.info.context}/wechatLogin/**
+    - ${liquidnet.info.context}/wechatShareSign/**
+    - ${liquidnet.info.context}/wechatTemplate/**
     # 大美草莓手册
-    - ${liquidnet.info.context}/sweet-applet/*
-    - ${liquidnet.info.context}/mdsk/*
-    - ${liquidnet.info.context}/sweet-artists/*
-    - ${liquidnet.info.context}/sweetData/*
-    - ${liquidnet.info.context}/sweet-manual-artists/*
-    - ${liquidnet.info.context}/sweet-manual/*
-    - ${liquidnet.info.context}/sweet-manual-notify/*
-    - ${liquidnet.info.context}/sweet-manual-shop/*
-    - ${liquidnet.info.context}/sweet-manual-sort/*
-    - ${liquidnet.info.context}/sweet-richtext/*
-    - ${liquidnet.info.context}/sweet-stage/*
+    - ${liquidnet.info.context}/sweet-applet/**
+    - ${liquidnet.info.context}/mdsk/**
+    - ${liquidnet.info.context}/sweet-artists/**
+    - ${liquidnet.info.context}/sweetData/**
+    - ${liquidnet.info.context}/sweet-manual-artists/**
+    - ${liquidnet.info.context}/sweet-manual/**
+    - ${liquidnet.info.context}/sweet-manual-notify/**
+    - ${liquidnet.info.context}/sweet-manual-shop/**
+    - ${liquidnet.info.context}/sweet-manual-sort/**
+    - ${liquidnet.info.context}/sweet-richtext/**
+    - ${liquidnet.info.context}/sweet-stage/**
     # 积分抽奖活动
-    - ${liquidnet.info.context}/integralActivity/*
-    - ${liquidnet.info.context}/integralActivityDraw/*
+    - ${liquidnet.info.context}/integralActivity/**
+    - ${liquidnet.info.context}/integralActivityDraw/**
 # -----------------------------------------------------------
 
 # -----------------------------------------------------------

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/config/StoneWebMvcConfig.java → liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/config/SweetWebMvcConfig.java

@@ -7,7 +7,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 
 @Configuration
-public class StoneWebMvcConfig extends WebMvcConfig {
+public class SweetWebMvcConfig extends WebMvcConfig {
     @Autowired
     GlobalAuthorityInterceptor globalAuthorityInterceptor;
 

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/constant/SweetConstant.java

@@ -91,4 +91,5 @@ public class SweetConstant {
     public final static String REDIS_KEY_SWEET_MDSK_ARTISTS_DETAILS = "sweet:mdsk:artists:details:";
     public final static String REDIS_KEY_SWEET_MDSK_SHOP = "sweet:mdsk:artists:shop:manual:";
     public static final String REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_LIST = "sweet:integralActivity:list";
+    public static final String REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_INFO = "sweet:integralActivity:integralActivityId:";
 }

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

@@ -56,7 +56,7 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
 
     @Override
     public ResponseDto<IntegralActivityVo> detail(String integralActivityId) {
-        IntegralActivityVo integralActivity = redisDataUtils.getIntegralActivityInfo();
+        IntegralActivityVo integralActivity = redisDataUtils.getIntegralActivityInfo(integralActivityId);
         return ResponseDto.success(integralActivity);
     }
 }

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

@@ -610,8 +610,8 @@ public class RedisDataUtils {
         }
     }
 
-    public IntegralActivityVo getIntegralActivityInfo() {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_LIST;
+    public IntegralActivityVo getIntegralActivityInfo(String integralActivityId) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_INFO.concat(integralActivityId);
         Object obj = redisUtil.get(redisKey);
         if (null == obj) {
             return null;