财务报表加订单状态过滤

app/Http/Controllers/Admin/StatisticsController.php

@@ -1733,7 +1733,7 @@ class StatisticsController extends Controller
             if($stime) $query->where('createTime', '>=', $stime);
             if($etime) $query->where('createTime', '<=', $etime. ' 23:59:59');
 
-        })->where('is_del', 0)->count();
+        })->where('is_del', 0)->where('status','>=',2)->count();
         if ($count > 1) {
             // 总页数
             $pages = ceil($count/$pageSize);
@@ -1747,7 +1747,7 @@ class StatisticsController extends Controller
             if($team_id) $query->where('team_id', $team_id);
             if($stime ) $query->where('createTime', '>=', $stime);
             if($etime ) $query->where('createTime', '<=', $etime. ' 23:59:59');
-        })->where('is_del', 0)->orderBy('team_id', 'asc');
+        })->where('is_del', 0)->where('status','>=',2)->orderBy('team_id', 'asc');
 
         $result = $resultQuery->orderBy('createTime','desc')->offset($offset)->limit($pageSize)->get();
         
@@ -1805,7 +1805,7 @@ class StatisticsController extends Controller
         $teams = DB::table('teams')->lists('name', 'id');
 
         foreach($_data['data'] as $k=>&$v){
-            $order_result = Order::select(DB::raw('team_id, count(1) as order_count, sum(receivedAmount) as receivedAmount, sum(if(payment_type=1,receivedAmount,null)) as wx_money'))->where('is_del', 0)->where('createTime','>=', $v['date'])->where('createTime','<=', $v['date'].' 23:59:59')->where('team_id', $v['team_id'])->first();
+            $order_result = Order::select(DB::raw('team_id, count(1) as order_count, sum(receivedAmount) as receivedAmount, sum(if(payment_type=1,receivedAmount,null)) as wx_money'))->where('is_del', 0)->where('status','>=',2)->where('createTime','>=', $v['date'])->where('createTime','<=', $v['date'].' 23:59:59')->where('team_id', $v['team_id'])->first();
 
             $v['order_count'] = isset($order_result->order_count) ? $order_result->order_count : '';
             $v['receivedAmount'] = isset($order_result->receivedAmount) ? $order_result->receivedAmount : '';
@@ -1819,28 +1819,28 @@ class StatisticsController extends Controller
                 $query->where('team_id', $team);
                 $query->where('aftersale_time', '>=', $ctime);
                 $query->where('aftersale_time', '<=', $ctime.' 23:59:59');
-            })->where('is_del', 0)->where('aftersale_fee', '>', 0)->first();
+            })->where('is_del', 0)->where('status','>=',2)->where('aftersale_fee', '>', 0)->first();
             $v['aftersale_count'] = $aftersale_info->aftersale_count;
             $v['aftersale_fee'] = $aftersale_info->aftersale_fee;
             #退补
             $refund_info = Order::select(DB::raw('count(1) as refund_count, sum(refund_price) as refund_price'))->where(function($query) use($team, $ctime){
                 $query->where('team_id', $team);
                 $query->where('refund_time', '=', $ctime);
-            })->where('is_del', 0)->where('refund_time', '>', '')->where('is_refund', 1)->first();
+            })->where('is_del', 0)->where('status','>=',2)->where('refund_time', '>', '')->where('is_refund', 1)->first();
             $v['refund_count'] = $refund_info->refund_count;
             $v['refund_price'] = $refund_info->refund_price;
             //wx退补
             $wx_refund_info = Order::select(DB::raw('count(1) as refund_count, sum(refund_price) as refund_price'))->where('refund_type', 1)->where(function($query) use($team, $ctime){
                 $query->where('team_id', $team);
                 $query->where('refund_time', '=', $ctime);
-            })->where('is_del', 0)->where('refund_time', '>', '')->where('is_refund', 1)->first();
+            })->where('is_del', 0)->where('status','>=',2)->where('refund_time', '>', '')->where('is_refund', 1)->first();
             $v['wx_refund_count'] = $wx_refund_info->refund_count;
             $v['wx_refund_price'] = $wx_refund_info->refund_price;
             //付款码退补
             $zfm_refund_info = Order::select(DB::raw('count(1) as refund_count, sum(refund_price) as refund_price'))->where('refund_type', 2)->where(function($query) use($team, $ctime){
                 $query->where('team_id', $team);
                 $query->where('refund_time', '=', $ctime);
-            })->where('is_del', 0)->where('refund_time', '>', '')->where('is_refund', 1)->first();
+            })->where('is_del', 0)->where('status','>=',2)->where('refund_time', '>', '')->where('is_refund', 1)->first();
             $v['zfm_refund_count'] = $zfm_refund_info->refund_count;
             $v['zfm_refund_price'] = $zfm_refund_info->refund_price;
 
@@ -1848,7 +1848,7 @@ class StatisticsController extends Controller
             $send_info = Order::select(DB::raw('count(1) as send_count, sum(cost) as cost, sum(freight_cost) as freight_cost'))->where(function($query) use($team, $ctime){
                 $query->where('team_id', $team);
                 $query->where('send_time', '=', $ctime);
-            })->where('is_del', 0)->where('logistics_id', '>', '')->first();
+            })->where('is_del', 0)->where('status','>=',2)->where('logistics_id', '>', '')->first();
             $v['send_count'] = $send_info->send_count;
             $v['cost'] = $send_info->cost;
             $v['freight_cost'] = $send_info->freight_cost;
@@ -1890,7 +1890,7 @@ class StatisticsController extends Controller
             if($team_id) $query->where('team_id', $team_id);
             if($stime ) $query->where('createTime', '>=', $stime);
             if($etime ) $query->where('createTime', '<=', $etime. ' 23:59:59');
-        })->where('is_del', 0)->orderBy('team_id', 'asc');
+        })->where('is_del', 0)->where('status','>=',2)->orderBy('team_id', 'asc');
 
         $result = $resultQuery->orderBy('createTime','desc')->get();
         $result = json_decode(json_encode($result), true);
@@ -1919,7 +1919,7 @@ class StatisticsController extends Controller
         $result = $this->teamCtimePage_export($stime, $etime, $team_id);
 
         foreach($result as $k=>&$v){
-            $order_result = Order::select(DB::raw('team_id, count(1) as order_count, sum(receivedAmount) as receivedAmount, sum(if(payment_type=1,receivedAmount,null)) as wx_money'))->where('is_del', 0)->where('createTime','>=', $v['date'])->where('createTime','<=', $v['date'].' 23:59:59')->where('team_id', $v['team_id'])->first();
+            $order_result = Order::select(DB::raw('team_id, count(1) as order_count, sum(receivedAmount) as receivedAmount, sum(if(payment_type=1,receivedAmount,null)) as wx_money'))->where('is_del', 0)->where('status','>=',2)->where('createTime','>=', $v['date'])->where('createTime','<=', $v['date'].' 23:59:59')->where('team_id', $v['team_id'])->first();
 
             $v['order_count'] = isset($order_result->order_count) ? $order_result->order_count : '';
             $v['receivedAmount'] = isset($order_result->receivedAmount) ? $order_result->receivedAmount : '';
@@ -1933,28 +1933,28 @@ class StatisticsController extends Controller
                 $query->where('team_id', $team);
                 $query->where('aftersale_time', '>=', $ctime);
                 $query->where('aftersale_time', '<=', $ctime.' 23:59:59');
-            })->where('is_del', 0)->where('aftersale_fee', '>', 0)->first();
+            })->where('is_del', 0)->where('status','>=',2)->where('aftersale_fee', '>', 0)->first();
             $v['aftersale_count'] = $aftersale_info->aftersale_count;
             $v['aftersale_fee'] = $aftersale_info->aftersale_fee;
             #退补
             $refund_info = Order::select(DB::raw('count(1) as refund_count, sum(refund_price) as refund_price'))->where(function($query) use($team, $ctime){
                 $query->where('team_id', $team);
                 $query->where('refund_time', '=', $ctime);
-            })->where('is_del', 0)->where('refund_time', '>', '')->where('is_refund', 1)->first();
+            })->where('is_del', 0)->where('status','>=',2)->where('refund_time', '>', '')->where('is_refund', 1)->first();
             $v['refund_count'] = $refund_info->refund_count;
             $v['refund_price'] = $refund_info->refund_price;
             //wx退补
             $wx_refund_info = Order::select(DB::raw('count(1) as refund_count, sum(refund_price) as refund_price'))->where('refund_type', 1)->where(function($query) use($team, $ctime){
                 $query->where('team_id', $team);
                 $query->where('refund_time', '=', $ctime);
-            })->where('is_del', 0)->where('refund_time', '>', '')->where('is_refund', 1)->first();
+            })->where('is_del', 0)->where('status','>=',2)->where('refund_time', '>', '')->where('is_refund', 1)->first();
             $v['wx_refund_count'] = $wx_refund_info->refund_count;
             $v['wx_refund_price'] = $wx_refund_info->refund_price;
             //付款码退补
             $zfm_refund_info = Order::select(DB::raw('count(1) as refund_count, sum(refund_price) as refund_price'))->where('refund_type', 2)->where(function($query) use($team, $ctime){
                 $query->where('team_id', $team);
                 $query->where('refund_time', '=', $ctime);
-            })->where('is_del', 0)->where('refund_time', '>', '')->where('is_refund', 1)->first();
+            })->where('is_del', 0)->where('status','>=',2)->where('refund_time', '>', '')->where('is_refund', 1)->first();
             $v['zfm_refund_count'] = $zfm_refund_info->refund_count;
             $v['zfm_refund_price'] = $zfm_refund_info->refund_price;
 
@@ -1962,7 +1962,7 @@ class StatisticsController extends Controller
             $send_info = Order::select(DB::raw('count(1) as send_count, sum(cost) as cost, sum(freight_cost) as freight_cost'))->where(function($query) use($team, $ctime){
                 $query->where('team_id', $team);
                 $query->where('send_time', '=', $ctime);
-            })->where('is_del', 0)->where('logistics_id', '>', '')->first();
+            })->where('is_del', 0)->where('status','>=',2)->where('logistics_id', '>', '')->first();
             $v['send_count'] = $send_info->send_count;
             $v['cost'] = $send_info->cost;
             $v['freight_cost'] = $send_info->freight_cost;
@@ -2008,7 +2008,7 @@ class StatisticsController extends Controller
             if($stime) $query->where('aftersale_time', '>=', $stime);
             if($etime) $query->where('aftersale_time', '<=', $etime. ' 23:59:59');
 
-        })->where('is_del', 0)->where('aftersale_fee', '>', 0)->count();
+        })->where('is_del', 0)->where('status','>=',2)->where('aftersale_fee', '>', 0)->count();
         if ($count > 1) {
             // 总页数
             $pages = ceil($count/$pageSize);
@@ -2023,7 +2023,7 @@ class StatisticsController extends Controller
             if($warehouse) $query->where('warehouse', $warehouse);
             if($stime ) $query->where('aftersale_time', '>=', $stime);
             if($etime ) $query->where('aftersale_time', '<=', $etime. ' 23:59:59');
-        })->where('is_del', 0)->where('aftersale_fee', '>', 0);
+        })->where('is_del', 0)->where('status','>=',2)->where('aftersale_fee', '>', 0);
 
         $result = $resultQuery->orderBy('aftersale_time','desc')->offset($offset)->limit($pageSize)->get();
         
@@ -2082,7 +2082,7 @@ class StatisticsController extends Controller
             if($stime) $query->where('refund_time', '>=', $stime);
             if($etime) $query->where('refund_time', '<=', $etime);
 
-        })->where('is_del', 0)->where('refund_time', '>', '')->where('is_refund', 1)->count();
+        })->where('is_del', 0)->where('status','>=',2)->where('refund_time', '>', '')->where('is_refund', 1)->count();
         if ($count > 1) {
             // 总页数
             $pages = ceil($count/$pageSize);
@@ -2097,7 +2097,7 @@ class StatisticsController extends Controller
             if($warehouse) $query->where('warehouse', $warehouse);
             if($stime ) $query->where('refund_time', '>=', $stime);
             if($etime ) $query->where('refund_time', '<=', $etime);
-        })->where('is_del', 0)->where('refund_time', '>', '')->where('is_refund', 1);
+        })->where('is_del', 0)->where('status','>=',2)->where('refund_time', '>', '')->where('is_refund', 1);
 
         $result = $resultQuery->orderBy('refund_time','desc')->offset($offset)->limit($pageSize)->get();
         
@@ -2163,7 +2163,7 @@ class StatisticsController extends Controller
             if($stime) $query->where('send_time', '>=', $stime);
             if($etime) $query->where('send_time', '<=', $etime);
 
-        })->where('is_del', 0)->where('logistics_id', '>', '')->count();
+        })->where('is_del', 0)->where('status','>=',2)->where('logistics_id', '>', '')->count();
         if ($count > 1) {
             // 总页数
             $pages = ceil($count/$pageSize);
@@ -2178,7 +2178,7 @@ class StatisticsController extends Controller
             if($warehouse) $query->where('warehouse', $warehouse);
             if($stime ) $query->where('send_time', '>=', $stime);
             if($etime ) $query->where('send_time', '<=', $etime);
-        })->where('is_del', 0)->where('logistics_id', '>', '');
+        })->where('is_del', 0)->where('status','>=',2)->where('logistics_id', '>', '');
 
         $result = $resultQuery->orderBy('send_time','desc')->offset($offset)->limit($pageSize)->get();
         
@@ -2228,7 +2228,7 @@ class StatisticsController extends Controller
             if($warehouse) $query->where('warehouse', $warehouse);
             if($stime ) $query->where('aftersale_time', '>=', $stime);
             if($etime ) $query->where('aftersale_time', '<=', $etime. ' 23:59:59');
-        })->where('is_del', 0)->where('aftersale_fee', '>', 0);
+        })->where('is_del', 0)->where('status','>=',2)->where('aftersale_fee', '>', 0);
 
         $result = $resultQuery->orderBy('aftersale_time','desc')->get();
         
@@ -2269,7 +2269,7 @@ class StatisticsController extends Controller
             if($warehouse) $query->where('warehouse', $warehouse);
             if($stime ) $query->where('refund_time', '>=', $stime);
             if($etime ) $query->where('refund_time', '<=', $etime);
-        })->where('is_del', 0)->where('refund_time', '>', '')->where('is_refund', 1);
+        })->where('is_del', 0)->where('status','>=',2)->where('refund_time', '>', '')->where('is_refund', 1);
 
         $result = $resultQuery->orderBy('refund_time','desc')->get();
         
@@ -2317,7 +2317,7 @@ class StatisticsController extends Controller
             if($warehouse) $query->where('warehouse', $warehouse);
             if($stime ) $query->where('send_time', '>=', $stime);
             if($etime ) $query->where('send_time', '<=', $etime);
-        })->where('is_del', 0)->where('logistics_id', '>', '');
+        })->where('is_del', 0)->where('status','>=',2)->where('logistics_id', '>', '');
 
         $result = $resultQuery->orderBy('send_time','desc')->get();
         
@@ -2371,7 +2371,7 @@ class StatisticsController extends Controller
             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();
+        })->where('is_del', 0)->where('status','>=',2)->groupBy('team_id')->groupBy('ctime')->get();
         $count = count($count);
 
         if ($count > 1) {
@@ -2389,14 +2389,14 @@ class StatisticsController extends Controller
                 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();
+            })->where('is_del', 0)->where('status','>=',2)->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, sum(if(payment_type=1,receivedAmount,null)) as wx_money'))->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();
+            })->where('is_del', 0)->where('status','>=',2)->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){
@@ -2438,7 +2438,7 @@ class StatisticsController extends Controller
             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');
+        })->where('is_del', 0)->where('status','>=',2)->orderBy('team_id', 'asc');
         if($aftersale == 1){
             $result = $resultQuery->orderBy('aftersale_time','desc')->get();
         }else{
@@ -2475,14 +2475,14 @@ class StatisticsController extends Controller
                 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();
+            })->where('is_del', 0)->where('status','>=',2)->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, sum(if(payment_type=1,receivedAmount,null)) as wx_money'))->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();
+            })->where('is_del', 0)->where('status','>=',2)->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){
@@ -3892,7 +3892,7 @@ class StatisticsController extends Controller
             if($stime) $query->where('send_time', '>=', $stime);
             if($etime) $query->where('send_time', '<=', $etime);
             if($warehouse>0) $query->where('warehouse', '=', $warehouse);
-        })->whereNotNull('send_time')->where('warehouse','>',0)->where('logistics_id','>','')->where('is_del', 0)->groupBy('warehouse')->groupBy('send_time')->get();      
+        })->whereNotNull('send_time')->where('warehouse','>',0)->where('logistics_id','>','')->where('is_del', 0)->where('status','>=',2)->groupBy('warehouse')->groupBy('send_time')->get();      
         $count = count($count);
         if ($count > 1) {
             // 总页数
@@ -3907,7 +3907,7 @@ class StatisticsController extends Controller
             if($stime) $query->where('send_time', '>=', $stime);
             if($etime) $query->where('send_time', '<=', $etime);
             if($warehouse>0) $query->where('warehouse', '=', $warehouse);
-        })->whereNotNull('send_time')->where('warehouse','>',0)->where('logistics_id','>','')->where('is_del', 0)->groupBy('warehouse')->groupBy('send_time')->orderBy('send_time', 'desc')->offset($offset)->limit($pageSize)->get();
+        })->whereNotNull('send_time')->where('warehouse','>',0)->where('logistics_id','>','')->where('is_del', 0)->where('status','>=',2)->groupBy('warehouse')->groupBy('send_time')->orderBy('send_time', 'desc')->offset($offset)->limit($pageSize)->get();
 
         $wareArr = array(
             0 => '其他',
@@ -3924,7 +3924,7 @@ class StatisticsController extends Controller
             if($stime) $query->where('send_time', '>=', $stime);
             if($etime) $query->where('send_time', '<=', $etime);
             if($warehouse>0) $query->where('warehouse', '=', $warehouse);
-        })->whereNotNull('send_time')->where('warehouse','>',0)->where('logistics_id','>','')->where('is_del', 0)->first();
+        })->whereNotNull('send_time')->where('warehouse','>',0)->where('logistics_id','>','')->where('is_del', 0)->where('status','>=',2)->first();
 
 
         return view('statistics/warehouseFinanceList', ['result'=>$result,
@@ -3950,7 +3950,7 @@ class StatisticsController extends Controller
             if($stime) $query->where('send_time', '>=', $stime);
             if($etime) $query->where('send_time', '<=', $etime);
             if($warehouse>0) $query->where('warehouse', '=', $warehouse);
-        })->whereNotNull('send_time')->where('warehouse','>',0)->where('logistics_id','>','')->where('is_del', 0)->groupBy('warehouse')->groupBy('send_time')->orderBy('send_time', 'desc')->get();
+        })->whereNotNull('send_time')->where('warehouse','>',0)->where('logistics_id','>','')->where('is_del', 0)->where('status','>=',2)->groupBy('warehouse')->groupBy('send_time')->orderBy('send_time', 'desc')->get();
 
         $wareArr = array(
             0 => '其他',