feat:六一活动排课

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

@@ -841,8 +841,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		Date date = new Date();
 		for (JSONObject courseData : datas) {
 			boolean skipHoliday = "是".equals(courseData.getString("skip_holiday"))?true:false;
-			String vipGroupCategory = courseData.getString("vip_group_category");
-			int courseMinute = "考前辅导课".equals(vipGroupCategory)?25:45;
+			String vipGroupCategoryStr = courseData.getString("vip_group_category");
+			int courseMinute = "考前辅导课".equals(vipGroupCategoryStr)?25:45;
+			String vipGroupCategoryName = "1v1".equals(vipGroupCategoryStr)?"1v1":"1v2";
 			int onlineCourseNum = courseData.getIntValue("online_course_num");
 			int onlineWeekNum = courseData.getIntValue("online_course_week_num");
 			String onlineCourseStartTime = courseData.getString("online_course_start_time");
@@ -851,8 +852,15 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			String offlineCourseStartTime = courseData.getString("offline_course_start_time");
 			int totalCourseNum = onlineCourseNum + offlineCourseNum;
 			Integer teacherId = courseData.getInteger("teacher_id");
-			Integer studentId = courseData.getInteger("student_id");
-			SysUser student = studentDao.getUser(studentId);
+			String studentIdsStr= courseData.getString("student_ids");
+			if(StringUtils.isBlank(studentIdsStr)){
+				throw new BizException("请选择学员");
+			}
+			List<Integer> studentIds = Arrays.stream(studentIdsStr.split(",")).map(id -> Integer.valueOf(id)).collect(Collectors.toList());
+			SysUser student = studentDao.getUser(studentIds.get(0));
+
+			List<VipGroupCategory> vipGroupCategories = vipGroupCategoryDao.findAllByOrgan(student.getOrganId().toString());
+			VipGroupCategory vipGroupCategory = vipGroupCategories.stream().filter(v -> v.getName().equals(vipGroupCategoryName)).findFirst().get();
 
 			LocalDate onlineCourseStartDay = LocalDate.parse(courseData.getString("online_course_start_day"), DateUtil.dateFormatter);
 			LocalDate offlineCourseStartDay = LocalDate.parse(courseData.getString("offline_course_start_day"), DateUtil.dateFormatter);