Merge branch 'master' of /data/git/tiantian2

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");

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"