diff --git a/application/api/model/BlindBoxTurntableGift.php b/application/api/model/BlindBoxTurntableGift.php index baa711e..b4a0093 100644 --- a/application/api/model/BlindBoxTurntableGift.php +++ b/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') diff --git a/application/cron/controller/RoomPan.php b/application/cron/controller/RoomPan.php index afdb8eb..b7b5756 100644 --- a/application/cron/controller/RoomPan.php +++ b/application/cron/controller/RoomPan.php @@ -174,6 +174,7 @@ class RoomPan echo "处理发放记录失败 \n"; continue; } + Cache::set("xlh_periods_num", 0, 0); //推送 $FromUserInfo = db::name('user')->field('nickname,avatar')->where(['id'=>$value['user_id']])->find(); $gift_name = db::name('vs_gift')->where(['gid'=>$value['gift_id']])->value('gift_name');