|
@@ -1814,8 +1814,6 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
|
|
|
/**
|
|
|
* 导出直播间预约用户信息
|
|
|
*
|
|
|
- * @param query
|
|
|
- * @param response
|
|
|
*/
|
|
|
public void exportReservationRoomUser(RoomReservationUserSearch query, HttpServletResponse response) throws IOException {
|
|
|
//训练营详情-查询条件时间设置
|
|
@@ -1850,7 +1848,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
|
|
|
@Override
|
|
|
public PageInfo<LiveRoomGoodsOrderVo> queryLiveRoomGoodsOrderList(LiveRoomGoodsOrderQueryInfo queryInfo) {
|
|
|
PageInfo<LiveRoomGoodsOrderVo> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
|
|
|
- Map<String, Object> params = new HashMap<String, Object>();
|
|
|
+ Map<String, Object> params = new HashMap<>();
|
|
|
MapUtil.populateMap(params, queryInfo);
|
|
|
|
|
|
List<LiveRoomGoodsOrderVo> dataList = null;
|
|
@@ -1912,7 +1910,6 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
|
|
|
/**
|
|
|
* 直播群成员在线状态回调处理
|
|
|
*
|
|
|
- * @param callbackOnMemberStateChange
|
|
|
*/
|
|
|
@Override
|
|
|
@Transactional
|
|
@@ -1922,7 +1919,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- Integer onlineStatus = callbackOnMemberStateChange.getEventType().equals("Online")?1:0;
|
|
|
+ int onlineStatus = callbackOnMemberStateChange.getEventType().equals("Online")?1:0;
|
|
|
|
|
|
// 用户id
|
|
|
if (CollectionUtils.isEmpty(callbackOnMemberStateChange.getMemberList())) {
|
|
@@ -1962,6 +1959,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
+ @Transactional
|
|
|
public void callbackAfterMemberExit(TencentData.CallbackAfterMemberExit callbackAfterMemberExit) {
|
|
|
if (callbackAfterMemberExit == null) {
|
|
|
return;
|
|
@@ -1994,6 +1992,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
+ @Transactional
|
|
|
public void callbackAfterNewMemberJoin(TencentData.CallbackAfterNewMemberJoin callbackAfterNewMemberJoin) {
|
|
|
if (callbackAfterNewMemberJoin == null) {
|
|
|
return;
|