diff --git a/application/api/model/BlindBoxTurntableGift.php b/application/api/model/BlindBoxTurntableGift.php
index 9e8c221..baa711e 100644
--- a/application/api/model/BlindBoxTurntableGift.php
+++ b/application/api/model/BlindBoxTurntableGift.php
@@ -210,10 +210,6 @@ class BlindBoxTurntableGift extends Model
      * 巡乐会
      */
     public function xlh_gift_list($room_id){
-        $room_data = db::name('vs_room')->field('xlh_periods,xlh_periods_num,user_id')-> where('id',$room_id)->find();
-        if(empty($room_data)){
-            return ['code' => 0, 'msg' => '房间不存在！', 'data' => null];
-        }
         $gift_bag_id = 13;
         $xlh_box = db::name('vs_gift_bag')->where('id',$gift_bag_id)->find();
         $xlh_ext = json_decode($xlh_box['ext'],true);
@@ -231,7 +227,7 @@ class BlindBoxTurntableGift extends Model
             }
         }
         //房主信息
-        $room_user = db::name('user')->where('id',$room_data['user_id'])->find();
+//        $room_user = db::name('user')->where('id',$room_data['user_id'])->find();
         //房主礼物
         $room_user_gift = db::name('vs_gift')->where('gid',$xlh_ext['locking_condition']['give_homeowner_gift_id'])->find();
         //巡乐会主礼物
@@ -258,6 +254,7 @@ class BlindBoxTurntableGift extends Model
             }
         }
         $xlh_user_data= null;
+        $room_user_data = null;
         if($pan_xlh && $pan_xlh['user_id']){
             $xlh_user = db::name('user')->where('id',$pan_xlh['user_id'])->find();
             $xlh_user_data = [
@@ -265,6 +262,15 @@ class BlindBoxTurntableGift extends Model
                 'nickname' => $xlh_user['nickname'],
                 'avatar' => $xlh_user['avatar'],
             ];
+            if($pan_xlh['room_id']){
+                $room_data = db::name('vs_room')->field('xlh_periods,xlh_periods_num,user_id')-> where('id',$pan_xlh['room_id'])->find();
+                $room_user = db::name('user')->where('id',$room_data['user_id'])->find();
+                $room_user_data = [
+                    'user_id' => $room_user['id'],
+                    'nickname' => $room_user['nickname'],
+                    'avatar' => $room_user['avatar'],
+                ];
+            }
         }
         //$gift_list 按gift_price 升序排序
         usort($gift_list, function($a, $b) {
@@ -282,11 +288,7 @@ class BlindBoxTurntableGift extends Model
                 'gift_price' => $room_user_gift['gift_price'],
                 'base_image' => $room_user_gift['base_image'],
             ],
-            'homeowner_user' => [
-                'user_id' => $room_user['id'],
-                'nickname' => $room_user['nickname'],
-                'avatar' => $room_user['avatar'],
-            ],
+            'homeowner_user' => $room_user_data,
             'locking_gift' => [
                 'gift_id' => $xlh_main_gift['gid'],
                 'gift_name' => $xlh_main_gift['gift_name'],