From 965718a18e336286df0d30ae88324d2c69d70301 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:43:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E9=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/RoomPit.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php
index a2453839..060b575e 100644
--- a/application/api/model/RoomPit.php
+++ b/application/api/model/RoomPit.php
@@ -376,8 +376,8 @@ class RoomPit extends Model
                 if($pit_infos['pit_number'] == 9){
                     return ['code' => 0, 'msg' => '主持不允许换麦', 'data' => null];
                 }
-                $exchange1 = db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => $pit_infos['pit_number']])->update([ 'user_id' => 0]);
-                $exchange = db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => $pit_number])->update([ 'user_id' => $user_id]);
+                $exchange1 = db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => $pit_infos['pit_number']])->update([ 'user_id' => 0, 'end_time' => 0]);
+                $exchange = db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => $pit_number])->update([ 'user_id' => $user_id,'end_time' => $pit_infos['end_time']]);
                 if(!$exchange || !$exchange1){
                     return ['code' => 0, 'msg' => '换麦失败', 'data' => null];
                 }
@@ -399,8 +399,7 @@ class RoomPit extends Model
                 $text['to_pit_number'] = $pit_number;
                 $text['end_time'] = $pit_infos['end_time'];
                 model('Chat')->sendMsg(1039,$room_id,$text);
-                //处理前麦上的时间
-                db::name('vs_room_pit')->where(['id' => $pit_infos['id']])->update([ 'end_time' =>0]);
+
                 //查看此房间是否处于pk中
                 $is_pk = db::name('vs_room_pk')->where(['room_id_a' => $room_id])->where(['status' => ['in',[2,3,4]]])->value('room_id_b') ?? 0;
                 if(!$is_pk){