Merge remote-tracking branch 'origin/zx-06-15-live' into zx-06-15-live

mec-biz/src/main/java/com/ym/mec/biz/service/ImLiveBroadcastRoomService.java

@@ -133,6 +133,8 @@ public interface ImLiveBroadcastRoomService extends IService<ImLiveBroadcastRoom
 
     void createLiveRoom(ImLiveBroadcastRoom room);
 
+    void createLiveRoomNoTransactional(ImLiveBroadcastRoom room);
+
     Map<String, Object> test(String roomUid, String userFlag);
 
     /**

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

@@ -2203,6 +2203,11 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void createLiveRoom(ImLiveBroadcastRoom room) {
+        createLiveRoomNoTransactional(room);
+    }
+
+    @Override
+    public void createLiveRoomNoTransactional(ImLiveBroadcastRoom room) {
         if (StringUtils.isBlank(room.getGroupType())) {
             room.setGroupType("NORMAL");
         }

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

@@ -5158,13 +5158,13 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
         // 开启直播间
         try {
-            imLiveBroadcastRoomService.createLiveRoom(liveRoom);
+            imLiveBroadcastRoomService.createLiveRoomNoTransactional(liveRoom);
 
         } catch (Exception e) {
             log.error("创建直播间失败", e);
             imLiveBroadcastRoomService.removeById(liveRoom.getId());
             roomUid = null;
-//            throw new BizException("创建直播间失败");
+            throw new BizException("直播间创建失败，请联系客服");
         }
 
         // 更新课程关联直播间

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -430,7 +430,7 @@ public class RoomServiceImpl implements RoomService {
             imLiveBroadcastRoomService.saveOrUpdate(liveRoom);
 
             // 开启直播间
-            imLiveBroadcastRoomService.createLiveRoom(liveRoom);
+            imLiveBroadcastRoomService.createLiveRoomNoTransactional(liveRoom);
 
             // 更新课程关联直播间
             CourseSchedule schedule = new CourseSchedule();
@@ -444,6 +444,7 @@ public class RoomServiceImpl implements RoomService {
                     .eq(ImLiveBroadcastRoom::getRoomUid, roomUid)
                     .last("LIMIT 1")
                     .one();
+            throw new BizException("直播间创建失败，请联系客服");
         }
 
         // 返回直播间信息