From 56cabbdc00336bcbcc3067bd4c4241a2fbf47dcd Mon Sep 17 00:00:00 2001 From: Tokumeikoi Date: Sun, 15 Mar 2020 21:26:56 +0800 Subject: [PATCH] update --- app/Http/Controllers/User/OrderController.php | 5 +++-- config/app.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/User/OrderController.php b/app/Http/Controllers/User/OrderController.php index 3d5a4f8c..c73a156b 100755 --- a/app/Http/Controllers/User/OrderController.php +++ b/app/Http/Controllers/User/OrderController.php @@ -206,8 +206,9 @@ class OrderController extends Controller } // invite process if ($user->invite_user_id && $order->total_amount > 0) { - if (!((int)config('v2board.commission_first_time', 1) && Order::where('user_id', $user->id)->where('status', 3)->first())) { - $order->invite_user_id = $user->invite_user_id; + $order->invite_user_id = $user->invite_user_id; + $commissionFirstTime = (int)config('v2board.commission_first_time', 1); + if ($commissionFirstTime || !($commissionFirstTime && Order::where('user_id', $user->id)->where('status', 3)->first())) { $inviter = User::find($user->invite_user_id); if ($inviter && $inviter->commission_rate) { $order->commission_balance = $order->total_amount * ($inviter->commission_rate / 100); diff --git a/config/app.php b/config/app.php index 34c4e307..847da7e9 100755 --- a/config/app.php +++ b/config/app.php @@ -67,7 +67,7 @@ return [ | */ - 'timezone' => 'UTC', + 'timezone' => 'Asia/Shanghai', /* |--------------------------------------------------------------------------