From 1a22e3b11cba01d738db9253351ab569be9261f1 Mon Sep 17 00:00:00 2001 From: weizong song Date: Sat, 21 Aug 2021 11:37:40 +0800 Subject: [PATCH 1/2] up --- app/Http/Controllers/Manager/OrdersController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index 237f871..b7693d9 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -192,7 +192,7 @@ class OrdersController extends CommonController $model = $this->_getOrderModel(); $order = $model->with([ "orderItems" => function ($query) { - $query->orderBy("service_cate", "desc"); + $query->orderBy("service_date", "desc"); }, "recharges", "refunds" From 312016ade2337c52e5c5923f7c7dbb639a4b2d23 Mon Sep 17 00:00:00 2001 From: weizong song Date: Thu, 26 Aug 2021 09:54:13 +0800 Subject: [PATCH 2/2] up --- app/Http/Controllers/Admin/StatisticsController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Controllers/Admin/StatisticsController.php b/app/Http/Controllers/Admin/StatisticsController.php index 964c459..c64aa36 100755 --- a/app/Http/Controllers/Admin/StatisticsController.php +++ b/app/Http/Controllers/Admin/StatisticsController.php @@ -126,6 +126,7 @@ class StatisticsController extends CommonController return $this->error($this->noProjects); } $project_id = request()->project_id ?? $projects->first()->id; + dd($project_id); $project = Project::find($project_id); $month = request()->month ?? date("Y-m");