Merge branch 'master' of /mnt/git/v2.tiantianxinye.365care

app/Http/Controllers/Admin/StatisticsController.php

@@ -276,11 +276,11 @@ class StatisticsController extends CommonController
             ->whereHas("oneBalance", function ($query) use ($before_datetime) {
                 $query->whereRaw("UNIX_TIMESTAMP(`created_at`) <= {$before_datetime}")->where("balance", ">", 0)->orderBy("id", "desc");
             })
-//            ->whereHas("orders", function ($query) use ($before_datetime, $project_id) {
-//                $query
-//                    ->whereRaw("UNIX_TIMESTAMP(`created_at`) <= {$before_datetime}")
-//                    ->where("project_id", $project_id);
-//            })
+            ->whereHas("orders", function ($query) use ($before_datetime, $project_id) {
+                $query
+                    ->whereRaw("UNIX_TIMESTAMP(`created_at`) <= {$before_datetime}")
+                    ->where("project_id", $project_id);
+            })
             ->paginate();
 
         $laravel_duration = microtime(true) - LARAVEL_START;