Merge branch 'online1'

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

@@ -108,17 +108,6 @@ public class VipGroupActivityController extends BaseController {
             List<VipGroupActivity> results = vipGroupActivities.stream().filter(e -> specialActivityIds.contains(e.getId())).collect(Collectors.toList());
             return succeed(results);
         }else{
-            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();
-                    }
-                }
-            }
             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();

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

@@ -133,17 +133,6 @@ public class VipGroupActivityController extends BaseController {
 
         List<VipGroupActivity> vipGroupActivities = vipGroupActivityService.findByVipGroupCategory(categoryId, organIds, teacherId, applyToStudentType, null);
 
-        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());