|
@@ -1577,21 +1577,21 @@ class WelcomeController extends BaseController
|
|
|
$redirect_url = $request->input('redirect_url');
|
|
|
$redirect_url = urldecode($redirect_url);
|
|
|
}
|
|
|
- $least_charge_amount = Order::select('id','price')
|
|
|
- ->where('uid',$this->uid)
|
|
|
- ->where('status','PAID')
|
|
|
- ->where('created_at','>=',strtotime($activity_info->start_time)-60*86400)
|
|
|
+ $least_charge_amount = Order::select('id', 'price')
|
|
|
+ ->where('uid', $this->uid)
|
|
|
+ ->where('status', 'PAID')
|
|
|
+ ->where('created_at', '>=', strtotime($activity_info->start_time) - 60 * 86400)
|
|
|
->max('price');
|
|
|
$type = 'litter';
|
|
|
- $product_ids = [3962,3963];
|
|
|
+ $product_ids = [3962, 3963];
|
|
|
$img = [
|
|
|
- 'litter'=>[
|
|
|
+ 'litter' => [
|
|
|
'https://cdn-novel.iycdm.com/h5/activity-2019-01-17/8-active.png',
|
|
|
'https://cdn-novel.iycdm.com/h5/activity-2019-01-17/8.png',
|
|
|
'https://cdn-novel.iycdm.com/h5/activity-2019-01-17/23-active.png',
|
|
|
'https://cdn-novel.iycdm.com/h5/activity-2019-01-17/23.png',
|
|
|
],
|
|
|
- 'big'=>[
|
|
|
+ 'big' => [
|
|
|
'https://cdn-novel.iycdm.com/h5/activity-2019-01-17/23-active.png',
|
|
|
'https://cdn-novel.iycdm.com/h5/activity-2019-01-17/23.png',
|
|
|
'https://cdn-novel.iycdm.com/h5/activity-2019-01-17/58-active.png',
|
|
@@ -1599,21 +1599,21 @@ class WelcomeController extends BaseController
|
|
|
],
|
|
|
|
|
|
];
|
|
|
- if($least_charge_amount && $least_charge_amount>=30){
|
|
|
+ if ($least_charge_amount && $least_charge_amount >= 30) {
|
|
|
$type = 'big';
|
|
|
- $product_ids = [3960,3961];
|
|
|
+ $product_ids = [3960, 3961];
|
|
|
}
|
|
|
|
|
|
//未开始
|
|
|
- if(time() < strtotime($activity_info->start_time)){
|
|
|
- return view('pay.order.greatColdActivity', ['url' => ['javascript:void(0)','javascript:void(0)'], 'code' => -1, 'type' => $type,'img'=>$img]);
|
|
|
+ if (time() < strtotime($activity_info->start_time)) {
|
|
|
+ return view('pay.order.greatColdActivity', ['url' => ['javascript:void(0)', 'javascript:void(0)'], 'code' => -1, 'type' => $type, 'img' => $img]);
|
|
|
}
|
|
|
//结束
|
|
|
- if(time() > strtotime($activity_info->end_time)){
|
|
|
- return view('pay.order.greatColdActivity', ['url' => ['javascript:void(0)','javascript:void(0)'], 'code' => -2, 'type' => $type,'img'=>$img]);
|
|
|
+ if (time() > strtotime($activity_info->end_time)) {
|
|
|
+ return view('pay.order.greatColdActivity', ['url' => ['javascript:void(0)', 'javascript:void(0)'], 'code' => -2, 'type' => $type, 'img' => $img]);
|
|
|
}
|
|
|
$url = [];
|
|
|
- foreach ($product_ids as $product_id){
|
|
|
+ foreach ($product_ids as $product_id) {
|
|
|
$param = [
|
|
|
'uid' => $this->uid,
|
|
|
'distribution_channel_id' => $this->distribution_channel_id,
|
|
@@ -1626,13 +1626,14 @@ class WelcomeController extends BaseController
|
|
|
$url[] = env('CREATE_PAY_URL') . '?' . http_build_query($param);
|
|
|
}
|
|
|
|
|
|
- return view('pay.order.greatColdActivity', ['url' => $url, 'code' => 0, 'type' => $type,'img'=>$img]);
|
|
|
+ return view('pay.order.greatColdActivity', ['url' => $url, 'code' => 0, 'type' => $type, 'img' => $img]);
|
|
|
}
|
|
|
|
|
|
- public function channelYearActivity(Request $request){
|
|
|
+ public function channelYearActivity(Request $request)
|
|
|
+ {
|
|
|
$encode_distribution_channel_id = encodeDistributionChannelId($this->distribution_channel_id);
|
|
|
- $token = $request->input('token');
|
|
|
- $activity_info = ActivityService::getByToken($token);
|
|
|
+ $id = 2628;
|
|
|
+ $activity_info = ActivityService::getById($id);
|
|
|
if ($activity_info && $activity_info->product_id) {
|
|
|
$from = $request->input('fromtype', 'main');
|
|
|
$uv_key_format = 'activity:%s:distribution_channel_id:%s:date:%s:uv';
|
|
@@ -1641,36 +1642,20 @@ class WelcomeController extends BaseController
|
|
|
$pv_key = sprintf($pv_key_format, $activity_info->id, $this->distribution_channel_id);
|
|
|
Redis::sadd($uv_key, $this->uid);
|
|
|
Redis::hincrby($pv_key, date('Y-m-d'), 1);
|
|
|
- //渠道不符合
|
|
|
- if ($activity_info->distribution_channel_id != $this->distribution_channel_id) {
|
|
|
- return view('pay.order.longactivitynine', ['url' => '###', 'code' => -1, 'start_time' => date('Y-m-d', time() - 86400 * 2), 'end_time' => date('Y-m-d', time() - 86400)]);
|
|
|
- }
|
|
|
|
|
|
- //活动未开始
|
|
|
- if (time() < strtotime($activity_info->start_time)) {
|
|
|
- return view('pay.order.longactivitynine', ['url' => '###', 'code' => -3, 'start_time' => '', 'end_time' => date('Y-m-d', strtotime($activity_info->end_time) - 100)]);
|
|
|
- }
|
|
|
-
|
|
|
- //活动结束
|
|
|
- if (time() > strtotime($activity_info->end_time)) {
|
|
|
- return view('pay.order.longactivitynine', ['url' => '###', 'code' => -1, 'start_time' => date('Y-m-d', strtotime($activity_info->start_time)), 'end_time' => date('Y-m-d', strtotime($activity_info->end_time) - 100)]);
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
- if (time() > strtotime($activity_info->start_time) && time() < strtotime($activity_info->end_time) && empty($order)) {
|
|
|
- $param = [
|
|
|
- 'uid' => $this->uid,
|
|
|
- 'distribution_channel_id' => $this->distribution_channel_id,
|
|
|
- 'product_id' => $activity_info->product_id,
|
|
|
- 'activity_id' => $activity_info->id,
|
|
|
- 'fromtype' => $from,
|
|
|
- 'limit' => 1,
|
|
|
- 'pay_redirect_url' => env('H5_SCHEME', 'https') . '://site' . $encode_distribution_channel_id . '.' . env('CUSTOM_HOST') . '.com/person'
|
|
|
- ];
|
|
|
- $url = env('CREATE_PAY_URL') . '?' . http_build_query($param);
|
|
|
- return view('pay.order.longactivitynine', ['url' => $url, 'code' => 0, 'start_time' => date('Y-m-d', strtotime($activity_info->start_time)), 'end_time' => date('Y-m-d', strtotime($activity_info->end_time) - 100)]);
|
|
|
- }
|
|
|
+ $param = [
|
|
|
+ 'uid' => $this->uid,
|
|
|
+ 'distribution_channel_id' => $this->distribution_channel_id,
|
|
|
+ 'product_id' => $activity_info->product_id,
|
|
|
+ 'activity_id' => $activity_info->id,
|
|
|
+ 'fromtype' => $from,
|
|
|
+ 'limit' => 30,
|
|
|
+ 'pay_redirect_url' => env('H5_SCHEME', 'https') . '://site' . $encode_distribution_channel_id . '.' . env('CUSTOM_HOST') . '.com/person'
|
|
|
+ ];
|
|
|
+ $url = env('CREATE_PAY_URL') . '?' . http_build_query($param);
|
|
|
+ return view('pay.order.channelYearActivity', ['url' => $url]);
|
|
|
}
|
|
|
- return view('pay.order.longactivitynine', ['url' => '###', 'code' => -1, 'start_time' => date('Y-m-d', time() - 86400 * 2), 'end_time' => date('Y-m-d', time() - 86400)]);
|
|
|
+ $url = env('H5_SCHEME', 'https') . '://site' . $encode_distribution_channel_id . '.' . env('CUSTOM_HOST') . '.com/';
|
|
|
+ return redirect()->to($url);
|
|
|
}
|
|
|
}
|