diff --git a/application/api/model/Room.php b/application/api/model/Room.php index 5ac94a27..295a14bb 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -592,7 +592,7 @@ class Room extends Model //1:其他房间游戏中不让退出 给前端返回房间ID, //2:允许退出,强行退出…… $room_user = db::name('vs_room_visitor')->where(['user_id' => $user_id])->order('id desc')->value('room_id'); - if (isset($room_user) && $room_user != $room_id) { + if ($room_user && $room_user != $room_id) { //是否在竞拍位 $auctionn = db::name('vs_room_auction')->where(['room_id' => $room_user, 'user_id' => $user_id,'status' => 2])->find(); //是否交友 @@ -676,7 +676,7 @@ class Room extends Model $value['mic_cycle'] = model('api/Decorate')->user_decorate_detail($value['user_id'],3); $value['nobility_image'] = $Nobility['play_image']; $value['nickname_color'] = $Nobility['nick_name_color']; - $value['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $value['user_id'],'room_id' => $room_id])->value('is_online'); + $value['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $value['user_id'],'room_id' => $room_id])->value('is_online')??2; } } $user_pit = db::name('vs_room_pit')->where(['room_id' => $room['id'],'user_id' => $user_id])->find(); diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php index 70652d04..64e8e11f 100644 --- a/application/api/model/RoomPit.php +++ b/application/api/model/RoomPit.php @@ -232,7 +232,12 @@ class RoomPit extends Model if($pit_number <= 0){ $pit_number = db::name('vs_room_pit')->where(['room_id' => $room_id, 'user_id' => $user_id])->value('pit_number'); } - $down = $this->where(['room_id' => $room_id, 'user_id' => $user_id])->update(['user_id' => 0, 'before_pit_number' => 0]); + //查找所在麦位 然后修改他 + $pit_info = $this->where(['room_id' => $room_id, 'pit_number' => $pit_number,'user_id' => $user_id])->find(); + if(!$pit_info){ + return ['code' => 0, 'msg' => '该用户已不在'.$pit_text, 'data' => null]; + } + $down = $this->where(['id' => $pit_info['id'] ])->update(['user_id' => 0, 'before_pit_number' => 0]); if(!$down){ return ['code' => 0, 'msg' => '下麦失败', 'data' => null]; }