sunhao лет назад: 5
Родитель
Сommit
8f541db28b
1 измененных файлов с 3 добавлено и 1 удалено
  1. 3 1
      app/Http/Controllers/Admin/OrderController.php

+ 3 - 1
app/Http/Controllers/Admin/OrderController.php

@@ -1071,16 +1071,18 @@ class OrderController extends Controller
1071 1071
         $receiverName = $request->input('receiverName');
1072 1072
         $receiverMobile = $request->input('receiverMobile');
1073 1073
         $delivery_type = (int)$request->input('delivery_type'); //发货状态 0到发货时间(未填物流信息) 2全部
1074
+        $id = (int)$request->input('id');
1074 1075
 
1075 1076
         $_start = '2019-09-18';// 只看18号之后数据
1076 1077
         $today_date = date('Y-m-d');
1077
-        $result = Order::where(function($query) use($admin_id, $stime, $etime, $warehouse, $receiverMobile, $receiverName, $today_date, $delivery_type, $_start){
1078
+        $result = Order::where(function($query) use($admin_id, $stime, $etime, $warehouse, $receiverMobile, $receiverName, $today_date, $delivery_type, $_start, $id){
1078 1079
             if($admin_id) $query->where('admin_id',  $admin_id);
1079 1080
             if($warehouse) $query->where('warehouse',  $warehouse);
1080 1081
             if($stime) $query->where('createTime', '>=', $stime);
1081 1082
             if($etime) $query->where('createTime', '<=', $etime);
1082 1083
             if($receiverName) $query->where('receiverName', 'like', $receiverName . '%');
1083 1084
             if($receiverMobile) $query->where('receiverMobile', $receiverMobile);
1085
+            if($id>0) $query->where('id', $id);
1084 1086
             if($delivery_type==0) $query->where('logistics_id', '=', '');
1085 1087
             $query->where('createTime', '>=', $_start);
1086 1088
         })->where('is_del',0)->where('status', '>', 1)->where('delivery_date', '<=', $today_date)->orderBy('id', 'desc')->get();