|
@@ -23,6 +23,7 @@ import com.microsvc.toolkit.middleware.live.LivePluginService;
|
|
|
import com.microsvc.toolkit.middleware.live.impl.RongCloudLivePlugin;
|
|
|
import com.microsvc.toolkit.middleware.live.impl.TencentCloudLivePlugin;
|
|
|
import com.microsvc.toolkit.middleware.live.message.*;
|
|
|
+import com.yonge.cooleshow.api.feign.dto.RoomConfig;
|
|
|
import com.yonge.cooleshow.biz.dal.dto.LiveRoomStatus;
|
|
|
import com.yonge.cooleshow.biz.dal.dto.TencentData;
|
|
|
import com.yonge.cooleshow.biz.dal.entity.*;
|
|
@@ -358,20 +359,26 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
|
|
|
|
|
|
// 如果是同时在管乐迷和酷乐秀直播的老师
|
|
|
|
|
|
+ LiveRoom room = new LiveRoom();
|
|
|
String teacherIds = sysConfigService.findConfigValue(SysConfigConstant.LIVE_TEACHER_IDS);
|
|
|
if (StringUtils.isNotBlank(c.getRoomUid())) {
|
|
|
if ((StringUtils.isBlank(teacherIds) || !Arrays.asList(teacherIds.split(",")).contains(c.getTeacherId().toString()))) {
|
|
|
log.info("createCourseLiveRoom>>>roomUid:{} 已存在", c.getRoomUid());
|
|
|
return;
|
|
|
} else {
|
|
|
- LiveRoom room = getByRoomUid(c.getRoomUid());
|
|
|
- if (room != null) {
|
|
|
+ LiveRoom liveRoom = getByRoomUid(c.getRoomUid());
|
|
|
+ if (liveRoom != null) {
|
|
|
log.info("createCourseLiveRoom>>>roomUid:{} 已存在", c.getRoomUid());
|
|
|
return;
|
|
|
+ } else {
|
|
|
+ // 设置直播间不显示购物车
|
|
|
+ RoomConfig roomConfig = new RoomConfig();
|
|
|
+ roomConfig.setWhether_view_shop_cart(0);
|
|
|
+ room.setRoomConfig(JSON.toJSONString(roomConfig));
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- LiveRoom room = new LiveRoom();
|
|
|
if (StringUtils.isBlank(c.getRoomUid())) {
|
|
|
room.setRoomUid(GenRoomUid.apply(c.getTeacherId(), en));
|
|
|
} else {
|