From eb454325de995c464d52d45b5cb95945cc42fff0 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Sat, 18 Mar 2023 18:03:19 +0800
Subject: [PATCH] product sku

---
 .../Api/Http/Controllers/Product/ProductSkuController.php    | 5 ++---
 app/Endpoint/Api/Http/Controllers/StoreController.php        | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/Endpoint/Api/Http/Controllers/Product/ProductSkuController.php b/app/Endpoint/Api/Http/Controllers/Product/ProductSkuController.php
index 1777326f..7986694a 100644
--- a/app/Endpoint/Api/Http/Controllers/Product/ProductSkuController.php
+++ b/app/Endpoint/Api/Http/Controllers/Product/ProductSkuController.php
@@ -96,13 +96,12 @@ class ProductSkuController extends Controller
 
                     $key = implode('_', $jSpecs);
                     $mapSku = $mapSkus->get($key);
-                    $stock = (int) $mapSku?->saleable_stock;
-                    if ($mapSku && $stock > 0) {
+                    if ($mapSku) {
                         $spuSpecItems[] = [
                             'name' => $value['name'],
                             'selected' => $sku->is($mapSku),
                             'sku_id' => (int) $mapSku->id,
-                            'sku_stock' => $stock,
+                            'sku_stock' => (int) $mapSku?->saleable_stock,
                         ];
                     }
 
diff --git a/app/Endpoint/Api/Http/Controllers/StoreController.php b/app/Endpoint/Api/Http/Controllers/StoreController.php
index 5d543b42..574ed45b 100644
--- a/app/Endpoint/Api/Http/Controllers/StoreController.php
+++ b/app/Endpoint/Api/Http/Controllers/StoreController.php
@@ -45,7 +45,7 @@ class StoreController extends Controller
             $input['sort'] = '-id';
         }
 
-        $spuIds = StoreProductSku::where('store_id', $store->id)->where('status', 1)->pluck('product_spu_id')->toArray();
+        $spuIds = StoreProductSku::where('store_id', $store->id)->where('amount', '>', 0)->where('status', 1)->pluck('product_spu_id')->toArray();
         $spuIds = array_unique($spuIds);
         $spuIds = array_values($spuIds);
         $list = ProductSpu::with(['specs'])->whereIn('id', $spuIds)->filter($input)->simplePaginate(Paginator::resolvePerPage('per_page', 20, 50));
@@ -79,7 +79,7 @@ class StoreController extends Controller
         $spuSpecs = [];
 
         if (count($original = (array) $sku->specs) > 0) {
-            $skus = $store->productSkus()->where('product_spu_id', $spu->id)->get();
+            $skus = $store->productSkus()->where('product_spu_id', $spu->id)->where('status', 1)->get();
 
             $mapSkus = $skus->mapWithKeys(function ($item) {
                 $key = implode('_', $item->specs) ?: $item->id;