From 33bc871529c3fca99462a67bb658a503ada85de8 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, 6 Jan 2026 19:37:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=92=E5=90=A7=E6=88=BF=E4=B8=8A=E9=BA=A6?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=20=E9=80=89=E6=8B=A9=E7=A4=BC?=
 =?UTF-8?q?=E7=89=A9=E5=92=8C=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/RoomPit.php | 11 +++++++----
 application/api/model/RoomPit.php      | 15 +++++++++------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/application/api/controller/RoomPit.php b/application/api/controller/RoomPit.php
index 109e6197..d6ae80f5 100644
--- a/application/api/controller/RoomPit.php
+++ b/application/api/controller/RoomPit.php
@@ -24,14 +24,17 @@ class RoomPit extends BaseCom
         if($room_type == 0){
             return V(0, '房间不存在', null);
         }
-
+        $gift_id = input('gift_id', 0);//酒吧房上其他麦需要带礼物
         if($room_type == 2){
             $reslut = model('RoomSong')->apply_kpit($this->uid, $room_id,$pit_number);
         }elseif($room_type == 11){
-            $gift_id = input('gift_id', 0);
-            if($gift_id == 0){
-                return V(0, '请选择礼物', null);
+            //9麦位，10麦位 不做$gift_id校验
+            if($pit_number != 9 && $pit_number != 10){
+                if($gift_id == 0){
+                    return V(0, '请选择礼物', null);
+                }
             }
+
             $reslut = model('RoomPit')->apply_pit_bar($this->uid, $room_id,$gift_id,$pit_number);
         }else{
             $reslut = model('RoomPit')->apply_pit($this->uid, $room_id,$pit_number);
diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php
index 0010c2c4..732cc6ff 100644
--- a/application/api/model/RoomPit.php
+++ b/application/api/model/RoomPit.php
@@ -52,7 +52,15 @@ class RoomPit extends Model
     //用户上麦
     public function OnPit($user_id,$room_id,$pit_number)
     {
-        $on = $this->where(['room_id' => $room_id, 'pit_number' => $pit_number])->update(['user_id' => $user_id]);
+        $roomtype = db::name('vs_room')->where(['id' => $room_id])->value('type_id');
+        if($roomtype == 11){
+            $pit_time = db::name('vs_room_bar')->where('id',$room_id)->value('pit_time') ?? 5;
+            $text['end_time'] = time()+$pit_time * 60;
+        }else{
+            $text['end_time'] = 0;
+        }
+
+        $on = $this->where(['room_id' => $room_id, 'pit_number' => $pit_number])->update(['user_id' => $user_id,'end_time' => $text['end_time']]);
         if(!$on){
             return ['code' => 0, 'msg' => '上麦失败', 'data' => null];
         }
@@ -61,7 +69,6 @@ class RoomPit extends Model
         $FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $user_id,'room_id' => $room_id])->value('is_online');
         $FromUserInfo['charm'] =  db::name('vs_room_user_charm')->where(['user_id' => $user_id,'room_id' => $room_id])->value('charm');
 
-        $roomtype = db::name('vs_room')->where(['id' => $room_id])->value('type_id');
         if($roomtype == 10){
             if($pit_number == 1){
                 $pit_text = '签约麦';
@@ -91,10 +98,6 @@ class RoomPit extends Model
                 $pit_text = $pit_number . '号麦';
             }
         }
-        if($roomtype == 11){
-            $pit_time = db::name('vs_room_bar')->where('id',$room_id)->value('pit_time') ?? 5;
-            $text['end_time'] = time()+$pit_time * 60;
-        }
 
         $text['text'] = $FromUserInfo['nickname'].' 上了 ' . $pit_text;
         $text['FromUserInfo'] = $FromUserInfo;