yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2025-10-31 01:11:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: stat

Browse Source
This commit is contained in:
Tokumeikoi
2020-11-02 22:22:18 +08:00
parent 8935989b06
commit ebce59a0d1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Admin/StatController.php
View File

@@ -29,16 +29,16 @@ class StatController extends Controller
->count(), ->count(),
'commission_pendding_total' => Order::where('commission_status', 0) 'commission_pendding_total' => Order::where('commission_status', 0)
->where('invite_user_id', '!=', NULL) ->where('invite_user_id', '!=', NULL)
->where('status', 3) ->where('status', [3, 4])
->where('commission_balance', '>', 0) ->where('commission_balance', '>', 0)
->count(), ->count(),
'day_income' => Order::where('created_at', '>=', strtotime(date('Y-m-d'))) 'day_income' => Order::where('created_at', '>=', strtotime(date('Y-m-d')))
->where('created_at', '<', time()) ->where('created_at', '<', time())
->where('status', 3) ->where('status', [3, 4])
->sum('total_amount'), ->sum('total_amount'),
'last_month_income' => Order::where('created_at', '>=', strtotime('-1 month', strtotime(date('Y-m-1')))) 'last_month_income' => Order::where('created_at', '>=', strtotime('-1 month', strtotime(date('Y-m-1'))))
->where('created_at', '<', strtotime(date('Y-m-1'))) ->where('created_at', '<', strtotime(date('Y-m-1')))
->where('status', 3) ->where('status', [3, 4])
->sum('total_amount') ->sum('total_amount')
] ]
]); ]);

2
config/app.php
View File

@@ -236,5 +236,5 @@ return [
| The only modification by laravel config | The only modification by laravel config
| |
*/ */
'version' => '1.4' 'version' => '1.4.1'
]; ];