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

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

@@ -6,10 +6,12 @@ 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;
 import com.ym.mec.biz.event.source.EntityChangeEventSource;
+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;
@@ -22,6 +24,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGroupActivity>  implements VipGroupActivityService {
@@ -32,6 +35,8 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 	private TeacherDao teacherDao;
 	@Autowired
 	private EntityChangeEventSource entityChangeEventSource;
+	@Autowired
+	private SysConfigService sysConfigService;
 
 	@Override
 	public BaseDAO<Integer, VipGroupActivity> getDAO() {
@@ -163,7 +168,33 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 				organIds += "," + teacher.getFlowOrganRange();
 			}
 		}
-		return vipGroupActivityDao.findByCategory(categoryId,organIds, applyToStudentType);
+
+		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;
 	}
 
 	@Override