|
@@ -420,7 +420,7 @@ class OrderController extends AuthController
|
|
{
|
|
{
|
|
$req = request()->post();
|
|
$req = request()->post();
|
|
$this->validate(request(), [
|
|
$this->validate(request(), [
|
|
- 'list_type' => 'required|in:1,2,3',
|
|
|
|
|
|
+ 'list_type' => 'required|in:0,1,2,3',
|
|
'product_type' => 'integer',
|
|
'product_type' => 'integer',
|
|
'order_status' => 'integer',
|
|
'order_status' => 'integer',
|
|
'time_sort' => 'in:0,1'
|
|
'time_sort' => 'in:0,1'
|
|
@@ -432,14 +432,16 @@ class OrderController extends AuthController
|
|
$builder->where('product_type', $req['product_type']);
|
|
$builder->where('product_type', $req['product_type']);
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
- if ($req['list_type'] == 1) {
|
|
|
|
- $builder->whereIn('product_type', [1,2]);
|
|
|
|
- }
|
|
|
|
- elseif ($req['list_type'] == 2) {
|
|
|
|
- $builder->whereIn('product_type', [3,4,5]);
|
|
|
|
- }
|
|
|
|
- elseif ($req['list_type'] == 3) {
|
|
|
|
- $builder->where('product_type', 6);
|
|
|
|
|
|
+ if (!empty($req['list_type'])) {
|
|
|
|
+ if ($req['list_type'] == 1) {
|
|
|
|
+ $builder->whereIn('product_type', [1,2]);
|
|
|
|
+ }
|
|
|
|
+ elseif ($req['list_type'] == 2) {
|
|
|
|
+ $builder->whereIn('product_type', [3,4,5]);
|
|
|
|
+ }
|
|
|
|
+ elseif ($req['list_type'] == 3) {
|
|
|
|
+ $builder->where('product_type', 6);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (!empty($req['order_status'])) {
|
|
if (!empty($req['order_status'])) {
|