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

app/Http/Controllers/Admin/StatisticsController.php

@@ -273,9 +273,9 @@ class StatisticsController extends CommonController
                     $query->whereRaw("UNIX_TIMESTAMP(`created_at`) <= {$before_datetime}")->orderBy("id", "desc");
                 }
             ])
-//            ->whereHas("oneBalance", function ($query) use ($before_datetime) {
-//                $query->whereRaw("UNIX_TIMESTAMP(`created_at`) <= {$before_datetime}")->where("balance", ">", 0)->orderBy("id", "desc");
-//            })
+            ->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}")