From 8efa22b51744097580d268ad7ddc20a037cfa707 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Tue, 23 Sep 2025 23:28:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E6=88=BF=E9=97=B4=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=20=E6=8B=8D=E5=8D=96=E4=BD=8D=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Room.php    | 12 ++++++------
 application/api/model/RoomPit.php |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

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();