zouxuan 5 سال پیش
والد
کامیت
99d21b21fe
1فایلهای تغییر یافته به همراه10 افزوده شده و 10 حذف شده
  1. 10 10
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

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

@@ -402,7 +402,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         Date groupCourseStartTime=courseScheduleDao.findGroupCourseStartTime(GroupType.VIP,vipGroupId.toString());
         Date groupCourseEndTime=courseScheduleDao.findGroupCourseEndTime(GroupType.VIP,vipGroupId.toString());
 
-        //获取活动信息
+		//获取活动信息
 		if(Objects.nonNull(vipGroup.getVipGroupActivityId())){
 			VipGroupActivity vipGroupActivity = vipGroupActivityDao.get(vipGroup.getVipGroupActivityId().intValue());
 			if(Objects.nonNull(vipGroupActivity)&&(Objects.nonNull(vipGroupActivity.getCoursesEndTime())||Objects.nonNull(vipGroupActivity.getCoursesStartTime()))){
@@ -410,15 +410,15 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 						||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("课时安排时间超出范围!");
+			}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("课时安排时间超出范围!");
+					}
 				}
 			}
 		}