From 820468263f74c942f3a0ef1d7d54f089c9c0a665 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, 16 Dec 2025 14:58:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E4=BB=BB=E5=8A=A1=20?=
 =?UTF-8?q?=E7=BB=83=E6=AD=8C=E6=88=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/RoomSong.php |  3 ++-
 application/api/model/Room.php          | 12 ++++++++++++
 application/api/model/RoomSong.php      |  8 +++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/application/api/controller/RoomSong.php b/application/api/controller/RoomSong.php
index adba7ebd..3802f0e9 100644
--- a/application/api/controller/RoomSong.php
+++ b/application/api/controller/RoomSong.php
@@ -63,7 +63,8 @@ class RoomSong extends BaseCom
         redis_lock_exit($key_name);
         $room_id = input('room_id');
         $now_room_song_id = input('now_did');
-        $res = model('RoomSong')->change_song($room_id,$now_room_song_id);
+        $is_auto_next = input('is_auto_next');
+        $res = model('RoomSong')->change_song($room_id,$now_room_song_id,$is_auto_next);
         redis_unlock($key_name);
         return V($res['code'], $res['msg'], $res['data']);
     }
diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index 1bfc0296..1b38acf9 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -3383,6 +3383,18 @@ class Room extends Model
             return $room_ids[array_rand($room_ids)];
         }
 
+        if($task_id == 33){
+            //练歌：type= 1 label =2
+            $room_ids = db::name('vs_room')->alias('a')->join('vs_room_visitor b','a.id = b.room_id','right')
+                ->where(['a.type_id' => 1,'a.label_id' => 2,'a.room_status' => 1,'b.user_id' => ['<>',0]])
+                ->column('a.id');
+            if(!$room_ids){
+                return 0;
+            }
+            //在上面获取 一个随义的id
+            return $room_ids[array_rand($room_ids)];
+        }
+
         return 0;
     }
 
diff --git a/application/api/model/RoomSong.php b/application/api/model/RoomSong.php
index 82b686b0..0b4f3689 100644
--- a/application/api/model/RoomSong.php
+++ b/application/api/model/RoomSong.php
@@ -354,7 +354,7 @@ class RoomSong extends Model
     }
 
     //切歌
-    public function change_song($room_id,$now_room_song_id){
+    public function change_song($room_id,$now_room_song_id,$is_auto_next = 0){
         //根据传过来的参数查询当前场次
         $times = db::name('vs_room_song')->where('did',$now_room_song_id)->value('times');
         //查询下一首歌曲
@@ -423,6 +423,12 @@ class RoomSong extends Model
             'nextInfo' => $next_song_info
         ];
         model('Chat')->sendMsg(1013,$room_id,$text);
+        if($is_auto_next == 1){
+            $uid = db::name('vs_room_song')->where('did',$now_room_song_id)->value('user_id');
+            //任务：33-每日增加练歌房唱5首歌
+            model('Tasks')->tasks_complete($uid,33);
+        }
+
         return ['code'=>1,'msg'=>'切歌成功','data'=>null];
     }