订单统计--日期显示修改

app/Admin/Repositories/v3/OrderReport.php

@@ -35,6 +35,7 @@ class OrderReport extends EloquentRepository
         $startTime = request()->input('start_time');
         $endTime = request()->input('end_time');
 
+        $time = date('Y-m-d',time());
         // 日期
         // $date = request()->input('day');
         // if(!empty($date)){
@@ -77,8 +78,9 @@ class OrderReport extends EloquentRepository
             $storeNewUserNewFour->whereIn('user_id',$userIdsArr)->where('user_type',5);
         }
         if($startTime){
+            $date = $startTime;
             $startTime = $startTime.' 00:00:00';
-
+            
             $orderMainOnline->where([['created_at','>=',strtotime($startTime)]]);
             $orderMainOffline->where([['created_at','>=',strtotime($startTime)]]);
 
@@ -89,10 +91,13 @@ class OrderReport extends EloquentRepository
             $storeNewUserNewThree->where([['created_at','>=',strtotime($startTime)]]);
             $storeNewUserNewFour->where([['created_at','>=',strtotime($startTime)]]);
             // $newUser->where([['created_at','>=',strtotime($startTime)]]);
+        }else{
+            $date = '2020-06-01';
         }
         if($endTime){
+            $date = $date.' 至 '.$endTime;
             $endTime = $endTime.' 23:59:59';
-
+            
             $orderMainOnline->where([['created_at','<=',strtotime($endTime)]]);
             $orderMainOffline->where([['created_at','<=',strtotime($endTime)]]);
 
@@ -103,9 +108,11 @@ class OrderReport extends EloquentRepository
             $storeNewUserNewThree->where([['created_at','<=',strtotime($endTime)]]);
             $storeNewUserNewFour->where([['created_at','<=',strtotime($endTime)]]);
             // $newUser->where([['created_at','<=',strtotime($endTime)]]);
+        }else{
+            $date .= ' 至 '.$time;
         }
         if(empty($startTime) && empty($endTime)){
-            $time = date('Y-m-d',time());
+           
             $date = $time;
             $todayStart = $time.' 00:00:00';
             $todayEnd = $time.' 23:59:59';