From 3824fae6951f1d7257942d3bd3f0402f3a5497ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Wed, 31 Dec 2025 17:59:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=88=BF=E9=97=B4=20?=
 =?UTF-8?q?=E4=B8=8A=E9=BA=A6=E5=8F=96=E6=B6=88=E9=9A=90=E8=97=8F=20?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=85=B3=E9=97=AD=20=E7=82=B9=E6=AD=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/RoomSong.php |  8 ++++++++
 application/api/model/RoomPit.php       |  2 +-
 application/api/model/RoomSong.php      | 23 +++++++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/application/api/controller/RoomSong.php b/application/api/controller/RoomSong.php
index e3367435..02d8b2dd 100644
--- a/application/api/controller/RoomSong.php
+++ b/application/api/controller/RoomSong.php
@@ -49,6 +49,14 @@ class RoomSong extends BaseCom
         return V($res['code'], $res['msg'], $res['data']);
     }
 
+    //删除歌曲
+    public function del_song(){
+        $room_song_id = input('did');
+        $room_id = input('room_id');
+        $res = model('RoomSong')->del_song($this->uid,$room_song_id,$room_id);
+        return V($res['code'], $res['msg'], $res['data']);
+    }
+
 
     //上移歌 $type 1上移 2置顶
     public function up_song(){
diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php
index acb316ef..5176040d 100644
--- a/application/api/model/RoomPit.php
+++ b/application/api/model/RoomPit.php
@@ -83,7 +83,7 @@ class RoomPit extends Model
                 //查询房间是否隐藏
                 $is_hide = db::name('vs_room')->where(['id' => $room_id])->value('is_show_room');
                 if($is_hide == 2){
-                    db::name('vs_room')->where(['id' => $room_id])->update(['is_show_room' => 1]);
+//                    db::name('vs_room')->where(['id' => $room_id])->update(['is_show_room' => 1]);
                 }
             }elseif ($pit_number == 10) {
                 $pit_text = '嘉宾麦';
diff --git a/application/api/model/RoomSong.php b/application/api/model/RoomSong.php
index 3692ab5d..ff9c936d 100644
--- a/application/api/model/RoomSong.php
+++ b/application/api/model/RoomSong.php
@@ -291,6 +291,29 @@ class RoomSong extends Model
     }
 
 
+    //删除已点歌曲
+    public function del_song($user_id,$did,$room_id){
+        //查询当前用户是否是在9号麦的主持
+        $is_host = db::name('vs_room_pit')->where(['user_id' => $user_id,'room_id' => $room_id,'pit_number' =>9])->find();
+        if(!$is_host){
+            return ['code'=>0,'msg'=>'您没有权限操作','data'=>null];
+        }
+        $is_song = db::name('vs_room_song')->where(['did' => $did,'status' => 2])->find();
+        if($is_song){
+            return ['code'=>0,'msg'=>'演唱中不能删除','data'=>null];
+        }
+        $next_song = Cache::get("api:room:song:nextInfo:" . $room_id);
+        if($did == $next_song){
+            return ['code'=>0,'msg'=>'下一首播放歌曲不能删除','data'=>null];
+        }
+        $res = db::name('vs_room_song')->where(['did' => $did,'status' => 1])->delete();
+        if(!$res){
+            return ['code'=>0,'msg'=>'操作失败','data'=>null];
+        }
+        return ['code'=>1,'msg'=>'操作成功','data'=>null];
+    }
+
+
     //上移歌 $type 1上移 2置顶
     public function up_song($user_id,$room_song_id,$type=1){
         //查询当前数据的信息