From 0cef036cb7a077cc333d5e3e08b96bf8942fde12 Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Fri, 25 Sep 2020 15:08:20 +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=E5=BF=AB=E6=8D=B7=E9=80=89=E6=8B=A9=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/Admin/Controllers/v3/OrderReportController.php b/app/Admin/Controllers/v3/OrderReportController.php
index 32eebb5..a4179df 100644
--- a/app/Admin/Controllers/v3/OrderReportController.php
+++ b/app/Admin/Controllers/v3/OrderReportController.php
@@ -42,12 +42,6 @@ class OrderReportController extends AdminController
                 $selector->selectOne('time', '选择日期', ['today'=>'今天', 'yesterday'=>'昨天', 'last_week'=>'上周','last_month'=>'上月'], function($query, $value) use($today){
                     $where = [];
                     
-                    //上月初
-                    $lastMonthStart = date('Y-m-d', strtotime('-1 month', strtotime(date('Y-m', time()) . '-01'))); 
-                    // 上月底
-                    $lastMonthEnd = date('Y-m-d', strtotime(date('Y-m', time()) . '-01') - 86400);
-                    dd([$lastMonthStart,$lastMonthEnd]);
-
                     switch($value){
                         case 'today':
                             $where['start_time'] = $today;
@@ -66,7 +60,7 @@ class OrderReportController extends AdminController
                             $where['start_time'] = $lastMonday;
                             $where['end_time'] = $lastSunday;
                         break;
-                        case 'last_week':
+                        case 'last_month':
                             //上月初
                             $lastMonthStart = date('Y-m-d', strtotime('-1 month', strtotime(date('Y-m', time()) . '-01'))); 
                             // 上月底
diff --git a/app/Admin/Repositories/v3/OrderReport.php b/app/Admin/Repositories/v3/OrderReport.php
index b21d012..c18e3b9 100644
--- a/app/Admin/Repositories/v3/OrderReport.php
+++ b/app/Admin/Repositories/v3/OrderReport.php
@@ -32,18 +32,17 @@ class OrderReport extends EloquentRepository
     public function get(GridModel $model)
     {
         $marketId = request()->input('market_id');
-        $startTime = request()->input('start_time');
-        $endTime = request()->input('end_time');
-
         $time = date('Y-m-d',time());
 
         $searchTime = OrderReportController::$searchTime;
-        // dd($searchTime);
         if(!empty($searchTime)){
             $startTime = $searchTime['start_time'];
             $endTime = $searchTime['end_time'];
+        }else{
+            $startTime = request()->input('start_time');
+            $endTime = request()->input('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);
         // 旧商户流水  
@@ -138,7 +137,7 @@ class OrderReport extends EloquentRepository
             $storeNewUserNewThree->where([['created_at','<=',strtotime($todayEnd)]]);
             $storeNewUserNewFour->where([['created_at','<=',strtotime($todayEnd)]]);
         }
-        
+       
         // 订单总额
         $orderReportOnline = $orderMainOnline->get()->toArray();
         $orderReportOffline = $orderMainOffline->get()->toArray();