From 205e49f1ba07cfd1e617f07aa983537c1db1c0a3 Mon Sep 17 00:00:00 2001
From: liyinglin <liyl@langye.net>
Date: Thu, 28 Sep 2023 10:49:43 +0800
Subject: [PATCH] 1

---
 .../Manager/StatisticsController.php          | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Manager/StatisticsController.php b/app/Http/Controllers/Manager/StatisticsController.php
index bd9666b..9218d0c 100644
--- a/app/Http/Controllers/Manager/StatisticsController.php
+++ b/app/Http/Controllers/Manager/StatisticsController.php
@@ -218,6 +218,8 @@ class StatisticsController extends CommonController
         $model_checkout = OrderItems::whereHas("order", function ($query) use ($request) {
             $query->where("project_id", $request->project_id);
         })->whereNotNull("paid_at")->whereRaw("UNIX_TIMESTAMP(`paid_at`) between {$from_date_timestamp} and {$to_date_timestamp}");
+
+
         $model_recharge = Recharge::whereHas("order", function ($query) use ($request) {
             $query->where("project_id", $request->project_id);
         })->whereNotNull("paid_at")->whereRaw("UNIX_TIMESTAMP(`paid_at`) between {$from_date_timestamp} and {$to_date_timestamp}");
@@ -278,7 +280,23 @@ class StatisticsController extends CommonController
             $recharge[$k] = $val;
         }
 
-        return response()->json(compact("checkout", "refund", "recharge", "payment_methods", "refund_by_methods"));
+        // 结算的订单数量
+        $end_order_total = Orders::where('status', 100)
+            ->where("project_id", $request->project_id)
+            ->whereBetween('updated_at', [$from_date, $to_date])
+            ->count();
+
+        // 新开的订单数量
+        $new_order_total = Orders::whereBetween('created_at', [$from_date, $to_date])
+            ->where("project_id", $request->project_id)
+            ->count();
+
+        return response()->json(compact(
+                "checkout",
+                "refund", "recharge", "payment_methods",
+                "refund_by_methods", "end_order_total", "new_order_total"
+            )
+        );
     }
 
     public function _getDuration()