From b3e63d74ac79b7a4bd79e2d005d83de8d97a355c 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 09:35:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E9=85=92=E5=90=A7=E6=88=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Room.php | 380 +--------------------------------
 1 file changed, 3 insertions(+), 377 deletions(-)

diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index e64165db..537e8372 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -663,380 +663,6 @@ class Room extends Model
         ];
     }
 
-    //进入房间
-    public function join_rooms($user_id, $room_id, $password) {
-        $room = db::name('vs_room')->where(['id' => $room_id,'apply_status' => ['in',[1,2]]])->find();
-        if(isset($room['password']) && $user_id != $room['user_id']){
-            if (empty($password) || $room['password'] != md5($password)) {
-                return ['code' => 0, 'msg' => '密码错误',   'data' => ''];
-            }
-        }
-
-        //K歌模式下获取歌曲信息
-        $song_pit_list = null;
-        $song_list = null;
-        $next_song_info = null;
-        //拍卖模式下获取当前竞拍信息
-        $roomauction = null;
-
-        $user_pit = 0;
-        $pit_list = [];
-        $cp_users = null;
-        if($room['type_id'] == 1 || $room['type_id'] == 3 || $room['type_id'] == 4 || $room['type_id'] == 7 || $room['type_id'] == 8 || $room['type_id'] == 9 || $room['type_id'] == 10) {//1点唱，3男神，4女神
-            if($room['label_id'] == 2){//K歌
-                $song = $this->get_song_info($room_id,$user_id);
-                $song_list = $song['song_user_info'];
-                $next_song_info = $song['nextInfo'];
-                $pit_list = $song['pit_list'];
-                $user_pit = $song['user_pit'];
-                $song_pit_list = $song['song_pit_list'];
-            }else{
-                //麦位信息
-                $pit_list = db::name('vs_room_pit')->alias('a')->join('user b', 'a.user_id = b.id', 'left')
-                    ->where(['a.room_id' => $room['id'],'a.status' => 1])
-                    ->field('a.id,a.user_id,a.pit_number,a.is_lock,a.is_mute,a.count_down,b.nickname,b.avatar,b.sex,b.user_code')
-                    ->order('a.pit_number asc')->select();
-                foreach ($pit_list as &$value) {
-                    $value['charm'] = 0;
-                    $value['dress'] = '';
-                    $value['is_online'] = 2;
-                    if (isset($value['user_id']) && $value['user_id'] > 0) {
-                        $value['charm'] = db::name('vs_room_user_charm')->where(['room_id' => $room['id'], 'user_id' => $value['user_id']])->value('charm');
-                        $value['dress'] = model('api/Decorate')->user_decorate_detail($value['user_id'], 1);
-                        $value['user_code'] = model('api/Decorate')->user_decorate_detail($value['user_id'], 6);
-                        $Nobility = model('api/Nobility')->getUserNobilityInfo($value['user_id']);
-//                        $value['nobility_info'] = $Nobility;
-                        $value['mic_cycle'] = model('api/Decorate')->user_decorate_detail($value['user_id'],3);
-                        $value['nobility_image'] = $Nobility['play_image'];
-                        $value['nickname_color'] = $Nobility['nick_name_color'];
-                        $value['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $value['user_id'],'room_id' => $room_id])->value('is_online')??2;
-                    }
-                }
-                $user_pit = db::name('vs_room_pit')->where(['room_id' => $room['id'],'user_id' => $user_id])->find();
-            }
-
-        }elseif ($room['type_id'] == 2){//拍卖 auction_room
-            $roomauction = $this->auction_room($room_id,$user_id);
-            $pit_list = $roomauction['pit_list'];
-            $user_pit = $roomauction['user_pit'];
-        }elseif($room['type_id'] == 6){
-            //查看房间时间是否已到期
-            $room_time = db::name('vs_room_cp_movie')->where(['room_id' => $room['id']])->value('time_day');
-            if($room_time <= time()){
-                db::name('vs_room')->where(['id' => $room_id])->update(['room_status' => 3]);
-                db::name('vs_room_cp_movie')->where(['room_id' => $room['id']])->update(['status' => 2]);
-                model('api/Tencent')->delete_group('room'.$room_id);
-                return ['code' => 0, 'msg' => 'cp房间已到期',   'data' => ''];
-            }
-            $room_status = db::name('vs_room_cp_movie')->where(['room_id' => $room['id']])->value('status');
-            if($room_status == 4){
-                db::name('vs_room')->where(['id' => $room_id])->update(['room_status' => 3]);
-                return ['code' => 0, 'msg' => '房间已被迫结束',   'data' => ''];
-            }
-            $cp_users = db::name('vs_room_cp_movie')->alias('a')
-                ->join('user b', 'a.user_id = b.id', 'left')
-                ->join('user c', 'a.user_id1 = c.id', 'left')
-                ->where(['room_id' => $room['id'],'a.status' => 1])
-                ->field('a.time_day,a.cp_id,a.user_id,a.user_id1,b.nickname,c.nickname as nickname1,b.avatar,c.avatar as avatar1,b.user_code,c.user_code as user_code1')
-                ->find();
-            //非cp房用户不得进入
-            if($cp_users['user_id'] != $user_id && $cp_users['user_id1'] != $user_id){
-                return ['code' => 0, 'msg' => '您不是房间的cp用户，请勿进入',   'data' => ''];
-            }
-            $cp_users['dress'] = model('api/Decorate')->user_decorate_detail($cp_users['user_id'],1);
-            $cp_users['dress1'] = model('api/Decorate')->user_decorate_detail($cp_users['user_id1'],1);
-            if($cp_users['user_id'] == $user_id){
-                $room_name = db::name('user')->where('id', $cp_users['user_id1'])->value('nickname');
-            }
-            if($cp_users['user_id1'] == $user_id){
-                $room_name = db::name('user')->where('id', $cp_users['user_id'])->value('nickname');
-            }
-            $room['room_name'] = '我 ❤️ '.$room_name;
-        }
-
-        //记录用户进入房间
-        $is_join = db::name('vs_room_visitor')->where(['room_id' => $room_id, 'user_id' => $user_id])->find();
-        if (!$is_join) {
-            db::name('vs_room_visitor')->insert(['room_id' => $room_id, 'user_id' => $user_id, 'createtime' => time()]);
-        }else{
-            db::name('vs_room_visitor')->where('id', $is_join['id'])->update(['createtime' => time(),'is_online' => 1]);
-        }
-        db::name('user_data')->where('user_id', $user_id)->update(['room_id' => $room_id]);
-        //进入房间保持心跳
-        $is_xintiao = db::name('vs_room_heartbeat')->where(['user_id' => $user_id, 'room_id' => $room_id])->find();
-        if($is_xintiao){
-            db::name('vs_room_heartbeat')->where('id' , $is_xintiao['id'])->update(['updatetime' => time()]);
-        }else{
-            db::name('vs_room_heartbeat')->insert([
-                'user_id' => $user_id,
-                'room_id' => $room_id,
-                'createtime' => time(),
-                'updatetime' => time()
-            ]);
-        }
-        $tet['text'] = '回到房间';
-        $tet['user_id'] = $user_id;
-        $tet['type'] = 1;
-        model('api/Chat')->sendMsg(1058,$room_id,$tet);
-
-        $room['is_use_code'] = 0;
-        $liang = model('api/Decorate')->user_decorate_detail($room['id'],7);
-        if($liang != $room['room_number']){
-            $room['is_use_code'] = 1;
-            $room['room_number'] = $liang;
-        }
-
-        //头条
-        $headline = db::name('vs_headline')->where('end_time' , '>', time())->where('is_now',  1)->find();
-        $headline_data = null;
-        if($headline){
-            $headline_data = $headline;
-            $headline_data['nickname'] = db::name('user')->where('id', $headline['user_id'])->value('nickname');
-            $headline_data['avatar'] = db::name('user')->where('id', $headline['user_id'])->value('avatar');
-        }
-        if($room['label_id'] == 3){
-            $label_id = 2;
-        }elseif ($room['label_id'] == 4){
-            $label_id = 1;
-        }else{
-            $label_id = $room['label_id'];
-        }
-
-        //判断当前房间是否正在pk
-        //pk信息
-        $pk_info = null;
-        $is_pk = db::name('vs_room_pk')->where(['room_id_a' => $room_id])->where(['status' => ['in',[2,3,4]]])
-            ->field('pk_id,create_user_id,receive_user_id,room_id_b,create_value_a,receive_value_b,pk_times,start_time,status,updatetime')->find();
-        if($is_pk){
-            $pk_info['pk_room_id'] = $is_pk['room_id_b'];//对方房间id
-            $pk_info['invite_pk_user_id'] = $is_pk['create_user_id'];//发起pk用户id
-            $pk_info['receive_pk_user_id'] = $is_pk['receive_user_id'];//接受者用户id
-            $pk_info['pk_id'] = $is_pk['pk_id'];//pkid
-            $pk_info['pk_end_times'] = $is_pk['start_time'] + $is_pk['pk_times'] * 60;//pk结束时间
-            $pk_info['my_room_value'] = $is_pk['create_value_a'];//自己房间的值
-            $pk_info['pk_room_value'] = $is_pk['receive_value_b'];//对方房间的值
-            $pk_info['pk_part'] = $is_pk['status'];
-            if($is_pk['status'] == 2){
-                $pk_info['pk_end_times'] = $is_pk['updatetime'] + 300;
-            }elseif($is_pk['status'] == 3){
-                $pk_info['pk_end_times'] = $is_pk['start_time'] + $is_pk['pk_times'] * 60;
-            }elseif($is_pk['status'] == 4){
-                $pk_info['pk_end_times'] = $is_pk['updatetime'] + 300;
-                if($is_pk['create_value_a'] > $is_pk['receive_value_b']){
-                    $pk_info['create_type'] = 1;//赢
-                    $pk_info['receive_type'] = 0;//输
-                }elseif ($is_pk['create_value_a'] = $is_pk['receive_value_b']){
-                    $pk_info['create_type'] = 2;//平局
-                    $pk_info['receive_type'] = 2;//平局
-                }else{
-                    $pk_info['create_type'] = 0;//输
-                    $pk_info['receive_type'] = 1;//赢
-                }
-            }
-        }else{
-            $is_pk = db::name('vs_room_pk')->where(['room_id_b' => $room_id])->where(['status' => ['in',[2,3,4]]])
-                ->field('pk_id,create_user_id,receive_user_id,room_id_a,create_value_a,receive_user_id,receive_value_b,pk_times,start_time,status,updatetime')->find();
-            if($is_pk){
-                $pk_info['pk_room_id'] = $is_pk['room_id_a'];
-                $pk_info['invite_pk_user_id'] = $is_pk['create_user_id'];
-                $pk_info['receive_pk_user_id'] = $is_pk['receive_user_id'];//接受者用户id
-                $pk_info['pk_id'] = $is_pk['pk_id'];
-                $pk_info['pk_end_times'] = $is_pk['start_time'] + $is_pk['pk_times'] * 60;
-                $pk_info['my_room_value'] = $is_pk['receive_value_b'];
-                $pk_info['pk_room_value'] = $is_pk['create_value_a'];
-                $pk_info['pk_part'] = $is_pk['status'];
-                if($is_pk['status'] == 2){
-                    $pk_info['pk_end_times'] = $is_pk['updatetime'] + 300;
-                }elseif($is_pk['status'] == 3){
-                    $pk_info['pk_end_times'] = $is_pk['start_time'] + $is_pk['pk_times'] * 60;
-                }elseif($is_pk['status'] == 4){
-                    $pk_info['pk_end_times'] = $is_pk['updatetime'] + 300;
-                    if($is_pk['create_value_a'] > $is_pk['receive_value_b']){
-                        $pk_info['create_type'] = 1;//赢
-                        $pk_info['receive_type'] = 0;//输
-                    }elseif ($is_pk['create_value_a'] = $is_pk['receive_value_b']){
-                        $pk_info['create_type'] = 2;//平局
-                        $pk_info['receive_type'] = 2;//平局
-                    }else{
-                        $pk_info['create_type'] = 0;//输
-                        $pk_info['receive_type'] = 1;//赢
-                    }
-                }
-            }
-        }
-
-        //上次的PK参数
-        if($room['last_pk_room_id'] > 0){
-            $last_pk_room_id = $room['last_pk_room_id'];
-        }else{
-            $last_pk_info = db::name('vs_room_pk')->where(['room_id_a' => $room_id])->order('pk_id', 'desc')->find();
-            if($last_pk_info){
-                $last_pk_room_id = $last_pk_info['room_id_b'];
-            }else{
-                $last_pk_info1 = db::name('vs_room_pk')->where(['room_id_b' => $room_id])->order('pk_id', 'desc')->find();
-                if($last_pk_info1){
-                    $last_pk_room_id = $last_pk_info1['room_id_a'];
-                }else{
-                    $last_pk_room_id = 0;
-                }
-            }
-        }
-
-        //点唱房内的演唱信息
-        $singer_info = $this->getSingInfo($room_id);
-
-        //房间信息
-        $room_info = [
-            'room_id' => $room['id'],
-            'is_use_code' => $room['is_use_code'],
-            'room_number' => $room['room_number'],
-            'room_name' => $room['room_name'],
-            'room_cover' => $room['room_cover'],
-            'room_intro' => $room['room_intro'],
-            'type_id' => $room['type_id'],
-            'type_name' => db::name('vs_room_type')->where('id', $room['type_id'])->value('type_name'),
-            'user_id' => $room['user_id'],
-            'label_id' => $label_id,
-            'label_icon' => db::name('vs_room_label')->where('id', $room['label_id'])->value('label_icon_room'),
-            'room_background' => $room['room_background'],
-            'hot_value' => $room['today_hot_value'],
-            'chatrooms' => 'room'.$room['id'],
-            'pit_list'  => $pit_list,
-            'room_up_pit_type'=>$room['room_up_pit_type'],
-            'online_number' => db::name('vs_room_visitor')->where(['room_id' => $room['id'],'is_online'=>1])->count(),
-            'head_line' => $headline_data,
-            'is_pk' => $room['is_pk'],//1-默认接受PK，2不接受',
-            'last_pk_room_id' => $last_pk_room_id,
-            'queue_number' => db::name('vs_room_pit_apply')->where(['room_id' => $room_id,'status' => 0])->count(),
-        ];
-
-        //房主信息
-        $room_owner = db::name('user')->where('id', $room['user_id'])->field('id as user_id,user_code,sex,nickname,avatar')->find();
-        $room_owner['user_code'] = model('api/Decorate')->user_decorate_detail($room['user_id'],6);
-
-        //当前用户信息
-        $user_info = $this ->get_user_info($room_id,$user_id,$user_pit,1);//用户进入房间 才会获取声网token，更新房间不获取声网token
-        $user_info['is_room_owner'] = ($user_id == $room['user_id']) ? 1 : 0;
-        //推送信息
-        $text['text'] = '欢迎用户 ' . $user_info['nickname'] .' 进入房间';
-        $text['jia_jia'] = model('api/Decorate')->user_decorate_detail($user_id,2);
-        $text['FromUserInfo'] = db::name('user')->where('id',$user_id)->field('id as user_id,nickname,avatar,sex')->find();
-        $text['FromUserInfo']['dress'] = model('api/Decorate')->user_decorate_detail($user_id,1);
-        $text['FromUserInfo']['mic_cycle'] = model('api/Decorate')->user_decorate_detail($user_id,3);
-        $text['FromUserInfo']['chat_bubble'] = model('api/Decorate')->user_decorate_detail($user_id,9);
-
-        $is_hide = db::name('user')->where('id', $user_id)->value('hide_status');
-        if($is_hide != 1){//不是隐身
-            $Nobility = model('api/Nobility')->getUserNobilityInfo($user_id);
-            $text['FromUserInfo']['enter_image'] = $Nobility['enter_image'];
-            $text['FromUserInfo']['enter_text'] = '欢迎 ' . $Nobility['nobility_name'] .' 进入房间';
-            model('api/Chat')->sendMsg(1001,$room_id,$text,$user_id);
-
-            //当前用户不是隐身状态的时候触发CP特效
-              //获取房间内的用户 和当前用户 查找是否有有效CPzone
-            $user_list = db::name('vs_room_visitor')
-                ->where(['room_id' => $room_id])
-                ->column('user_id'); // 使用column直接获取一维数组
-
-            $cpzone_list = db::name('user_cp_zone')
-                ->where(['status' => 1])
-                ->where(function($query) use ($user_id) {
-                    $query->whereOr(['user_id1' => $user_id])
-                        ->whereOr(['user_id2' => $user_id]);
-                })
-                ->select();
-
-            if ($cpzone_list) {
-                foreach ($cpzone_list as $cpzone) {
-                    // 获取CP伙伴的用户ID
-                    $partner_id = ($cpzone['user_id1'] == $user_id) ? $cpzone['user_id2'] : $cpzone['user_id1'];
-
-                    // 检查CP伙伴是否在房间内
-                    if (in_array($partner_id, $user_list)) {
-                        // 推送CP特效
-                        $ttex['rights_icon'] = model('api/Decorate')->user_decorate_detail($user_id, 10);
-                        $ttex['FromUserInfo'] = db::name('user')->where('id', $user_id)->field('id as user_id,nickname,avatar,sex')->find();
-                        $ttex['ToUserInfo'] = db::name('user')->where('id', $partner_id)->field('id as user_id,nickname,avatar,sex')->find();
-                        $ttex['text'] = 'CP特效';
-                        model('api/Chat')->sendMsg(1080, $room_id, $ttex);
-                    }
-                }
-            }
-        }else{
-            $text['FromUserInfo']['enter_image'] = '';
-            $text['FromUserInfo']['enter_text'] = '';
-        }
-
-        //记录用户访问记录
-        if($user_id != $room_owner['user_id']){
-            model('api/User')->add_user_visit_log(2,$user_id, $room_id);
-        }
-
-        //交友相关回值
-        if($room['type_id'] == 7){
-            $friend = $this->getRoomFriendData($room_id);
-            //交友状态 交友进行到第几步 1等待邂逅 2心动连线 3牵手良缘
-            $friend['step'] =$room['step'];
-        }else{
-            $friend = null;
-        }
-
-        $xlh_info['xlh_info'] = model('api/BlindBoxTurntableGift')->get_user_xlh_info($room_id);
-        $open_time = db::name('vs_hour_ranking_config')->where('id', 1)->value('open_time');
-        if($open_time > 0){
-            if($open_time <= time()){
-                $hour_open = 1;//开启
-            }else{
-                $hour_open = 0;//关闭
-            }
-        }else{
-            $hour_open = 0;//关闭
-        }
-
-        //签约房间信息
-        if($room_info['type_id'] != 10){
-            $sign_info = null;
-        }else{
-            $room_sign = db::name('vs_room_sign')->where('room_id', $room_id)->order('id desc')->find();
-            if($room_sign){
-                $sign_info = [
-                    'sign_id' => $room_sign['id'],
-                    'sign_status' => $room_sign['sign_type'],
-                    'sign_day' => $room_sign['sign_day'],
-                    'current_body_value' => db::name('user')->where('id', $room_sign['sign_user_id'])->value('market_value'),
-                    'end_time' => $room_sign['end_time']
-                ];
-            }else{
-                $sign_info = [
-                    'sign_id' => 0,
-                    'sign_status' => 0,
-                    'sign_day' => 0,
-                    'current_body_value' => 0,
-                    'end_time' => 0
-                ];
-            }
-        }
-
-        return ['code' => 1,
-            'msg' => '成功',
-            'data' => ['room_info' => $room_info,
-                'room_owner' => $room_owner,
-                'user_info' => $user_info,
-                'song_user_info' => $song_list,
-                'nextInfo' => $next_song_info,
-                'room_auction'=>$roomauction,
-                'cp_user'=>$cp_users,
-                'pk_info' => $pk_info,
-                'song_pit_list' => $song_pit_list,
-                'friend_info' => $friend,
-                'gift_cycle' => $xlh_info,
-                'hour_ranking_open' => $hour_open,
-                'singer_info' => $singer_info,
-                'sign_info' => $sign_info
-            ]
-        ];
-    }
-
 
     //房间类型整合
     /*
@@ -1838,10 +1464,10 @@ class Room extends Model
                 db::name('vs_room')->where(['id' => $room_id])->update(['room_status' => 3]);
                 db::name('vs_room_bar_movie')->where(['room_id' => $room_id])->update(['status' => 2]);
                 model('api/Tencent')->delete_group('room'.$room_id);
-                return ['code' => 0, 'msg' => 'cp房间已到期',   'data' => ''];
+                return ['code' => 0, 'msg' => '房间已到期',   'data' => ''];
             }
             $room_status = db::name('vs_room_bar_movie')->where(['room_id' => $room_id])->value('status');
-            if($room_status == 4){
+            if($room_status == 2){
                 db::name('vs_room')->where(['id' => $room_id])->update(['room_status' => 3]);
                 return ['code' => 0, 'msg' => '房间已被迫结束',   'data' => ''];
             }
@@ -1853,7 +1479,7 @@ class Room extends Model
                 ->find();
             //非cp房用户不得进入
             if($cp_users['user_id'] != $user_id && $cp_users['user_id1'] != $user_id){
-                return ['code' => 0, 'msg' => '您不是房间的cp用户，请勿进入',   'data' => ''];
+                return ['code' => 0, 'msg' => '您不是房间的成员用户，请勿进入',   'data' => ''];
             }
             $cp_users['dress'] = model('api/Decorate')->user_decorate_detail($cp_users['user_id'],1);
             $cp_users['dress1'] = model('api/Decorate')->user_decorate_detail($cp_users['user_id1'],1);