From 38e212e2f905509c2762209471df7d4c2dd6ec62 Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Thu, 24 Sep 2020 16:56:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=BB=9F=E8=AE=A1--=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E9=80=89=E6=8B=A9=E6=97=A5=E6=9C=9F=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=8E=9F=E6=9D=A5=E7=9A=84=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/v3/OrderReportController.php | 13 ++++++-------
 app/Admin/Repositories/v3/OrderReport.php          | 10 +++++-----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/Admin/Controllers/v3/OrderReportController.php b/app/Admin/Controllers/v3/OrderReportController.php
index b923d1d..ae8807e 100644
--- a/app/Admin/Controllers/v3/OrderReportController.php
+++ b/app/Admin/Controllers/v3/OrderReportController.php
@@ -33,14 +33,13 @@ class OrderReportController extends AdminController
                 $filter->panel();
                 
                 $filter->equal('market_id','市场')->select($marketList);
-                // $filter->equal('start_time','开始时间')->date();
-                // $filter->equal('end_time','结束时间')->date();
+                $filter->equal('start_time','开始时间')->date();
+                $filter->equal('end_time','结束时间')->date();
                
-                $today = date('Y-m-d');
-                $monthBefore = date("Y-m-d",strtotime("-1 months",strtotime($today)));
-                $timeData = $this->periodDateArr($monthBefore,$today);
-
-                $filter->equal('day','日期')->select($timeData)->default($today);
+                // $today = date('Y-m-d');
+                // $monthBefore = date("Y-m-d",strtotime("-1 months",strtotime($today)));
+                // $timeData = $this->periodDateArr($monthBefore,$today);
+                // $filter->equal('day','日期')->select($timeData)->default($today);
             });
 
             // 每页1条
diff --git a/app/Admin/Repositories/v3/OrderReport.php b/app/Admin/Repositories/v3/OrderReport.php
index 15b9333..1c2dbe5 100644
--- a/app/Admin/Repositories/v3/OrderReport.php
+++ b/app/Admin/Repositories/v3/OrderReport.php
@@ -36,11 +36,11 @@ class OrderReport extends EloquentRepository
         $endTime = request()->input('end_time');
 
         // 日期
-        $date = request()->input('day');
-        if(!empty($date)){
-            $startTime = $date;
-            $endTime = $date;
-        }
+        // $date = request()->input('day');
+        // if(!empty($date)){
+        //     $startTime = $date;
+        //     $endTime = $date;
+        // }
         
         $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);