From 13cd6f58b1fb34a723faa3e2e35a847bf6077728 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, 30 Oct 2025 16:33:29 +0800
Subject: [PATCH] =?UTF-8?q?k=E6=AD=8C=E6=88=BF=20=E5=90=8C=E6=84=8F?=
 =?UTF-8?q?=E7=82=B9=E6=AD=8C=E4=BF=AE=E6=94=B9=20=E5=8F=98=E6=88=90?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=BF=E9=97=B4=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/RoomSong.php | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/application/api/model/RoomSong.php b/application/api/model/RoomSong.php
index e5db77b..936cb97 100644
--- a/application/api/model/RoomSong.php
+++ b/application/api/model/RoomSong.php
@@ -93,8 +93,6 @@ class RoomSong extends Model
             return ['code'=>0,'msg'=>'点歌中！请稍后再试！','data'=>null];
         }
         if($type == 1){//1同意 2拒绝
-            //开启事务
-            db::startTrans();
             $res2 = db::name('vs_room')->where('id',$room_id)->field('room_up_pit_type')->find();
             if($res2['room_up_pit_type'] == 2){
                 $data['room_up_pit_type'] = 1;
@@ -104,7 +102,6 @@ class RoomSong extends Model
             $data['is_song'] = 3;
             $res = db::name('vs_room')->where('id',$room_id)->update($data);
             if(!$res){
-                db::rollback();
                 return ['code'=>0,'msg'=>'操作失败,','data'=>null];
             }
 
@@ -116,28 +113,6 @@ class RoomSong extends Model
                     model('RoomPit')->DownPit($v['user_id'],$room_id,$v['pit_number']);
                 }
             }
-
-            //获取房间麦位
-//            $roomPit = db::name('vs_room_pit')->where(['room_id' => $room_id])->count();
-//            if($roomPit == 10){
-//                //麦位增加到22个
-//                $add_pit  = model('RoomPit')->create_room_pit(2,$room_id);
-//                if($add_pit['code'] == 0){
-//                    Db::rollback();
-//                    return ['code' => 0, 'msg' => '操作失败了', 'data' => null];
-//                }
-//            }elseif($roomPit == 22){
-//                //开启11-22麦位
-//                $pit_up = db::name('vs_room_pit')->where(['room_id' => $room_id])
-//                    ->where('pit_number','>',10)
-//                    ->update(['status'=>1]);
-//                if(!$pit_up){
-//                    Db::rollback();
-//                    return ['code' => 0, 'msg' => '操作失败了.', 'data' => null];
-//                }
-//            }
-
-            db::commit();
             //推送消息
             $text = [
                 'text' => '房间类型变成k歌--2'
@@ -160,8 +135,8 @@ class RoomSong extends Model
             }
         }
         //删除申请缓存
-        Cache::rm('apply_song_time_'.$room_id);
-        Cache::rm('apply_song_user_'.$room_id);
+//        Cache::rm('apply_song_time_'.$room_id);
+//        Cache::rm('apply_song_user_'.$room_id);
         return ['code'=>1,'msg'=>'操作成功','data'=>null];
     }