|
@@ -235,7 +235,10 @@ class GoodsService
|
|
|
})->when($classify != '', function ($query) use ($classify, $categoryId) {
|
|
|
if ($classify == 'GOODS' && empty($categoryId)) {
|
|
|
$query->whereIn('join_goods_category_id', ['6', '7', '8', '9', '10', '11', '12', '30']);
|
|
|
- } else if ($classify != 'GOODS' && empty($categoryId)) {
|
|
|
+ } else if ($classify == 'RECHARGE' && empty($categoryId)) {
|
|
|
+ $query->where('goods_status', 'ON');
|
|
|
+ $query->where('goods_classify', $classify);
|
|
|
+ } else if ($classify != 'GOODS' && empty($categoryId)) {
|
|
|
$query->where('goods_classify', $classify);
|
|
|
}
|
|
|
})->when(!empty($type), function ($query) use ($type) {
|