售后时间

app/Http/Controllers/Admin/StatisticsController.php

@@ -1703,18 +1703,24 @@ class StatisticsController extends Controller
         }
 
         $teams = DB::table('teams')->lists('name', 'id');
-        $result = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'aftersale_fee', 'refund_price', 'cost', 'freight_cost', 'payment_type')->where(function($query) use($team_id, $stime, $etime, $aftersale){
+        $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($aftersale == 1) $query->where('aftersale_fee', '>', 0);
-        })->where('is_del', 0)->orderBy('team_id', 'asc')->orderBy('createTime','desc')->offset($offset)->limit($pageSize)->get();
+        })->where('is_del', 0)->orderBy('team_id', 'asc');
+        if($aftersale == 1){
+            $result = $resultQuery->orderBy('aftersale_time','desc')->offset($offset)->limit($pageSize)->get();
+        }else{
+            $result = $resultQuery->orderBy('createTime','desc')->offset($offset)->limit($pageSize)->get();
+        }
         $result = json_decode(json_encode($result), true);
         $payArr = [1=>'微信支付', 2=>'付款码支付'];
         foreach($result as $k=>&$v){
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;
             $v['true_amount'] = $v['receivedAmount'] - $v['refund_price'] - $v['aftersale_fee'];
             $v['payment_type'] = $payArr[$v['payment_type']];
+            $v['ctime'] = $aftersale == 1 ? $v['aftersale_time'] : $v['createTime'];
         }
 
         $teamList = DB::table('teams')->select('id', 'name')->get();
@@ -1749,7 +1755,12 @@ class StatisticsController extends Controller
         }
         $offset = ($page-1) * $pageSize;
 
-        $count = Order::select(DB::raw('left(createTime, 10) as ctime, team_id'))->where(function($query) use($team_id, $stime, $etime, $aftersale){
+        if($aftersale == 1){
+            $countQuery = Order::select(DB::raw('left(aftersale_time, 10) as ctime, team_id'));
+        }else{
+            $countQuery = Order::select(DB::raw('left(createTime, 10) as ctime, team_id'));
+        }
+        $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');
@@ -1766,12 +1777,21 @@ class StatisticsController extends Controller
         }
 
         $teams = DB::table('teams')->lists('name', 'id');
-        $result = Order::select(DB::raw('left(createTime, 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($aftersale == 1) $query->where('aftersale_fee', '>', 0);
-        })->where('is_del', 0)->groupBy('team_id')->groupBy('ctime')->orderBy('team_id', 'asc')->orderBy('createTime','desc')->offset($offset)->limit($pageSize)->get();
+        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($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{
+            $result = Order::select(DB::raw('left(createTime, 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($aftersale == 1) $query->where('aftersale_fee', '>', 0);
+            })->where('is_del', 0)->groupBy('team_id')->groupBy('ctime')->orderBy('team_id', 'asc')->orderBy('createTime','desc')->offset($offset)->limit($pageSize)->get();
+        }
         $result = json_decode(json_encode($result), true);
         foreach($result as $k=>&$v){
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';
@@ -1804,12 +1824,17 @@ class StatisticsController extends Controller
         $aftersale = $request->input('aftersale');
        
         $teams = DB::table('teams')->lists('name', 'id');
-        $result = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'aftersale_fee', 'refund_price', 'cost', 'freight_cost', 'payment_type')->where(function($query) use($team_id, $stime, $etime, $aftersale){
+        $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($aftersale == 1) $query->where('aftersale_fee', '>', 0);
-        })->where('is_del', 0)->orderBy('team_id', 'asc')->orderBy('createTime','desc')->get();
+        })->where('is_del', 0)->orderBy('team_id', 'asc');
+        if($aftersale == 1){
+            $result = $resultQuery->orderBy('aftersale_time','desc')->get();
+        }else{
+            $result = $resultQuery->orderBy('createTime','desc')->get();
+        }
         $result = json_decode(json_encode($result), true);
         $payArr = [1=>'微信支付', 2=>'付款码支付'];
         foreach($result as $k=>&$v){
@@ -1818,7 +1843,8 @@ class StatisticsController extends Controller
             $v['payment_type'] = $payArr[$v['payment_type']];
         }
 
-        $indexKey = ['team_name','createTime','id','receivedAmount','aftersale_fee','refund_price','true_amount','cost','freight_cost', 'payment_type'];
+        if($aftersale == 0) $indexKey = ['team_name','createTime','id','receivedAmount','aftersale_fee','refund_price','true_amount','cost','freight_cost', 'payment_type'];
+        if($aftersale == 1) $indexKey = ['team_name','aftersale_time','id','receivedAmount','aftersale_fee','refund_price','true_amount','cost','freight_cost', 'payment_type'];
         $title = ['团队', '时间', '订单编号', '成交金额', '售后', '退补差价', '实际金额', '供应商成本', '物流成本', '支付方式'];
         $filename = 'teamFinanceList_'.date('Y-m-d_H').'.xlsx';
         return Order::export_excel($result, $filename, $indexKey, $title);
@@ -1834,12 +1860,21 @@ class StatisticsController extends Controller
         $aftersale = $request->input('aftersale');
        
         $teams = DB::table('teams')->lists('name', 'id');
-        $result = Order::select(DB::raw('left(createTime, 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($aftersale == 1) $query->where('aftersale_fee', '>', 0);
-        })->where('is_del', 0)->groupBy('team_id')->groupBy('ctime')->orderBy('team_id', 'asc')->orderBy('createTime','desc')->get();
+        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($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{
+            $result = Order::select(DB::raw('left(createTime, 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($aftersale == 1) $query->where('aftersale_fee', '>', 0);
+            })->where('is_del', 0)->groupBy('team_id')->groupBy('ctime')->orderBy('team_id', 'asc')->orderBy('createTime','desc')->get();
+        }
         $result = json_decode(json_encode($result), true);
         foreach($result as $k=>&$v){
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';

resources/views/statistics/teamFinanceList.blade.php

@@ -43,7 +43,7 @@
                     @foreach($result as $a)
                         <tr class="text-c" style=" text-align:center;">                           
                             <td>{{$a['team_name']}}</td>                            
-                            <td>{{$a['createTime']}}</td>
+                            <td>{{$a['ctime']}}</td>
                             <td>{{$a['id']}}</td>
                             <td>{{$a['receivedAmount']}}</td>
                             <td>{{$a['aftersale_fee']}}</td>