diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java
index 4ccc0b4a..7f9e4bb3 100644
--- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java
+++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java
@@ -119,6 +119,9 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
     public List<ProductDTO> getProductList(ProductDTO param) {
         QueryWrapper queryWrapper = buildFullQueryWrapper(param);
         List<ProductDTO> records = super.listAs(queryWrapper, ProductDTO.class);
+        if (CollUtil.isEmpty(records)) {
+            return records;
+        }
         List<Long> prodIdList = records.stream().map(ProductDTO::getId).distinct().toList();
         List<ProdSkuDTO> skuList = prodSkuMapper.selectListByQueryAs(query().in(ProdSku::getProductId, prodIdList).eq(ProdSku::getIsDel, DeleteEnum.NORMAL.value()), ProdSkuDTO.class);
         Map<Long, List<ProdSkuDTO>> collect = skuList.stream().collect(Collectors.groupingBy(ProdSkuDTO::getProductId));
diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/UProductServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/UProductServiceImpl.java
index ff3cfc81..5b82ab2d 100644
--- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/UProductServiceImpl.java
+++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/UProductServiceImpl.java
@@ -13,7 +13,6 @@ import com.czg.product.entity.ProdGroup;
 import com.czg.product.entity.ProdGroupRelation;
 import com.czg.product.entity.ProdSku;
 import com.czg.product.entity.Product;
-import com.czg.product.enums.ProductTypeEnum;
 import com.czg.product.param.MiniHomeProductParam;
 import com.czg.product.param.ShopProductSkuParam;
 import com.czg.product.service.UProductService;
@@ -228,12 +227,7 @@ public class UProductServiceImpl extends ServiceImpl<ProductMapper, Product> imp
         if (data == null) {
             throw new CzgException("商品SKU不可售或不存在");
         }
-        if (ProductTypeEnum.SINGLE.value().equals(product.getType())) {
-            data.setStockNumber(product.getStockNumber());
-        } else {
-            // TODO 临时数据，后续对接库存系统
-            data.setStockNumber(1000);
-        }
+        data.setStockNumber(ObjUtil.defaultIfNull(product.getStockNumber(), 0));
         return data;
     }