From ebce59a0d14e26b892f3ee0c557a414bdcd79e77 Mon Sep 17 00:00:00 2001 From: Tokumeikoi Date: Mon, 2 Nov 2020 22:22:18 +0800 Subject: [PATCH] fix: stat --- app/Http/Controllers/Admin/StatController.php | 6 +++--- config/app.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Admin/StatController.php b/app/Http/Controllers/Admin/StatController.php index 64c60659..ff42112c 100644 --- a/app/Http/Controllers/Admin/StatController.php +++ b/app/Http/Controllers/Admin/StatController.php @@ -29,16 +29,16 @@ class StatController extends Controller ->count(), 'commission_pendding_total' => Order::where('commission_status', 0) ->where('invite_user_id', '!=', NULL) - ->where('status', 3) + ->where('status', [3, 4]) ->where('commission_balance', '>', 0) ->count(), 'day_income' => Order::where('created_at', '>=', strtotime(date('Y-m-d'))) ->where('created_at', '<', time()) - ->where('status', 3) + ->where('status', [3, 4]) ->sum('total_amount'), 'last_month_income' => Order::where('created_at', '>=', strtotime('-1 month', strtotime(date('Y-m-1')))) ->where('created_at', '<', strtotime(date('Y-m-1'))) - ->where('status', 3) + ->where('status', [3, 4]) ->sum('total_amount') ] ]); diff --git a/config/app.php b/config/app.php index 2d0eb3bd..b6233b95 100755 --- a/config/app.php +++ b/config/app.php @@ -236,5 +236,5 @@ return [ | The only modification by laravel config | */ - 'version' => '1.4' + 'version' => '1.4.1' ];