diff --git a/application/adminapi/controller/Room.php b/application/adminapi/controller/Room.php
index b6374d8..4070ab1 100644
--- a/application/adminapi/controller/Room.php
+++ b/application/adminapi/controller/Room.php
@@ -983,85 +983,6 @@ class Room extends adminApi
     }
 
 
-    //Cp电影房
-    public function cp_movie_rooms()
-    {
-        $page = input('page', 1);
-        $page_limit = input('page_limit', 30);
-
-        $search_room_number = input('search_room_number', '');
-        $search_onwer_number = input('search_onwer_number', '');
-        $room_status = input('room_status', '');
-        //开始 时间
-        $start_time = input('start_time', '');
-        //结束 时间
-        $end_time = input('end_time', '');
-
-        if($search_room_number!==''){
-            $where['room_number'] = $search_room_number;
-        }
-        if($search_onwer_number!==''){
-            $where['user_id'] = $search_onwer_number;
-        }
-        if($room_status!==''){
-            $where['room_status'] = $room_status;
-        }
-
-        // 检查并转换时间格式为时间戳
-        if($start_time !== ''){
-            $start_time = strtotime($start_time);
-            $where['createtime'] = ['>=', $start_time];
-        }else{
-            $start_time = 0;
-        }
-        if($end_time !== ''){
-            $end_time = strtotime($end_time);
-            $where['createtime'] = ['<=', $end_time];
-        }else{
-            $end_time = time();
-        }
-
-        $where['type_id'] = 6;
-        var_dump($where);
-        $count = db::name('vs_room')->where($where)->count();
-        $lists = db::name('vs_room')->field('id,room_name,room_cover,room_number,user_id,room_status,createtime')
-            ->where($where)
-            ->order('id desc')
-            ->page($page, $page_limit)->select();
-        foreach ($lists as &$value) {
-            $guild = model('Guild')->getGuildByUserId($value['user_id']);
-            $value['createtime'] = date('Y-m-d H:i:s', $value['createtime']);
-            $value['is_on_line'] = db::name('vs_room_visitor')->where('room_id',$value['id'])->value('user_id') ? 1 : 0;
-            $value['is_on_line_str'] = $value['is_on_line'] ? "在线 ": "离线";
-            $value['user_guild'] = $guild['guild_name']?? '';
-            $value['user_nickname'] = db::name('user')->where('id',$value['user_id'])->value('nickname');
-            $value['room_code'] = model('api/Decorate')->user_decorate_detail($value['id'], 7);
-            //房间状态1正常2封禁3关闭
-            $value['room_status_str'] = $value['room_status'] ==1 ? "正常" : ($value['room_status'] ==2 ? "封禁" : "关闭");
-
-            $cpRoom = db::name('vs_room_cp_movie')->where('room_id',$value['id'])->find();
-            if($cpRoom){
-                if($cpRoom['user_id'] == $value['user_id']){
-                    $value['cp_nickname'] = db::name('user')->where('id', $cpRoom['user_id1'])->value('nickname');
-                    $value['cp_user_id'] = db::name('user')->where('id', $cpRoom['user_id1'])->value('user_code');
-                }
-                if($cpRoom['user_id1'] == $value['user_id']){
-                    $value['cp_nickname'] = db::name('user')->where('id', $cpRoom['user_id'])->value('nickname');
-                    $value['cp_user_id'] = db::name('user')->where('id', $cpRoom['user_id'])->value('user_code');
-                }
-            }
-
-            $value['liushui'] = db::name('vs_give_gift')->where(['from_id' => $value['id'],'createtime' => ['between',[$start_time,$end_time]]])->sum('total_price') * get_system_config_value('coin_charm_exp');
-        }
-        $return_data = [
-            'page' =>$page,
-            'page_limit' => $page_limit,
-            'count' => $count,
-            'lists' => $lists
-        ];
-        return V(1,"成功", $return_data);
-    }
-
     //Cp电影房
     public function cp_movie_room()
     {