feat：VIP双11活动派克

mec-biz/src/main/java/com/ym/mec/biz/service/SysConfigService.java

@@ -205,6 +205,8 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
     
     String END_TIME_OF_1111 = "end_time_of_1111";
 
+    String VIP_SPECIAL_ACTIVITY_IDS = "vip_special_activity_ids";
+
     /**
      * @return com.ym.mec.biz.dal.entity.SysConfig
      * @params paramName

mec-teacher/src/main/java/com/ym/mec/teacher/controller/VipGroupActivityController.java

@@ -3,14 +3,23 @@ package com.ym.mec.teacher.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.VipGroupActivityAddDto;
+import com.ym.mec.biz.dal.entity.SysConfig;
+import com.ym.mec.biz.dal.entity.VipGroupActivity;
 import com.ym.mec.biz.dal.page.VipGroupActivityQueryInfo;
+import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.VipGroupActivityService;
 import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
 /**
  * @Author Joburgess
  * @Date 2019/10/1
@@ -25,6 +34,8 @@ public class VipGroupActivityController extends BaseController {
     private VipGroupActivityService vipGroupActivityService;
     @Autowired
     private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private SysConfigService sysConfigService;
 
     @ApiOperation(value = "新增vip课活动方案")
     @PostMapping("/addVipGroupActivity")
@@ -48,12 +59,19 @@ public class VipGroupActivityController extends BaseController {
 
     @ApiOperation(value = "根据课程类型获取对应课程活动方案")
     @GetMapping("/findByVipGroupCategory")
-    public Object findByVipGroupCategory(Long categoryId){
+    public Object findByVipGroupCategory(Long categoryId, boolean onlySpecialActivity){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null){
             return failed("用户信息获取失败");
         }
-        return succeed(vipGroupActivityService.findByVipGroupCategory(categoryId,sysUser.getId()));
+        List<VipGroupActivity> vipGroupActivities = vipGroupActivityService.findByVipGroupCategory(categoryId, sysUser.getId());
+        if(onlySpecialActivity){
+            SysConfig sysConfig = sysConfigService.findByParamName(SysConfigService.VIP_SPECIAL_ACTIVITY_IDS);
+            if(Objects.isNull(sysConfig)|| StringUtils.isBlank(sysConfig.getParanValue())){
+                return succeed(Collections.EMPTY_LIST);
+            }
+        }
+        return succeed(vipGroupActivities);
     }
 
 }