From 72b3dcff08fa2f47f56a6fe8031aba18a322b43b Mon Sep 17 00:00:00 2001 From: weizong song Date: Wed, 1 Sep 2021 06:54:12 +0800 Subject: [PATCH 1/5] up --- app/Http/Controllers/Manager/OrdersController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index e4614e8..e29b86b 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -332,6 +332,8 @@ class OrdersController extends CommonController ->select("area.id", "area.name", "area.building_id") ->leftJoin("building", "building.id", "=", "area.building_id") ->addSelect("building.name as building_name") + ->addSelect("building.index as building_index") + ->orderBy("building.building_index") ->orderBy("area.myindex") ->orderBy("area.name") ->get(); From c653710c54171af8589682cb90af4f53993dcc74 Mon Sep 17 00:00:00 2001 From: weizong song Date: Wed, 1 Sep 2021 06:54:39 +0800 Subject: [PATCH 2/5] 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 e29b86b..2fb268e 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -333,7 +333,7 @@ class OrdersController extends CommonController ->leftJoin("building", "building.id", "=", "area.building_id") ->addSelect("building.name as building_name") ->addSelect("building.index as building_index") - ->orderBy("building.building_index") + ->orderBy("building_index") ->orderBy("area.myindex") ->orderBy("area.name") ->get(); From de4d8566b15088a120549dfd8c89b034c4eea086 Mon Sep 17 00:00:00 2001 From: weizong song Date: Wed, 1 Sep 2021 06:54:59 +0800 Subject: [PATCH 3/5] 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 2fb268e..b694e31 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -332,7 +332,7 @@ class OrdersController extends CommonController ->select("area.id", "area.name", "area.building_id") ->leftJoin("building", "building.id", "=", "area.building_id") ->addSelect("building.name as building_name") - ->addSelect("building.index as building_index") + ->addSelect("building.myindex as building_index") ->orderBy("building_index") ->orderBy("area.myindex") ->orderBy("area.name") From 44757318e72eb277e41da9c127a4b1653d73949f Mon Sep 17 00:00:00 2001 From: weizong song Date: Wed, 1 Sep 2021 06:55:29 +0800 Subject: [PATCH 4/5] up --- app/Http/Controllers/Manager/OrdersController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index b694e31..4cd5272 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -332,8 +332,7 @@ class OrdersController extends CommonController ->select("area.id", "area.name", "area.building_id") ->leftJoin("building", "building.id", "=", "area.building_id") ->addSelect("building.name as building_name") - ->addSelect("building.myindex as building_index") - ->orderBy("building_index") + ->orderBy("building_name") ->orderBy("area.myindex") ->orderBy("area.name") ->get(); From c2062116b269a60244c6e99f552c1c0457b73d8f Mon Sep 17 00:00:00 2001 From: weizong song Date: Wed, 1 Sep 2021 11:24:31 +0800 Subject: [PATCH 5/5] up --- app/Http/Controllers/Manager/StatisticsController.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/Http/Controllers/Manager/StatisticsController.php b/app/Http/Controllers/Manager/StatisticsController.php index ed5d104..3731ed3 100644 --- a/app/Http/Controllers/Manager/StatisticsController.php +++ b/app/Http/Controllers/Manager/StatisticsController.php @@ -217,6 +217,12 @@ class StatisticsController extends CommonController $query->where("project_id", $request->project_id); })->whereNotNull("paid_at")->whereRaw("UNIX_TIMESTAMP(`paid_at`) between {$from_date_timestamp} and {$to_date_timestamp}"); + if (!$request->show_all) { + $manager = $this->manager; + $model_recharge = $model_recharge->where("manager_id", $manager->id); + $model_refund = $model_refund->where("manager_id", $manager->id); + } + $page_size = $request->has("page_size") ? (int)$request->page_size : 10; switch ($request->detail_type) { case "checkout":