|
|
@@ -57,11 +57,15 @@ class OrderController extends Controller
|
|
57
|
57
|
$receiverName = trim($request->input('receiverName'));
|
|
58
|
58
|
$receiverMobile = trim($request->input('receiverMobile'));
|
|
59
|
59
|
$status = $request->input('status');
|
|
|
60
|
+ $id = (int)$request->input('id');
|
|
60
|
61
|
if($status === null){
|
|
61
|
62
|
$status = -1;
|
|
62
|
63
|
}
|
|
|
64
|
+ if($etime){
|
|
|
65
|
+ $etime = $etime. ' 23:59:59';
|
|
|
66
|
+ }
|
|
63
|
67
|
|
|
64
|
|
- $count = Order::where(function($query) use($admin_id, $stime, $etime, $receiverName, $receiverMobile, $self_role, $sale_ids, $status){
|
|
|
68
|
+ $count = Order::where(function($query) use($admin_id, $stime, $etime, $receiverName, $receiverMobile, $self_role, $sale_ids, $status, $id){
|
|
65
|
69
|
if($admin_id) $query->where('admin_id', $admin_id);
|
|
66
|
70
|
if($stime) $query->where('createTime', '>=', $stime);
|
|
67
|
71
|
if($etime) $query->where('createTime', '<=', $etime);
|
|
|
@@ -70,6 +74,7 @@ class OrderController extends Controller
|
|
70
|
74
|
if($self_role == '管理员') $query->where('status','>',0);
|
|
71
|
75
|
if(!empty($sale_ids)) $query->whereIn('admin_id', $sale_ids);
|
|
72
|
76
|
if(($status>=0)) $query->where('status', $status);
|
|
|
77
|
+ if(($id>0)) $query->where('id', $id);
|
|
73
|
78
|
})->where('is_del',0)->count();
|
|
74
|
79
|
if ($count > 1) {
|
|
75
|
80
|
// 总页数
|
|
|
@@ -79,7 +84,7 @@ class OrderController extends Controller
|
|
79
|
84
|
$pages = 1;
|
|
80
|
85
|
}
|
|
81
|
86
|
|
|
82
|
|
- $result = Order::where(function($query) use($admin_id, $stime, $etime, $receiverName, $receiverMobile, $self_role, $sale_ids, $status){
|
|
|
87
|
+ $result = Order::where(function($query) use($admin_id, $stime, $etime, $receiverName, $receiverMobile, $self_role, $sale_ids, $status, $id){
|
|
83
|
88
|
if($admin_id) $query->where('admin_id', $admin_id);
|
|
84
|
89
|
if($stime) $query->where('createTime', '>=', $stime);
|
|
85
|
90
|
if($etime) $query->where('createTime', '<=', $etime);
|
|
|
@@ -88,6 +93,7 @@ class OrderController extends Controller
|
|
88
|
93
|
if($self_role == '管理员') $query->where('status','>',0);
|
|
89
|
94
|
if(!empty($sale_ids)) $query->whereIn('admin_id', $sale_ids);
|
|
90
|
95
|
if(($status>=0)) $query->where('status', $status);
|
|
|
96
|
+ if(($id>0)) $query->where('id', $id);
|
|
91
|
97
|
})->where('is_del',0)->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
|
|
92
|
98
|
$result = json_decode(json_encode($result),true);
|
|
93
|
99
|
|
|
|
@@ -141,6 +147,7 @@ class OrderController extends Controller
|
|
141
|
147
|
'receiverName' =>$receiverName,
|
|
142
|
148
|
'receiverMobile' =>$receiverMobile,
|
|
143
|
149
|
'status' =>$status,
|
|
|
150
|
+ 'id' =>$id,
|
|
144
|
151
|
]);
|
|
145
|
152
|
}
|
|
146
|
153
|
|
|
|
@@ -882,9 +889,16 @@ class OrderController extends Controller
|
|
882
|
889
|
$etime = $request->input('etime');
|
|
883
|
890
|
$receiverName = $request->input('receiverName');
|
|
884
|
891
|
$receiverMobile = $request->input('receiverMobile');
|
|
885
|
|
- $status = (int)$request->input('status');
|
|
|
892
|
+ $status = $request->input('status');
|
|
|
893
|
+ $id = (int)$request->input('id');
|
|
|
894
|
+ if($status === null){
|
|
|
895
|
+ $status = -1;
|
|
|
896
|
+ }
|
|
|
897
|
+ if($etime){
|
|
|
898
|
+ $etime = $etime. ' 23:59:59';
|
|
|
899
|
+ }
|
|
886
|
900
|
|
|
887
|
|
- $result = Order::where(function($query) use($admin_id, $stime, $etime, $warehouse, $receiverMobile, $receiverName, $self_role, $sale_ids, $status){
|
|
|
901
|
+ $result = Order::where(function($query) use($admin_id, $stime, $etime, $warehouse, $receiverMobile, $receiverName, $self_role, $sale_ids, $status, $id){
|
|
888
|
902
|
if($admin_id) $query->where('admin_id', $admin_id);
|
|
889
|
903
|
if($warehouse) $query->where('warehouse', $warehouse);
|
|
890
|
904
|
if($stime) $query->where('createTime', '>=', $stime);
|
|
|
@@ -894,6 +908,7 @@ class OrderController extends Controller
|
|
894
|
908
|
if($self_role == '管理员') $query->where('status','>',0);
|
|
895
|
909
|
if(!empty($sale_ids)) $query->whereIn('admin_id', $sale_ids);
|
|
896
|
910
|
if($status>=0) $query->where('status', $status);
|
|
|
911
|
+ if($id>0) $query->where('id', $id);
|
|
897
|
912
|
})->where('is_del',0)->orderBy('id', 'desc')->get();
|
|
898
|
913
|
$result = json_decode(json_encode($result),true);
|
|
899
|
914
|
|
