zouxuan 4 年之前
父節點
當前提交
0511a1129f

+ 4 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -288,13 +288,16 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         if (userIdList.size() > 0) {
             addImGroup(classGroup, userIdList, teacherIdList);
         }else {
+            MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
             Map<Integer,String> userRoleMap = new HashMap<>();
+            userRoleMap.put(musicGroup.getEducationalTeacherId(), "乐团主管");
+            userRoleMap.put(musicGroup.getTeamTeacherId(), "运营主管");
+            userRoleMap.put(musicGroup.getDirectorUserId(), "乐队指导");
             if(teacherIdList != null && teacherIdList.size() > 0){
                 for(Integer teacherId : teacherIdList){
                     userRoleMap.put(teacherId, "指导老师");
                 }
             }
-            MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
             imGroupService.create(classGroup.getId().longValue(), null, classGroup.getName(), musicGroup.getName(), musicGroup.getName(), musicGroup.getName(), null, "MUSIC");
             imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
         }

+ 15 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupStudentMapperServiceImpl.java

@@ -473,6 +473,21 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
 
         List<CourseSchedule> classGroupNotStartCourse = courseScheduleDao.findCoursesByClassGroupId(classGroupId.intValue(), CourseStatusEnum.NOT_START);
         if (CollectionUtils.isEmpty(classGroupNotStartCourse)) {
+            if (!CollectionUtils.isEmpty(addStudentIds)) {
+                courseScheduleStudentPaymentService.createForMusicGroup(classGroup.getMusicGroupId(), classGroupNotStartCourse, new ArrayList<>(addStudentIds));
+                studentDao.updateStudentServiceTag(null, new ArrayList<>(addStudentIds), YesOrNoEnum.YES.getCode());
+                if(musicGroup.getStatus() == MusicGroupStatusEnum.PROGRESS){
+                    Map<Integer,String> userRoleMap = new HashMap<>();
+                    for (Integer addStudentId : addStudentIds) {
+                        userRoleMap.put(addStudentId, "");
+                    }
+                    //5、添加进IM群组
+                    imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
+                }
+            }
+            if(musicGroup.getStatus() == MusicGroupStatusEnum.PROGRESS){
+                imUserFriendService.refreshClassImUserFriend(classGroup.getId());
+            }
             return;
         }