diff --git a/application/api/model/BarRoom.php b/application/api/model/BarRoom.php index 619989d8..869e5d6e 100644 --- a/application/api/model/BarRoom.php +++ b/application/api/model/BarRoom.php @@ -39,7 +39,7 @@ class BarRoom extends Model - //实在房间麦位时长 + //设置房间麦位时长 public function set_pit_duration($room_id,$time){ $room = db::name('vs_room')->where(['id' => $room_id, 'delete_time' => 0, 'room_status' => 1])->find(); if(!$room){ diff --git a/application/api/model/Room.php b/application/api/model/Room.php index 5b6faf71..85cdf8da 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -1201,7 +1201,7 @@ class Room extends Model $user_pit = db::name('vs_room_pit')->where(['room_id' => $room_id,'user_id' => $user_id])->find(); break; case 11://酒吧房 - $pit_list = $this->room_pit($room_id); + $pit_list = $this->room_pit($room_id,$room_type); $user_pit = db::name('vs_room_pit')->where(['room_id' => $room_id,'user_id' => $user_id])->find(); break ; } @@ -1896,7 +1896,7 @@ class Room extends Model //房间麦位信息 - public function room_pit($room_id) + public function room_pit($room_id,$room_type = 0) { //麦位信息 $pit_list = db::name('vs_room_pit')->alias('a')->join('user b', 'a.user_id = b.id', 'left') @@ -1916,6 +1916,17 @@ class Room extends Model $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')??2; + if($room_type == 11){ + $user_gift = model('api/GiftNew')->get_custom_gift_list($value['user_id']); + if(count($user_gift['data']) > 0){ + $value['had_custom_gift'] = 1; + }else{ + $value['had_custom_gift'] = 0; + } + }else{ + $value['had_custom_gift'] = 0; + } + } } return $pit_list;