From b7f782db4a2ee90fe9dfa0726b00c74e727b87ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Thu, 8 Jan 2026 17:06:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=89=93=E8=B5=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/RoomPit.php | 4 +++-
 application/api/model/RoomPit.php      | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/application/api/controller/RoomPit.php b/application/api/controller/RoomPit.php
index 19cfce76..618b4486 100644
--- a/application/api/controller/RoomPit.php
+++ b/application/api/controller/RoomPit.php
@@ -30,7 +30,9 @@ class RoomPit extends BaseCom
         }elseif($room_type == 11){
             //9麦位，10麦位 不做$gift_id校验
             if($pit_number != 9 && $pit_number != 10){
-                if($gift_id == 0){
+                //有麦位就是换麦
+                $pit_infos = db::name('vs_room_pit')->where(['room_id' => $room_id, 'user_id' => $this->uid])->value('pit_number')??0;
+                if($gift_id == 0 && $pit_infos == 0){
                     return V(0, '请选择礼物', null);
                 }
             }
diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php
index 3ca9b104..41093354 100644
--- a/application/api/model/RoomPit.php
+++ b/application/api/model/RoomPit.php
@@ -56,6 +56,7 @@ class RoomPit extends Model
         if($roomtype == 11 && ($pit_number != 9 || $pit_number != 10)){
             $pit_time = db::name('vs_room_bar')->where('id',$room_id)->value('pit_time') ?? 5;
             $text['end_time'] = time()+$pit_time * 60;
+            $text['had_custom_gift'] = db::name('vs_user_custom_gift')->where(['user_id' => $user_id,'gift_remark_name' => ['<>','']])->find()?1:0;
         }else{
             $text['end_time'] = 0;
         }
@@ -1009,7 +1010,7 @@ class RoomPit extends Model
                     return ['code' => 0, 'msg' => '此类型房间  不能上7、8号麦位', 'data' => null];
                 }
             }
-            if($room_type == 11){
+            if($room_type == 11 && $pit_number != 10){
                 $text['text'] = '邀请你上麦';
                 $text['user_id'] = $accept_user_id;
                 $text['pit_number'] = $pit_number;