diff --git a/application/api/model/Room.php b/application/api/model/Room.php index 31e7814..5dc301c 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -1716,12 +1716,12 @@ class Room extends Model foreach ($room_auction as $v){ model('RoomAuction')->room_auction_end($room_id,$v['auction_id']); } - //拍卖位上是否有人 - $an = Cache::get('auction_user_'.$room_id); - if($an){ - //拍卖位下麦 - model('api/RoomPit')->host_user_pit($uid,$room_id,888,$an,2); - } + } + //拍卖位上是否有人 + $an = Cache::get('auction_user_'.$room_id); + if($an){ + //拍卖位下麦 + model('api/RoomPit')->host_user_pit($uid,$room_id,888,$an,2); } } if($type == 2){ diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php index 4f72e09..9116893 100644 --- a/application/api/model/RoomPit.php +++ b/application/api/model/RoomPit.php @@ -925,7 +925,7 @@ class RoomPit extends Model if(!$pit_number || $pit_number == 888){ $roomInfo = db::name('vs_room')->where('id',$room_id)->field('label_id,type_id')->find(); - if($roomInfo['type_id'] == 2){//拍卖 + if($roomInfo['type_id'] == 2 || Cache::get('auction_user_'.$room_id)){//拍卖 //查询当前是否处于拍卖中 $auctioning = db::name('vs_room_auction') ->where(['room_id' => $room_id, 'status' => 2, 'user_id' => $accept_user_id])->find();