Merge branch 'online' of http://git.dayaedu.com/yonge/cooleshow into online

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImGroupServiceImpl.java

@@ -423,23 +423,6 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
         //保存老师学员关联的通讯录xz
         imUserFriendService.saveUserFriend(teacherId, Sets.newHashSet(studentIds));
 
-        //创建群聊
-        ImGroup imGroup = new ImGroup();
-        imGroup.setCreateBy(teacherId);
-        imGroup.setAutoPassFlag(false);
-        imGroup.setMemberNum(studentIds.size() + 1);
-        imGroup.setName(courseGroup.getName());
-        imGroup.setType(ImGroupType.COURSE);
-        imGroup.setImg(sysConfigService.findConfigValue(SysConfigConstant.ICON_COURSE_GROUP_DEFAULT));
-        imGroup.setCreateTime(now);
-        imGroup.setUpdateTime(now);
-//        String imGroupId = UUID.randomUUID() + imGroup.getType().getCode();
-//        imGroup.setId(imGroupId);
-        imGroup.setCourseGroupId(courseGroupId);
-//        this.baseMapper.insert(imGroup);
-
-        String groupId = createImGroup(imGroup);
-
         // 直播课、琴房课校验群成员人数限制
         if (CourseScheduleEnum.PIANO_ROOM_CLASS.getCode().equals(courseGroupType)
             || CourseScheduleEnum.LIVE.getCode().equals(courseGroupType)) {
@@ -462,6 +445,23 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
             }
         }
 
+        //创建群聊
+        ImGroup imGroup = new ImGroup();
+        imGroup.setCreateBy(teacherId);
+        imGroup.setAutoPassFlag(false);
+        imGroup.setMemberNum(studentIds.size() + 1);
+        imGroup.setName(courseGroup.getName());
+        imGroup.setType(ImGroupType.COURSE);
+        imGroup.setImg(sysConfigService.findConfigValue(SysConfigConstant.ICON_COURSE_GROUP_DEFAULT));
+        imGroup.setCreateTime(now);
+        imGroup.setUpdateTime(now);
+//        String imGroupId = UUID.randomUUID() + imGroup.getType().getCode();
+//        imGroup.setId(imGroupId);
+        imGroup.setCourseGroupId(courseGroupId);
+//        this.baseMapper.insert(imGroup);
+
+        String groupId = createImGroup(imGroup);
+
         if (!studentIds.isEmpty()) {
             // 添加学生
             List<ImGroupMember> groupMembers = imGroupMemberService.initGroupMembers(groupId, Sets.newHashSet(studentIds), ImGroupMemberRoleType.STUDENT);