m

app/Http/Controllers/Admin/OrderController.php

@@ -181,18 +181,20 @@ class OrderController extends Controller
         $delivery_type = (int)$request->input('delivery_type'); //发货状态 0到发货时间（未填物流信息） 2到发货时间全部 
         $receiverName = trim($request->input('receiverName'));
         $receiverMobile = trim($request->input('receiverMobile'));
+        $id = (int)$request->input('id');
 
         //仓库管理员只能看到 918之后的数据
         $_start = '2019-09-18';
         //仓库管理员只能看到已审核订单  
         $today_date = date('Y-m-d');
-        $count = Order::where(function($query) use($admin_id, $stime, $etime, $today_date, $delivery_type, $receiverName, $receiverMobile, $_start){
+        $count = Order::where(function($query) use($admin_id, $stime, $etime, $today_date, $delivery_type, $receiverName, $receiverMobile, $_start, $id){
             if($admin_id) $query->where('admin_id', $admin_id);
             if($stime) $query->where('createTime', '>=', $stime);
             if($etime) $query->where('createTime', '<=', $etime);
             if($delivery_type==0) $query->where('logistics_id', '=', '');
             if($receiverName) $query->where('receiverName', 'like', $receiverName . '%');
             if($receiverMobile) $query->where('receiverMobile', $receiverMobile);
+            if($id>0) $query->where('id', $id);
             $query->where('createTime', '>=', $_start);
         })->where('is_del',0)->where('warehouse', $warehouse)->where('status', '>', 1)->where('delivery_date', '<=', $today_date)->count();
 
@@ -204,7 +206,7 @@ class OrderController extends Controller
             $pages = 1;
         }
 
-        $result = Order::where(function($query) use($admin_id, $stime, $etime, $today_date, $delivery_type, $receiverName, $receiverMobile, $_start){
+        $result = Order::where(function($query) use($admin_id, $stime, $etime, $today_date, $delivery_type, $receiverName, $receiverMobile, $_start, $id){
             if($admin_id) $query->where('admin_id', $admin_id);
             if($stime) $query->where('createTime', '>=', $stime);
             if($etime) $query->where('createTime', '<=', $etime);            
@@ -212,6 +214,7 @@ class OrderController extends Controller
             if($receiverName) $query->where('receiverName', 'like', $receiverName . '%');
             if($receiverMobile) $query->where('receiverMobile', $receiverMobile);
             $query->where('createTime', '>=', $_start);
+            if($id>0) $query->where('id', $id);
         })->where('is_del',0)->where('warehouse', $warehouse)->where('status', '>', 1)->where('delivery_date', '<=', $today_date)->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
 
         $result = json_decode(json_encode($result),true);
@@ -229,6 +232,7 @@ class OrderController extends Controller
             'adminlist'         =>$adminList,
             'receiverName'         =>$receiverName,
             'receiverMobile'       =>$receiverMobile,
+            'id'       =>$id,
             ]);
     }