调课时间限制

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

@@ -403,23 +403,25 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         Date groupCourseEndTime=courseScheduleDao.findGroupCourseEndTime(GroupType.VIP,vipGroupId.toString());
 
         //获取活动信息
-        VipGroupActivity vipGroupActivity = vipGroupActivityDao.get(vipGroup.getVipGroupActivityId().intValue());
-        if(Objects.nonNull(vipGroupActivity)&&(Objects.nonNull(vipGroupActivity.getCoursesEndTime())||Objects.nonNull(vipGroupActivity.getCoursesStartTime()))){
-            if(groupCourseEndTime.after(vipGroupActivity.getCoursesEndTime())
-                    ||groupCourseStartTime.before(vipGroupActivity.getCoursesStartTime())){
-                throw new BizException("课时安排时间超出范围!");
-            }
-        }else{
-            int totalClassTimes = courseScheduleDao.countGroupAllCourses(GroupType.VIP, vipGroupId.toString());
-            VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(totalClassTimes);
+		if(Objects.nonNull(vipGroup.getVipGroupActivityId())){
+			VipGroupActivity vipGroupActivity = vipGroupActivityDao.get(vipGroup.getVipGroupActivityId().intValue());
+			if(Objects.nonNull(vipGroupActivity)&&(Objects.nonNull(vipGroupActivity.getCoursesEndTime())||Objects.nonNull(vipGroupActivity.getCoursesStartTime()))){
+				if(groupCourseEndTime.after(vipGroupActivity.getCoursesEndTime())
+						||groupCourseStartTime.before(vipGroupActivity.getCoursesStartTime())){
+					throw new BizException("课时安排时间超出范围!");
+				}
+			}
+		}else{
+			int totalClassTimes = courseScheduleDao.countGroupAllCourses(GroupType.VIP, vipGroupId.toString());
+			VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(totalClassTimes);
 
-            if (vipGroupDefaultClassesCycle != null) {
-                int month = DateUtil.monthsBetween(groupCourseStartTime, groupCourseEndTime);
-                if (month > vipGroupDefaultClassesCycle.getMonth()) {
-                    throw new BizException("课时安排时间超出范围!");
-                }
-            }
-        }
+			if (vipGroupDefaultClassesCycle != null) {
+				int month = DateUtil.monthsBetween(groupCourseStartTime, groupCourseEndTime);
+				if (month > vipGroupDefaultClassesCycle.getMonth()) {
+					throw new BizException("课时安排时间超出范围!");
+				}
+			}
+		}
     }
 
     @Override