feat:六一活动排课

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

@@ -693,6 +693,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		//创建班级信息
 		ClassGroup classGroup=new ClassGroup();
 		classGroup.setSubjectIdList(vipGroupApplyBaseInfoDto.getSubjectIdList());
+		if(StringUtils.isBlank(classGroup.getSubjectIdList())){
+			classGroup.setSubjectIdList(studentDetail.get(0).getSubjectIdList());
+		}
 		classGroup.setExpectStudentNum(vipGroupCategory.getStudentNum());
 		classGroup.setStudentNum(studentIdList.size());
 		classGroup.setName(vipGroupApplyBaseInfoDto.getName());
@@ -855,23 +858,23 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		courseScheduleService.checkNewCourseSchedules(courseSchedules, false,false);
 
-		try {
-			imGroupService.create(classGroup.getId().longValue(), null, classGroup.getName(), classGroup.getName(), vipGroupApplyBaseInfoDto.getName(), null, null, GroupType.VIP.getCode());
-			imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
-			imUserFriendService.refreshGroupImUserFriend(classGroup.getMusicGroupId(),classGroup.getGroupType());
-			//发送推送
-			Map<Integer,String> map = new HashMap<>(1);
-			map.put(vipGroupApplyBaseInfoDto.getUserId(),sysUser.getPhone());
-			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,MessageTypeEnum.CHILDREN_DAY_VIP_COURSE_TEACHER_PUSH,
-					map,null,0,"","TEACHER", StringUtils.join(studentNames, ","),vipGroupApplyBaseInfoDto.getName());
-
-			Map<Integer,String> studentIdStrMap = new HashMap<>(1);
-			studentIdList.forEach(id->studentIdStrMap.put(id, id.toString()));
-			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.CHILDREN_DAY_VIP_COURSE_STUDENT_PUSH, map, null, 0, "","STUDENT",
-					vipGroupApplyBaseInfoDto.getName());
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+//		try {
+//			imGroupService.create(classGroup.getId().longValue(), null, classGroup.getName(), classGroup.getName(), vipGroupApplyBaseInfoDto.getName(), null, null, GroupType.VIP.getCode());
+//			imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
+//			imUserFriendService.refreshGroupImUserFriend(classGroup.getMusicGroupId(),classGroup.getGroupType());
+//			//发送推送
+//			Map<Integer,String> map = new HashMap<>(1);
+//			map.put(vipGroupApplyBaseInfoDto.getUserId(),sysUser.getPhone());
+//			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,MessageTypeEnum.CHILDREN_DAY_VIP_COURSE_TEACHER_PUSH,
+//					map,null,0,"","TEACHER", StringUtils.join(studentNames, ","),vipGroupApplyBaseInfoDto.getName());
+//
+//			Map<Integer,String> studentIdStrMap = new HashMap<>(1);
+//			studentIdList.forEach(id->studentIdStrMap.put(id, id.toString()));
+//			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.CHILDREN_DAY_VIP_COURSE_STUDENT_PUSH, map, null, 0, "","STUDENT",
+//					vipGroupApplyBaseInfoDto.getName());
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//		}
 		return BaseController.succeed(vipGroupApplyBaseInfoDto.getAuditStatus().getCode());
 	}
 
@@ -905,6 +908,7 @@ 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 eduTeacherId = StringUtils.isBlank(courseData.getString("edu_teacher_id"))?null:courseData.getInteger("edu_teacher_id");
 			String studentIdsStr= courseData.getString("student_ids");
 			if(StringUtils.isBlank(studentIdsStr)){
 				throw new BizException("请选择学员");
@@ -1027,6 +1031,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			
 			vipGroupApplyBaseInfoDto.setAllCourseNum(totalCourseNum);
 			vipGroupApplyBaseInfoDto.setTeacherId(teacherId.longValue());
+			vipGroupApplyBaseInfoDto.setEducationalTeacherId(eduTeacherId);
 			vipGroupApplyBaseInfoDto.setSubjectIdList(stu.getSubjectIdList());
 			vipGroupApplyBaseInfoDto.setFirstStudentId(studentIds.get(0));
 			vipGroupApplyBaseInfoDto.setUserId(teacherId);