Przeglądaj źródła

feat:vip课活动课配置是否允许线上调线下

Joburgess 4 lat temu
rodzic
commit
b4d67f1d99

+ 4 - 4
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -2760,7 +2760,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                             throw new BizException("此VIP课活动不支持线上课调整为线下课");
                             throw new BizException("此VIP课活动不支持线上课调整为线下课");
                         }
                         }
 						if(offlineToOnline&&(vipGroupActivity.getAllowOnlineToOffline()==2||vipGroupActivity.getAllowOnlineToOffline()==3)){
 						if(offlineToOnline&&(vipGroupActivity.getAllowOnlineToOffline()==2||vipGroupActivity.getAllowOnlineToOffline()==3)){
-							throw new BizException("此VIP课活动不支持线上课调整为线下课");
+							throw new BizException("此VIP课活动不支持线下课调整为线上课");
 						}
 						}
 						if(onlineToOffline&&Objects.isNull(vipGroupCourseAdjustInfo.getSchoolId())){
 						if(onlineToOffline&&Objects.isNull(vipGroupCourseAdjustInfo.getSchoolId())){
 							throw new BizException("请选择教学点");
 							throw new BizException("请选择教学点");
@@ -2949,7 +2949,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				throw new BizException("选择的课程中存在进行中或已结束的课程,无法进行调整");
 				throw new BizException("选择的课程中存在进行中或已结束的课程,无法进行调整");
 			}
 			}
 
 
-			if(VIP.equals(oldCourses.get(i))){
+			if(VIP.equals(oldCourses.get(i).getGroupType())){
 				VipGroup vipGroup = vipGroupDao.get(Long.valueOf(oldCourses.get(i).getMusicGroupId()));
 				VipGroup vipGroup = vipGroupDao.get(Long.valueOf(oldCourses.get(i).getMusicGroupId()));
 				if(Objects.isNull(vipGroup)){
 				if(Objects.isNull(vipGroup)){
 					throw new BizException("课程组信息不存在");
 					throw new BizException("课程组信息不存在");
@@ -2964,7 +2964,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					throw new BizException("此VIP课活动不支持线上课调整为线下课");
 					throw new BizException("此VIP课活动不支持线上课调整为线下课");
 				}
 				}
 				if(offlineToOnline&&(vipGroupActivity.getAllowOnlineToOffline()==2||vipGroupActivity.getAllowOnlineToOffline()==3)){
 				if(offlineToOnline&&(vipGroupActivity.getAllowOnlineToOffline()==2||vipGroupActivity.getAllowOnlineToOffline()==3)){
-					throw new BizException("此VIP课活动不支持线上课调整为线下课");
+					throw new BizException("此VIP课活动不支持线下课调整为线上课");
 				}
 				}
 			}
 			}
 
 
@@ -3409,7 +3409,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				}
 				}
 				boolean offlineToOnline = TeachModeEnum.ONLINE.equals(newCourseSchedule.getTeachMode())&&TeachModeEnum.OFFLINE.equals(oldCourseSchedule.getTeachMode());
 				boolean offlineToOnline = TeachModeEnum.ONLINE.equals(newCourseSchedule.getTeachMode())&&TeachModeEnum.OFFLINE.equals(oldCourseSchedule.getTeachMode());
 				if(offlineToOnline&&(vipGroupActivity.getAllowOnlineToOffline()==2||vipGroupActivity.getAllowOnlineToOffline()==3)){
 				if(offlineToOnline&&(vipGroupActivity.getAllowOnlineToOffline()==2||vipGroupActivity.getAllowOnlineToOffline()==3)){
-					throw new BizException("此VIP课活动不支持线上课调整为线下课");
+					throw new BizException("此VIP课活动不支持线下课调整为线上课");
 				}
 				}
 			}
 			}