新需求-活动需求-盲盒转盘调通盘-调试

application/api/model/BlindBoxTurntableGift.php

@@ -250,7 +250,7 @@ class BlindBoxTurntableGift extends Model
                 Cache::set("this_xlh_periods", $xlh_periods+1, 0);//修改巡乐会期数
                 $pan_xlh = db::name('vs_room_pan_xlh')->where(['id'=>$pan_xlh_id])->find();
             }else{
-                return ['code' => 0, 'msg' => '未开始', 'data' => null];
+                return ['code' => 0, 'msg' => '巡乐会已结束', 'data' => null];
             }
         }
         $xlh_user_data= null;
@@ -309,7 +309,6 @@ class BlindBoxTurntableGift extends Model
         $where = [];
         $where['a.gift_bag_id'] = 13;
         $where['a.user_id'] = $user_id;
-        $where['a.room_id'] = $room_id;
         $list = db('vs_gift_bag_receive_pan_log')
             ->alias('a')
             ->join('vs_room_pan_xlh b','b.id = a.parent_id','left')
@@ -331,7 +330,6 @@ class BlindBoxTurntableGift extends Model
     public function xlh_ranking($room_id,$page=1,$page_size=12){
         $where = [];
         $where['a.gift_bag_id'] = 13;
-        $where['a.room_id'] = $room_id;
         $where['e.is_world_show'] = 1;
         $list = db('vs_gift_bag_receive_pan_log')
             ->alias('a')