Browse Source

活动排课

zouxuan 3 years ago
parent
commit
fc411ef8c8

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

@@ -2423,14 +2423,14 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 					throw new BizException("您无法购买此课程");
 				}
 			}
-			ClassGroup classGroup = classGroupDao.findByGroupAndType(vipGroupId.toString(), "PRACTICE");
-
-			if(classGroup.getStudentNum()>0 && (VipGroupStatusEnum.APPLYING.equals(practiceGroup.getGroupStatus()))){
-				int i = studentPaymentOrderDao.countGroupOrderWithoutFailed(vipGroupId.toString(), GroupType.PRACTICE);
-				if(i<=0){
-					throw new BizException("该课程已经无法通过购买加入,请联系教务老师!");
-				}
-			}
+//			ClassGroup classGroup = classGroupDao.findByGroupAndType(vipGroupId.toString(), "PRACTICE");
+//
+//			if(classGroup.getStudentNum()>0 && (VipGroupStatusEnum.APPLYING.equals(practiceGroup.getGroupStatus()))){
+//				int i = studentPaymentOrderDao.countGroupOrderWithoutFailed(vipGroupId.toString(), GroupType.PRACTICE);
+//				if(i<=0){
+//					throw new BizException("该课程已经无法通过购买加入,请联系教务老师!");
+//				}
+//			}
 
 			List<CourseSchedule> courseSchedules = JSON.parseArray(practiceGroup.getCourseScheduleJson(),CourseSchedule.class);
 			courseScheduleService.checkNewCourseSchedules(courseSchedules,false,false);
@@ -2443,14 +2443,14 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				}
 			}
 
-			ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroupId.longValue(), null);
-
-			if(classGroup.getStudentNum()>0&&(VipGroupStatusEnum.APPLYING.equals(vipGroup.getStatus()))){
-				int i = studentPaymentOrderDao.countGroupOrderWithoutFailed(vipGroupId.toString(), GroupType.VIP);
-				if(i<=0){
-					throw new BizException("该课程已经无法通过购买加入,请联系教务老师!");
-				}
-			}
+//			ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroupId.longValue(), null);
+//
+//			if(classGroup.getStudentNum() > 0 && (VipGroupStatusEnum.APPLYING.equals(vipGroup.getStatus()))){
+//				int i = studentPaymentOrderDao.countGroupOrderWithoutFailed(vipGroupId.toString(), GroupType.VIP);
+//				if(i <= 0){
+//					throw new BizException("该课程已经无法通过购买加入,请联系教务老师!");
+//				}
+//			}
 
 			List<CourseSchedule> courseSchedules = JSON.parseArray(vipGroup.getCourseSchedulesJson(),CourseSchedule.class);
 			courseScheduleService.checkNewCourseSchedules(courseSchedules,false,false);
@@ -2821,6 +2821,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 					}
 					userRoleMap.put(classGroupStudent.getUserId(),null);
 				}
+				courseScheduleStudentPaymentDao.batchInsert(courseScheduleStudentPayments);
 				studentDao.updateStudentServiceTag(null, studentIdList, YesOrNoEnum.YES.getCode());
 				courseScheduleTeacherSalaryDao.batchInsert(courseScheduleTeacherSalaries);
 				imGroupService.create(classGroup.getId().longValue(), null, classGroup.getName(), classGroup.getName(), vipGroup.getName(), null, null, GroupType.VIP.getCode());