点唱房

application/api/model/SingerSong.php

@@ -94,12 +94,25 @@ class SingerSong extends Model
      */
     public function getSong($user_id, $room_id)
     {
-        //查询当前房间内麦位上的歌手
-        $room_singer = db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => ['<',9]])->column('user_id');
-        if ($room_singer) {
-            foreach ($room_singer as $v){
-                $res = db::name('vs_singer_song')->where(['user_id' => $v])->find();
+        if($user_id > 0){
+            $res = db::name('vs_singer_song')->where(['user_id' => $user_id])->select();
+        }else{
+            //查询当前房间内麦位上的歌手
+            $room_singer = db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => ['<',9]])->column('user_id');
+            if ($room_singer) {
+                $res = db::name('vs_singer_song')->where(['user_id' => ['in', $room_singer]])->select();
+            }else{
+                $res = [];
             }
         }
+        if ($res) {
+            foreach ($res as $k => $v) {
+                $res[$k]['gift_name'] = db::name('vs_gift')->where(['gid' => $v['gift_id']])->value('gift_name');
+            }
+            return ['code' => 1, 'msg' => '获取成功', 'data' => $res];
+        } else {
+            return ['code' => 0, 'msg' => '暂无数据'];
+        }
+
     }
 }