Merge remote-tracking branch 'origin/master'

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

@@ -1132,14 +1132,32 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 		//更新学员在班级的状态
 		classGroupStudentMapperDao.deleteStudentByMusicGroupId(musicGroupId, userId);
 		
-		//更新班级人数
 		List<Integer> classGroupIdList = classGroupStudentMapperDao.queryClassGroupIdList(musicGroupId, userId, GroupType.MUSIC);
 		if (classGroupIdList != null && classGroupIdList.size() > 0) {
+			//更新班级人数
 			classGroupDao.batchUpdateStudentNumMinusOne(classGroupIdList);
+
+			//删除融云群
+			List<ImGroupModel> imGroupModels = new ArrayList<ImGroupModel>();
+			for (Integer classGroupId : classGroupIdList) {
+				imGroupModels.add(new ImGroupModel(classGroupId + ""));
+			}
+			imFeignService.groupBatchDismiss(imGroupModels);
+		}
+		
+		List<CourseSchedule> musicGroupCourseSchedules = courseScheduleDao.findMusicGroupCourseSchedulesWithStudent(musicGroupId,GroupType.MUSIC.getCode(), CourseStatusEnum.NOT_START.getCode(),userId);
+		if(!CollectionUtils.isEmpty(musicGroupCourseSchedules)){
+			List<Long> courseScheduleIds = musicGroupCourseSchedules.stream().map(courseSchedule -> courseSchedule.getId()).collect(Collectors.toList());
+
+			// 删除未上课
+            courseScheduleDao.deleteMusicGroupCourseSchedulesWithStudent(courseScheduleIds,userId);
+			
+			//删除学生缴费表
+            courseScheduleStudentPaymentDao.deleteByCourseSchedule(courseScheduleIds);
 		}
 		
-		// 删除未上课
-		courseScheduleService.batchDeleteMusicGroupCourseWithStudent(musicGroupId, userId, GroupType.MUSIC);
+		//删除续费周期
+		musicGroupStudentFeeDao.deleteByUserIdAndMusicGroupId(userId, musicGroupId);
 		
 		// 退团
 		studentRegistration.setMusicGroupStatus(ClassGroupStudentStatusEnum.QUIT);

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

@@ -326,18 +326,22 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 
 	@Override
 	public PageInfo<Teacher> queryPageDetail(TeacherQueryInfo queryInfo) {
+		Map<String, Object> params = new HashMap<>();
+		MapUtil.populateMap(params, queryInfo);
+		List<Teacher> teacherList = teacherDao.findByFlowOrganRange(params);
+		if(teacherList == null || teacherList.size() < 1){
+			return new PageInfo<>();
+		}
 		if(StringUtils.isNotEmpty(queryInfo.getOrganId())){
 			Set<String> list = new HashSet<>(Arrays.asList(queryInfo.getOrganId().split(",")));
-			Map<String, Object> params = new HashMap<>();
-			MapUtil.populateMap(params, queryInfo);
-			List<Teacher> teacherList = teacherDao.findByFlowOrganRange(params);
-			List<Teacher> teachers = teacherList.stream().
+			teacherList = teacherList.stream().
 					filter(teacher -> !Collections.disjoint(new ArrayList<>(Arrays.asList(teacher.getFlowOrganRange().split(","))),list)).collect(Collectors.toList());
-			List<Integer> collect = teachers.stream().map(e -> e.getId()).collect(Collectors.toList());
-			if(collect != null && collect.size() > 0){
-				queryInfo.setTeacherId(collect);
-			}
 		}
+		List<Integer> collect = teacherList.stream().map(e -> e.getId()).collect(Collectors.toList());
+		if(collect == null || collect.size() < 1){
+			return new PageInfo<>();
+		}
+		queryInfo.setTeacherId(collect);
 
 		PageInfo<Teacher> pageInfo = queryPage(queryInfo);
 		List<Teacher> rows = pageInfo.getRows();