diff --git a/application/api/model/BlindBoxTurntableGift.php b/application/api/model/BlindBoxTurntableGift.php index 4da31b0..e07ee55 100644 --- a/application/api/model/BlindBoxTurntableGift.php +++ b/application/api/model/BlindBoxTurntableGift.php @@ -424,8 +424,6 @@ class BlindBoxTurntableGift extends Model $gift_list[$key]['gift_price'] = $gift_data['gift_price']; } } - //巡乐会结束时间 - $xlh_end_time = time() + $xlh_ext['locking_time']['end_time'] * 60; //房主礼物 $room_user_gift = db::name('vs_gift')->where('gid',$xlh_ext['locking_condition']['give_homeowner_gift_id'])->find(); //巡乐会主礼物 @@ -436,6 +434,8 @@ class BlindBoxTurntableGift extends Model if(empty($pan_xlh)){ return ['code' => 0, 'msg' => '未开始', 'data' => null]; } + //巡乐会结束时间 + $xlh_end_time = $pan_xlh['createtime'] + $xlh_ext['locking_time']['end_time'] * 60; $xlh_user_data= []; if($pan_xlh['user_id']){ $xlh_user = db::name('user')->where('id',$pan_xlh['user_id'])->find();