Merge remote-tracking branch 'origin/xiaohudou_20220427' into xiaohudou_20220427

core/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java

@@ -179,6 +179,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
                     attributes);
                     attributes);
             ImConversationCreateVo imConversationCreateVo = new ImConversationCreateVo();
             ImConversationCreateVo imConversationCreateVo = new ImConversationCreateVo();
             imConversationCreateVo.setId(conversation.getId());
             imConversationCreateVo.setId(conversation.getId());
+            return imConversationCreateVo;
         }
         }
         if (ChatTypeEnum.CHAT_ROOM.getCode().equals(chatType)) {
         if (ChatTypeEnum.CHAT_ROOM.getCode().equals(chatType)) {
             // 聊天室
             // 聊天室
@@ -347,8 +348,10 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
         imConversationMapper.addMemberCount(imApplication.getId(), imClientToConversation.getConversationId(), needAddCount);
         imConversationMapper.addMemberCount(imApplication.getId(), imClientToConversation.getConversationId(), needAddCount);
         ImConversationQueryVo conversation = imConversationMapper.getImConversationById(imClientToConversation.getConversationId());
         ImConversationQueryVo conversation = imConversationMapper.getImConversationById(imClientToConversation.getConversationId());
         if (conversation.getMemberCount() > 2000) {
         if (conversation.getMemberCount() > 2000) {
+            // 小虎豆不接万人群
+            throw new BusinessException("群成员超过最大数量，请确认");
             // 升级为万人群
             // 升级为万人群
-            imConversationMapper.upgradeToThousandChat(imApplication.getId(), imClientToConversation.getConversationId());
+//            imConversationMapper.upgradeToThousandChat(imApplication.getId(), imClientToConversation.getConversationId());
         }
         }
 
 
         return true;
         return true;