diff --git a/app/Endpoint/Api/Http/Controllers/Product/HotController.php b/app/Endpoint/Api/Http/Controllers/Product/HotController.php index a9936be8..d37ba8e8 100644 --- a/app/Endpoint/Api/Http/Controllers/Product/HotController.php +++ b/app/Endpoint/Api/Http/Controllers/Product/HotController.php @@ -16,7 +16,6 @@ class HotController extends Controller public function __invoke() { $skus = ProductSku::online() - ->whereRelation('category', 'is_show', true) ->latest('sales') ->limit(20) ->get(); diff --git a/app/Endpoint/Api/Http/Controllers/Product/ProductSkuController.php b/app/Endpoint/Api/Http/Controllers/Product/ProductSkuController.php index ff950b57..6c4e03ca 100644 --- a/app/Endpoint/Api/Http/Controllers/Product/ProductSkuController.php +++ b/app/Endpoint/Api/Http/Controllers/Product/ProductSkuController.php @@ -167,7 +167,6 @@ class ProductSkuController extends Controller return ProductSku::select(['id', 'name', 'cover', 'sell_price', 'vip_price', 'sales']) ->filter($input) ->online() - ->whereRelation('category', 'is_show', true) ->simplePaginate(PaginatorHelper::resolvePerPage('per_page', 20, 50)); } @@ -187,7 +186,7 @@ class ProductSkuController extends Controller $paginator = ProductPartSku::with('sku:id,name,cover,sell_price,vip_price,sales') ->whereHas('sku', function ($query) { - $query->online()->whereRelation('category', 'is_show', true); + return $query->online(); }) ->where('part_id', $productPart->id) ->latest('sort') diff --git a/app/Models/ProductSku.php b/app/Models/ProductSku.php index 64c01c4a..75cecc4a 100644 --- a/app/Models/ProductSku.php +++ b/app/Models/ProductSku.php @@ -67,7 +67,7 @@ class ProductSku extends Model */ public function scopeOnline($query) { - return $query->whereNotNull('release_at'); + return $query->whereNotNull('release_at')->whereRelation('category', 'is_show', true); } /**