|
|
@@ -118,7 +118,7 @@ class OrderController extends Controller
|
|
118
|
118
|
|
|
119
|
119
|
$stime = $request->input('stime');
|
|
120
|
120
|
$etime = $request->input('etime');
|
|
121
|
|
- $delivery_type = (int)$request->input('delivery_type'); //发货状态 0已发货 1未发货 2全部
|
|
|
121
|
+ $delivery_type = (int)$request->input('delivery_type'); //发货状态 0到发货时间（未填物流信息） 2全部
|
|
122
|
122
|
|
|
123
|
123
|
//仓库管理员只能看到发货之前的订单
|
|
124
|
124
|
$today_date = date('Y-m-d');
|
|
|
@@ -126,8 +126,7 @@ class OrderController extends Controller
|
|
126
|
126
|
if($admin_id) $query->where('admin_id', $admin_id);
|
|
127
|
127
|
if($stime) $query->where('createTime', '>=', $stime);
|
|
128
|
128
|
if($etime) $query->where('createTime', '<=', $etime);
|
|
129
|
|
- if($delivery_type==0) $query->where('delivery_date', '<=', $today_date);
|
|
130
|
|
- if($delivery_type==1) $query->where('delivery_date', '>', $today_date);
|
|
|
129
|
+ if($delivery_type==0) $query->where('delivery_date', '<=', $today_date)->where('logistics_id', 'is', null);
|
|
131
|
130
|
})->where('is_del',0)->where('warehouse', $warehouse)->count();
|
|
132
|
131
|
if ($count > 1) {
|
|
133
|
132
|
// 总页数
|
|
|
@@ -141,8 +140,7 @@ class OrderController extends Controller
|
|
141
|
140
|
if($admin_id) $query->where('admin_id', $admin_id);
|
|
142
|
141
|
if($stime) $query->where('createTime', '>=', $stime);
|
|
143
|
142
|
if($etime) $query->where('createTime', '<=', $etime);
|
|
144
|
|
- if($delivery_type==0) $query->where('delivery_date', '<=', $today_date);
|
|
145
|
|
- if($delivery_type==1) $query->where('delivery_date', '>', $today_date);
|
|
|
143
|
+ if($delivery_type==0) $query->where('delivery_date', '<=', $today_date)->where('logistics_id', 'is', null);
|
|
146
|
144
|
})->where('is_del',0)->where('warehouse', $warehouse)->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
|
|
147
|
145
|
$result = json_decode(json_encode($result),true);
|
|
148
|
146
|
|
