|
@@ -1790,13 +1790,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
|
|
|
//所有教师列表
|
|
|
List<Teacher> teachers = teacherDao.findByTeacherIds(allTeacherIds);
|
|
|
- Map<Integer, Teacher> teacherMap = teachers.stream()
|
|
|
- .collect(Collectors.toMap(Teacher::getId, teacher -> teacher));
|
|
|
-
|
|
|
- //创建IM群组
|
|
|
- addImGroup(classGroup, userIds, teacherIds);
|
|
|
-
|
|
|
-
|
|
|
Map<String, Integer> courseTypeMinutesMap = musicGroupPaymentCalenderCourseSettingsService.getMusicCourseSettingsWithStudents(musicGroupId, studentIdList);
|
|
|
|
|
|
//计算每节课的课酬
|
|
@@ -1920,6 +1913,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
courseScheduleStudentPaymentService.createForMusicGroup(musicGroupId, courseScheduleList, studentIdList);
|
|
|
studentDao.updateStudentServiceTag(null, studentIdList, YesOrNoEnum.YES.getCode());
|
|
|
}
|
|
|
+ //创建IM群组
|
|
|
+ addImGroup(classGroup, userIds, teacherIds);
|
|
|
return classGroup;
|
|
|
}
|
|
|
|
|
@@ -2974,6 +2969,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
|
|
|
imGroupService.create(classGroup.getId().longValue(), null, classGroup.getName(), musicGroup.getName(), musicGroup.getName(), musicGroup.getName(), null, "MUSIC");
|
|
|
imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
|
|
|
+ imUserFriendService.refreshClassImUserFriend(classGroup.getId());
|
|
|
return true;
|
|
|
}
|
|
|
|