From 9eff1d70ff5bb5699c0dbf46955c72bc63269ab9 Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Fri, 25 Sep 2020 11:38:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=BB=9F=E8=AE=A1-=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=80=89=E6=8B=A9=E5=BF=AB=E6=8D=B7=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Repositories/v3/OrderReport.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/Admin/Repositories/v3/OrderReport.php b/app/Admin/Repositories/v3/OrderReport.php
index ad5b836..b21d012 100644
--- a/app/Admin/Repositories/v3/OrderReport.php
+++ b/app/Admin/Repositories/v3/OrderReport.php
@@ -37,14 +37,12 @@ class OrderReport extends EloquentRepository
 
         $time = date('Y-m-d',time());
 
-        $today = $time;
-        $yesterday = date("Y-m-d",strtotime("-1 days",strtotime($today)));
-        // 日期
-        // $date = request()->input('day');
-        // if(!empty($date)){
-        //     $startTime = $date;
-        //     $endTime = $date;
-        // }
+        $searchTime = OrderReportController::$searchTime;
+        // dd($searchTime);
+        if(!empty($searchTime)){
+            $startTime = $searchTime['start_time'];
+            $endTime = $searchTime['end_time'];
+        }
         
         $orderMainOnline = OrderMainModel::select(DB::raw('COUNT(id) AS total_num, SUM(money) AS total_money'))->whereIn('state',[4,5])->where('type',OrderMainModel::ORDER_TYPE_ONLINE);
         $orderMainOffline = OrderMainModel::select(DB::raw('COUNT(id) AS total_num, SUM(money) AS total_money'))->whereIn('state',[4,5])->where('type',OrderMainModel::ORDER_TYPE_OFFLINE);