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

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/param/admin/SweetIntegralActivityFromParam.java

@@ -94,6 +94,7 @@ public class SweetIntegralActivityFromParam implements Serializable, Cloneable {
         sweetIntegralActivity.setActivityTitle(source.getActivityTitle());
         sweetIntegralActivity.setActivityImg(source.getActivityImg());
         sweetIntegralActivity.setActivityType(source.getActivityType());
+        sweetIntegralActivity.setActivityNum(source.getActivityNum());
         sweetIntegralActivity.setTimeType(source.getTimeType());
         if (null != source.getStartTime() && !source.getStartTime().isEmpty()) {
             LocalDateTime startTime = DateUtil.Formatter.yyyyMMddHHmmss.parse(source.getStartTime());

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

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 public class IntegralActivityVo implements Serializable, Cloneable {
@@ -51,6 +52,9 @@ public class IntegralActivityVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "更新时间")
     private LocalDateTime updatedAt;
 
+    @ApiModelProperty(value = "奖品列表")
+    private List<IntegralActivityVo> prizeList;
+
     private static final IntegralActivityVo obj = new IntegralActivityVo();
     public static IntegralActivityVo getNew() {
         try {
@@ -66,6 +70,7 @@ public class IntegralActivityVo implements Serializable, Cloneable {
         this.setActivityTitle(source.getActivityTitle());
         this.setActivityImg(source.getActivityImg());
         this.setActivityType(source.getActivityType());
+        this.setActivityNum(source.getActivityNum());
         this.setTimeType(source.getTimeType());
         this.setStartTime(source.getStartTime());
         this.setEndTime(source.getEndTime());

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

@@ -86,6 +86,7 @@ public class SweetIntegralActivityVo implements Serializable, Cloneable {
         this.setActivityTitle(source.getActivityTitle());
         this.setActivityImg(source.getActivityImg());
         this.setActivityType(source.getActivityType());
+        this.setActivityNum(source.getActivityNum());
         this.setTimeType(source.getTimeType());
         this.setStartTime(source.getStartTime());
         this.setEndTime(source.getEndTime());

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

@@ -18,4 +18,6 @@ import java.util.List;
 public interface ISweetIntegralActivityService extends IService<SweetIntegralActivity> {
 
     ResponseDto<List<IntegralActivityVo>> getList();
+
+    ResponseDto<IntegralActivityVo> detail(String integralActivityId);
 }

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

@@ -129,7 +129,33 @@ global-auth:
     - ${liquidnet.info.context}/webjars/**
     - ${liquidnet.info.context}/swagger-resources/**
     - ${liquidnet.info.context}/v2/api-docs*
-
+    # 同步数据
+    - ${liquidnet.info.context}/sync/*
+    - ${liquidnet.info.context}/wechatSync/*
+    # h5活动
+    - ${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}/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-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/config/StoneWebMvcConfig.java

+package com.liquidnet.service.sweet.config;
+
+import com.liquidnet.common.web.config.WebMvcConfig;
+import com.liquidnet.common.web.filter.GlobalAuthorityInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+
+@Configuration
+public class StoneWebMvcConfig extends WebMvcConfig {
+    @Autowired
+    GlobalAuthorityInterceptor globalAuthorityInterceptor;
+
+    @Override
+    protected void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(globalAuthorityInterceptor).addPathPatterns("/**");
+        super.addInterceptors(registry);
+    }
+}

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

@@ -8,6 +8,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -34,4 +35,10 @@ public class SweetIntegralActivityController {
     public ResponseDto<List<IntegralActivityVo>> getList() {
         return activityService.getList();
     }
+
+    @GetMapping("detail/{integralActivityId}")
+    @ApiOperation("积分抽奖活动详情")
+    public ResponseDto<IntegralActivityVo> detail(@PathVariable("integralActivityId") String integralActivityId) {
+        return activityService.detail(integralActivityId);
+    }
 }

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

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

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

@@ -609,4 +609,14 @@ public class RedisDataUtils {
             return (List<IntegralActivityVo>) obj;
         }
     }
+
+    public IntegralActivityVo getIntegralActivityInfo() {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_LIST;
+        Object obj = redisUtil.get(redisKey);
+        if (null == obj) {
+            return null;
+        } else {
+            return (IntegralActivityVo) obj;
+        }
+    }
 }