From abcbdffc579eddb50c42487e95ecc4b087098e25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Sat, 13 Sep 2025 18:20:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=8D=E5=8D=96=E4=B8=AD=20=E4=B8=8D?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E4=BF=AE=E6=94=B9=E6=88=BF=E9=97=B4=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Room.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index adb2a11..12de0cc 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -1761,6 +1761,13 @@ class Room extends Model
             return ['code' => 0, 'msg' => '请先结束交友后在修改房间类型', 'data' => null];
         }
 
+        if($roomInfo['type_id'] == 2){
+            $room_auction = db::name('vs_room_auction')->where(['room_id' => $room_id,'status' => 2])->select();
+            if($room_auction){
+                return ['code' => 0, 'msg' => '请先结束竞拍后在修改房间类型', 'data' => null];
+            }
+        }
+
         //开启事务
         db::startTrans();
         $data = [];