|
|
@@ -68,6 +68,12 @@ class OrderController extends Controller
|
|
68
|
68
|
})->where('is_del',0)->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
|
|
69
|
69
|
$result = json_decode(json_encode($result),true);
|
|
70
|
70
|
|
|
|
71
|
+ $status_arr = array(
|
|
|
72
|
+ 0 => '待审核',
|
|
|
73
|
+ 1 => '已审核',
|
|
|
74
|
+ 2 => '已发货',
|
|
|
75
|
+ 3 => '已完成',
|
|
|
76
|
+ );
|
|
71
|
77
|
foreach($result as $k=>&$v){
|
|
72
|
78
|
/*
|
|
73
|
79
|
//获取商品信息
|
|
|
@@ -79,6 +85,7 @@ class OrderController extends Controller
|
|
79
|
85
|
*/
|
|
80
|
86
|
|
|
81
|
87
|
$v['receiverMobile'] = substr($v['receiverMobile'], 0, 3).'****'.substr($v['receiverMobile'], 7);
|
|
|
88
|
+ $v['status'] = $status_arr[$v['status']];
|
|
82
|
89
|
}
|
|
83
|
90
|
|
|
84
|
91
|
$adminList = DB::table('admin')->select('id', 'realname', 'username')->where('id','>', 1)->get();
|
|
|
@@ -127,7 +134,7 @@ class OrderController extends Controller
|
|
127
|
134
|
$receiverName = $request->input('receiverName');
|
|
128
|
135
|
$receiverMobile = $request->input('receiverMobile');
|
|
129
|
136
|
|
|
130
|
|
- //仓库管理员只能看到发货之前的订单
|
|
|
137
|
+ //仓库管理员只能看到已审核订单
|
|
131
|
138
|
$today_date = date('Y-m-d');
|
|
132
|
139
|
$count = Order::where(function($query) use($admin_id, $stime, $etime, $today_date, $delivery_type, $receiverName, $receiverMobile){
|
|
133
|
140
|
if($admin_id) $query->where('admin_id', $admin_id);
|
|
|
@@ -136,7 +143,7 @@ class OrderController extends Controller
|
|
136
|
143
|
if($delivery_type==0) $query->where('delivery_date', '<=', $today_date)->where('logistics_id', '=', '');
|
|
137
|
144
|
if($receiverName) $query->where('receiverName', 'like', $receiverName . '%');
|
|
138
|
145
|
if($receiverMobile) $query->where('receiverMobile', $receiverMobile);
|
|
139
|
|
- })->where('is_del',0)->where('warehouse', $warehouse)->count();
|
|
|
146
|
+ })->where('is_del',0)->where('warehouse', $warehouse)->where('status', '>', 0)->count();
|
|
140
|
147
|
if ($count > 1) {
|
|
141
|
148
|
// 总页数
|
|
142
|
149
|
$pages = ceil($count/$pageSize);
|
|
|
@@ -152,7 +159,7 @@ class OrderController extends Controller
|
|
152
|
159
|
if($delivery_type==0) $query->where('delivery_date', '<=', $today_date)->where('logistics_id', '=', '');
|
|
153
|
160
|
if($receiverName) $query->where('receiverName', 'like', $receiverName . '%');
|
|
154
|
161
|
if($receiverMobile) $query->where('receiverMobile', $receiverMobile);
|
|
155
|
|
- })->where('is_del',0)->where('warehouse', $warehouse)->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
|
|
|
162
|
+ })->where('is_del',0)->where('warehouse', $warehouse)->where('status', '>', 0)->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
|
|
156
|
163
|
$result = json_decode(json_encode($result),true);
|
|
157
|
164
|
|
|
158
|
165
|
$adminList = DB::table('admin')->select('id', 'realname', 'username')->where('id','>', 1)->get();
|
|
|
@@ -448,6 +455,34 @@ class OrderController extends Controller
|
|
448
|
455
|
exit('1');
|
|
449
|
456
|
}
|
|
450
|
457
|
|
|
|
458
|
+ public function setverify($id){
|
|
|
459
|
+ $order = Order::find($id);
|
|
|
460
|
+ $order->status = 1;
|
|
|
461
|
+ if ($order ->save()){
|
|
|
462
|
+ exit('0');
|
|
|
463
|
+ }
|
|
|
464
|
+ exit('1');
|
|
|
465
|
+ }
|
|
|
466
|
+
|
|
|
467
|
+ public function setverifymore(Request $request){
|
|
|
468
|
+ $ids = $request->get('id');
|
|
|
469
|
+
|
|
|
470
|
+ foreach($ids as $id){
|
|
|
471
|
+ $order = Order::find($id);
|
|
|
472
|
+ $order->status = 1;
|
|
|
473
|
+ $order ->save();
|
|
|
474
|
+ }
|
|
|
475
|
+ $stime = $request->input('stime');
|
|
|
476
|
+ $etime = $request->input('etime');
|
|
|
477
|
+ $receiverName = $request->input('receiverName');
|
|
|
478
|
+ $receiverMobile = $request->input('receiverMobile');
|
|
|
479
|
+ $admin_id = (int)$request->input('admin_id');
|
|
|
480
|
+ $page = (int)$request->input('page');
|
|
|
481
|
+ $str_query = 'page='.$page.'&admin_id='.$admin_id.'&stime='.$stime.'&etime='.$etime.'&receiverName='.$receiverName.'&receiverMobile='.$receiverMobile;
|
|
|
482
|
+ return redirect('/admin/order/index?'.$str_query)->with('info', '操作成功');
|
|
|
483
|
+
|
|
|
484
|
+ }
|
|
|
485
|
+
|
|
451
|
486
|
/**
|
|
452
|
487
|
* 分组管理-分组展示
|
|
453
|
488
|
* @param Request $request
|
|
|
@@ -690,7 +725,7 @@ class OrderController extends Controller
|
|
690
|
725
|
if($receiverName) $query->where('receiverName', 'like', $receiverName . '%');
|
|
691
|
726
|
if($receiverMobile) $query->where('receiverMobile', $receiverMobile);
|
|
692
|
727
|
if($delivery_type==0) $query->where('delivery_date', '<=', $today_date)->where('logistics_id', '=', '');
|
|
693
|
|
- })->where('is_del',0)->orderBy('id', 'desc')->get();
|
|
|
728
|
+ })->where('is_del',0)->where('status', '>', 0)->orderBy('id', 'desc')->get();
|
|
694
|
729
|
$result = json_decode(json_encode($result),true);
|
|
695
|
730
|
foreach ($result as $k => &$v)
|
|
696
|
731
|
{
|
