|
@@ -218,6 +218,16 @@ class OrderController extends Controller
|
218
|
218
|
})->where('is_del',0)->where('warehouse', $warehouse)->where('status', '>', 1)->where('delivery_date', '<=', $today_date)->orderBy('verify_time', 'asc')->offset($offset)->limit($pageSize)->get();
|
219
|
219
|
|
220
|
220
|
$result = json_decode(json_encode($result),true);
|
|
221
|
+
|
|
222
|
+ $yestoday = date('Y-m-d', strtotime('-1 day'));
|
|
223
|
+ //获取超时未发订单
|
|
224
|
+ $order_overtime = Order::where('is_del',0)->where('warehouse', $warehouse)->where('status', '>', 1)->where('delivery_date', '<', $yestoday)->where('createTime', '>=', $_start)->where('logistics_id', '=', '')->lists('id');
|
|
225
|
+
|
|
226
|
+ $overtime = [];
|
|
227
|
+ if(!empty($order_overtime)){
|
|
228
|
+ $overtime['list'] = json_decode(json_encode($order_overtime), true);
|
|
229
|
+ $overtime['count'] = count($order_overtime);
|
|
230
|
+ }
|
221
|
231
|
|
222
|
232
|
$adminList = DB::table('admin')->select('id', 'realname', 'username')->where('id','>', 1)->get();
|
223
|
233
|
$adminList = json_decode(json_encode($adminList), true);
|
|
@@ -234,7 +244,8 @@ class OrderController extends Controller
|
234
|
244
|
'receiverMobile' =>$receiverMobile,
|
235
|
245
|
'id' =>$id,
|
236
|
246
|
'today' =>$today_date,
|
237
|
|
- 'yestoday' => date('Y-m-d', strtotime('-1 day')),
|
|
247
|
+ 'yestoday' => $yestoday,
|
|
248
|
+ 'overtime' => $overtime,
|
238
|
249
|
]);
|
239
|
250
|
}
|
240
|
251
|
|