售后时间搜索

app/Http/Controllers/Admin/StatisticsController.php

@@ -1690,8 +1690,10 @@ class StatisticsController extends Controller
 
         $count = Order::where(function($query) use($team_id, $stime, $etime, $aftersale){
             if($team_id) $query->where('team_id', $team_id);
-            if($stime) $query->where('createTime', '>=', $stime);
-            if($etime) $query->where('createTime', '<=', $etime. ' 23:59:59');
+            if($stime && $aftersale == 0) $query->where('createTime', '>=', $stime);
+            if($etime && $aftersale == 0) $query->where('createTime', '<=', $etime. ' 23:59:59');
+            if($stime && $aftersale == 1) $query->where('aftersale_time', '>=', $stime);
+            if($etime && $aftersale == 1) $query->where('aftersale_time', '<=', $etime. ' 23:59:59');
             if($aftersale == 1) $query->where('aftersale_fee', '>', 0);
         })->where('is_del', 0)->count();
         if ($count > 1) {
@@ -1705,8 +1707,10 @@ class StatisticsController extends Controller
         $teams = DB::table('teams')->lists('name', 'id');
         $resultQuery = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'aftersale_fee', 'refund_price', 'cost', 'freight_cost', 'payment_type', 'aftersale_time')->where(function($query) use($team_id, $stime, $etime, $aftersale){
             if($team_id) $query->where('team_id', $team_id);
-            if($stime) $query->where('createTime', '>=', $stime);
-            if($etime) $query->where('createTime', '<=', $etime. ' 23:59:59');
+            if($stime && $aftersale == 0) $query->where('createTime', '>=', $stime);
+            if($etime && $aftersale == 0) $query->where('createTime', '<=', $etime. ' 23:59:59');
+            if($stime && $aftersale == 1) $query->where('aftersale_time', '>=', $stime);
+            if($etime && $aftersale == 1) $query->where('aftersale_time', '<=', $etime. ' 23:59:59');
             if($aftersale == 1) $query->where('aftersale_fee', '>', 0);
         })->where('is_del', 0)->orderBy('team_id', 'asc');
         if($aftersale == 1){
@@ -1762,8 +1766,10 @@ class StatisticsController extends Controller
         }
         $count = $countQuery->where(function($query) use($team_id, $stime, $etime, $aftersale){
             if($team_id) $query->where('team_id', $team_id);
-            if($stime) $query->where('createTime', '>=', $stime);
-            if($etime) $query->where('createTime', '<=', $etime.' 23:59:59');
+            if($stime && $aftersale == 0) $query->where('createTime', '>=', $stime);
+            if($etime && $aftersale == 0) $query->where('createTime', '<=', $etime. ' 23:59:59');
+            if($stime && $aftersale == 1) $query->where('aftersale_time', '>=', $stime);
+            if($etime && $aftersale == 1) $query->where('aftersale_time', '<=', $etime. ' 23:59:59');
             if($aftersale == 1) $query->where('aftersale_fee', '>', 0);
         })->where('is_del', 0)->groupBy('team_id')->groupBy('ctime')->get();
         $count = count($count);
@@ -1780,8 +1786,8 @@ class StatisticsController extends Controller
         if($aftersale == 1){
             $result = Order::select(DB::raw('left(aftersale_time, 10) as ctime, team_id, count(1) as order_count, sum(receivedAmount) as receivedAmount, sum(aftersale_fee) as aftersale_fee, sum(refund_price) as refund_price, sum(cost) as cost, sum(freight_cost) as freight_cost'))->where(function($query) use($team_id, $stime, $etime, $aftersale){
                 if($team_id) $query->where('team_id', $team_id);
-                if($stime) $query->where('createTime', '>=', $stime);
-                if($etime) $query->where('createTime', '<=', $etime.' 23:59:59');
+                if($stime) $query->where('aftersale_time', '>=', $stime);
+                if($etime) $query->where('aftersale_time', '<=', $etime. ' 23:59:59');
                 if($aftersale == 1) $query->where('aftersale_fee', '>', 0);
             })->where('is_del', 0)->groupBy('team_id')->groupBy('ctime')->orderBy('team_id', 'asc')->orderBy('aftersale_time','desc')->offset($offset)->limit($pageSize)->get();
         }else{
@@ -1826,8 +1832,10 @@ class StatisticsController extends Controller
         $teams = DB::table('teams')->lists('name', 'id');
         $resultQuery = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'aftersale_fee', 'refund_price', 'cost', 'freight_cost', 'payment_type', 'aftersale_time')->where(function($query) use($team_id, $stime, $etime, $aftersale){
             if($team_id) $query->where('team_id', $team_id);
-            if($stime) $query->where('createTime', '>=', $stime);
-            if($etime) $query->where('createTime', '<=', $etime. ' 23:59:59');
+            if($stime && $aftersale == 0) $query->where('createTime', '>=', $stime);
+            if($etime && $aftersale == 0) $query->where('createTime', '<=', $etime. ' 23:59:59');
+            if($stime && $aftersale == 1) $query->where('aftersale_time', '>=', $stime);
+            if($etime && $aftersale == 1) $query->where('aftersale_time', '<=', $etime. ' 23:59:59');
             if($aftersale == 1) $query->where('aftersale_fee', '>', 0);
         })->where('is_del', 0)->orderBy('team_id', 'asc');
         if($aftersale == 1){
@@ -1863,8 +1871,8 @@ class StatisticsController extends Controller
         if($aftersale == 1){
             $result = Order::select(DB::raw('left(aftersale_time, 10) as ctime, team_id, count(1) as order_count, sum(receivedAmount) as receivedAmount, sum(aftersale_fee) as aftersale_fee, sum(refund_price) as refund_price, sum(cost) as cost, sum(freight_cost) as freight_cost'))->where(function($query) use($team_id, $stime, $etime, $aftersale){
                 if($team_id) $query->where('team_id', $team_id);
-                if($stime) $query->where('createTime', '>=', $stime);
-                if($etime) $query->where('createTime', '<=', $etime.' 23:59:59');
+                if($stime) $query->where('aftersale_time', '>=', $stime);
+                if($etime) $query->where('aftersale_time', '<=', $etime.' 23:59:59');
                 if($aftersale == 1) $query->where('aftersale_fee', '>', 0);
             })->where('is_del', 0)->groupBy('team_id')->groupBy('ctime')->orderBy('team_id', 'asc')->orderBy('aftersale_time','desc')->get();
         }else{