feat:正常vip课创建排除特殊活动

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupActivityServiceImpl.java

@@ -6,7 +6,6 @@ import com.ym.mec.biz.dal.dao.VipGroupActivityDao;
 import com.ym.mec.biz.dal.dto.ExportVipGroupActivityDto;
 import com.ym.mec.biz.dal.dto.VipGroupActivityAddDto;
 import com.ym.mec.biz.dal.dto.VipGroupSalarySettlementDto;
-import com.ym.mec.biz.dal.entity.SysConfig;
 import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.entity.VipGroupActivity;
 import com.ym.mec.biz.dal.page.VipGroupActivityQueryInfo;
@@ -15,7 +14,6 @@ import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.VipGroupActivityService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
-import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -23,8 +21,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 @Service
 public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGroupActivity>  implements VipGroupActivityService {
@@ -171,29 +171,6 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 
 		List<VipGroupActivity> vipGroupActivities = vipGroupActivityDao.findByCategory(categoryId, organIds, applyToStudentType);
 
-		SysConfig childrenDayIdConfig = sysConfigService.findByParamName(SysConfigService.CHILDREN_DAY_VIP_ACTIVITY_IDS);
-		if(Objects.nonNull(childrenDayIdConfig)||StringUtils.isNotBlank(childrenDayIdConfig.getParanValue())){
-			Set<Integer> activityIds = Arrays.stream(childrenDayIdConfig.getParanValue().split(",")).map(id->Integer.valueOf(id)).collect(Collectors.toSet());
-			Iterator<VipGroupActivity> iterator = vipGroupActivities.iterator();
-			if(iterator.hasNext()){
-				VipGroupActivity vipGroupActivity = iterator.next();
-				if(activityIds.contains(vipGroupActivity.getId())){
-					iterator.remove();
-				}
-			}
-		}
-		SysConfig doubleElevenIdConfig = sysConfigService.findByParamName(SysConfigService.VIP_SPECIAL_ACTIVITY_IDS);
-		if(Objects.nonNull(doubleElevenIdConfig)||StringUtils.isNotBlank(doubleElevenIdConfig.getParanValue())){
-			Set<Integer> activityIds = Arrays.stream(doubleElevenIdConfig.getParanValue().split(",")).map(id->Integer.valueOf(id)).collect(Collectors.toSet());
-			Iterator<VipGroupActivity> iterator = vipGroupActivities.iterator();
-			if(iterator.hasNext()){
-				VipGroupActivity vipGroupActivity = iterator.next();
-				if(activityIds.contains(vipGroupActivity.getId())){
-					iterator.remove();
-				}
-			}
-		}
-
 		return vipGroupActivities;
 	}
 

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

@@ -108,12 +108,28 @@ public class VipGroupActivityController extends BaseController {
             List<VipGroupActivity> results = vipGroupActivities.stream().filter(e -> specialActivityIds.contains(e.getId())).collect(Collectors.toList());
             return succeed(results);
         }else{
-            if(Objects.isNull(sysConfig)|| StringUtils.isBlank(sysConfig.getParanValue())){
-                return succeed(vipGroupActivities);
+            SysConfig childrenDayIdConfig = sysConfigService.findByParamName(SysConfigService.CHILDREN_DAY_VIP_ACTIVITY_IDS);
+            if(Objects.nonNull(childrenDayIdConfig)||StringUtils.isNotBlank(childrenDayIdConfig.getParanValue())){
+                Set<Integer> activityIds = Arrays.stream(childrenDayIdConfig.getParanValue().split(",")).map(id->Integer.valueOf(id)).collect(Collectors.toSet());
+                Iterator<VipGroupActivity> iterator = vipGroupActivities.iterator();
+                if(iterator.hasNext()){
+                    VipGroupActivity vipGroupActivity = iterator.next();
+                    if(activityIds.contains(vipGroupActivity.getId())){
+                        iterator.remove();
+                    }
+                }
             }
-            Set<Integer> specialActivityIds = Arrays.stream(sysConfig.getParanValue().split(",")).map(Integer::valueOf).collect(Collectors.toSet());
-            List<VipGroupActivity> results = vipGroupActivities.stream().filter(e -> !specialActivityIds.contains(e.getId())).collect(Collectors.toList());
-            return succeed(results);
+            if(Objects.nonNull(sysConfig)||StringUtils.isNotBlank(sysConfig.getParanValue())){
+                Set<Integer> activityIds = Arrays.stream(sysConfig.getParanValue().split(",")).map(id->Integer.valueOf(id)).collect(Collectors.toSet());
+                Iterator<VipGroupActivity> iterator = vipGroupActivities.iterator();
+                if(iterator.hasNext()){
+                    VipGroupActivity vipGroupActivity = iterator.next();
+                    if(activityIds.contains(vipGroupActivity.getId())){
+                        iterator.remove();
+                    }
+                }
+            }
+            return succeed(vipGroupActivities);
         }
     }
 

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

@@ -8,7 +8,10 @@ import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dto.VipGroupActivityAddDto;
 import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.entity.Student;
+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 com.ym.mec.common.exception.BizException;
@@ -22,9 +25,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -47,6 +48,8 @@ public class VipGroupActivityController extends BaseController {
     private TeacherDao teacherDao;
 	@Autowired
     private StudentDao studentDao;
+	@Autowired
+    private SysConfigService sysConfigService;
 
     @ApiOperation(value = "新增vip课活动方案")
     @PostMapping("/addVipGroupActivity")
@@ -127,7 +130,33 @@ public class VipGroupActivityController extends BaseController {
             return failed("学员信息不存在");
         }
         String organIds = student.getOrganId().toString();
-        return succeed(vipGroupActivityService.findByVipGroupCategory(categoryId, organIds, teacherId, applyToStudentType));
+
+        List<VipGroupActivity> vipGroupActivities = vipGroupActivityService.findByVipGroupCategory(categoryId, organIds, teacherId, applyToStudentType);
+
+        SysConfig childrenDayIdConfig = sysConfigService.findByParamName(SysConfigService.CHILDREN_DAY_VIP_ACTIVITY_IDS);
+        if(Objects.nonNull(childrenDayIdConfig)||StringUtils.isNotBlank(childrenDayIdConfig.getParanValue())){
+            Set<Integer> activityIds = Arrays.stream(childrenDayIdConfig.getParanValue().split(",")).map(id->Integer.valueOf(id)).collect(Collectors.toSet());
+            Iterator<VipGroupActivity> iterator = vipGroupActivities.iterator();
+            if(iterator.hasNext()){
+                VipGroupActivity vipGroupActivity = iterator.next();
+                if(activityIds.contains(vipGroupActivity.getId())){
+                    iterator.remove();
+                }
+            }
+        }
+        SysConfig doubleElevenIdConfig = sysConfigService.findByParamName(SysConfigService.VIP_SPECIAL_ACTIVITY_IDS);
+        if(Objects.nonNull(doubleElevenIdConfig)||StringUtils.isNotBlank(doubleElevenIdConfig.getParanValue())){
+            Set<Integer> activityIds = Arrays.stream(doubleElevenIdConfig.getParanValue().split(",")).map(id->Integer.valueOf(id)).collect(Collectors.toSet());
+            Iterator<VipGroupActivity> iterator = vipGroupActivities.iterator();
+            if(iterator.hasNext()){
+                VipGroupActivity vipGroupActivity = iterator.next();
+                if(activityIds.contains(vipGroupActivity.getId())){
+                    iterator.remove();
+                }
+            }
+        }
+
+        return succeed(vipGroupActivities);
     }
 
 }