From 0129bdb5730e4a68dcd6334044c2eb5dbc601426 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Wed, 24 May 2023 14:10:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BA=97=E9=93=BA=E4=BA=91?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/store/product/StoreSpu.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controller/api/store/product/StoreSpu.php b/app/controller/api/store/product/StoreSpu.php
index 41853699..2242c530 100644
--- a/app/controller/api/store/product/StoreSpu.php
+++ b/app/controller/api/store/product/StoreSpu.php
@@ -10,6 +10,7 @@
 // +----------------------------------------------------------------------
 namespace app\controller\api\store\product;
 
+use app\common\model\system\merchant\Merchant;
 use app\common\repositories\store\product\ProductRepository;
 use app\common\repositories\store\StoreCategoryRepository;
 use app\common\repositories\system\merchant\MerchantRepository;
@@ -101,8 +102,8 @@ class StoreSpu extends BaseController
             'keyword', 'cate_id', 'order', 'price_on', 'price_off', 'brand_id', 'pid', 'mer_cate_id', ['product_type', 0], 'action', 'common'
         ]);
         if ($where['action']) unset($where['product_type']);
-//        $category_id=Db::name('merchant')->where('mer_id',$id)->value('category_id');->where('category_id',$category_id)
-        $mer_id=Db::name('merchant')->where('mer_state',1)->where('status',1)->where('type_id',11)->value('mer_id');
+        $category_id=Db::name('merchant')->where('mer_id',$id)->value('category_id');
+        $mer_id=Db::name('merchant')->where('mer_state',1)->where('status',1)->where('category_id',$category_id)->where('type_id',Merchant::TypeCloudWarehouse)->value('mer_id');
         if (!$mer_id){
             return app('json')->success(['count'=>0,'list'=>[]]);