From e598ca1e2117f3c865ddc1d0372f0760d11682bc Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Mon, 4 Sep 2023 12:53:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controller/api/store/product/CloudWarehouse.php b/app/controller/api/store/product/CloudWarehouse.php
index 21d6843a..2e7bef6f 100644
--- a/app/controller/api/store/product/CloudWarehouse.php
+++ b/app/controller/api/store/product/CloudWarehouse.php
@@ -46,7 +46,7 @@ class CloudWarehouse extends BaseController
      */
     public function index()
     {
-        $typeStoreId = Db::name('MerchantType')->where('type_code', MerchantModel::TypeCode['TypeStore'])->value('mer_type_id');
+        $typeStoreId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeStore'])->value('mer_type_id');
         $params = $this->request->params(['category_id', 'street_code', 'order', ['product_type', 0], 'keyword']);
         $search = [
             'street_id' => $params['street_code'],
@@ -61,9 +61,10 @@ class CloudWarehouse extends BaseController
         if (empty($merchantIds)) {
             return app('json')->success(['count' => 0, 'list' => []]);
         }
+        $typeCloudWarehouseId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeCloudWarehouse'])->value('mer_type_id');
         $entryWhere = [
             'street_id' => $params['street_code'],
-            'type_id' => Merchant::TypeCloudWarehouse,
+            'type_id' => $typeCloudWarehouseId,
             'category_id' => $params['category_id'],
             'status' => 1,
             'is_del' => 0,
diff --git a/app/controller/api/store/product/StoreSpu.php b/app/controller/api/store/product/StoreSpu.php
index 6ccf1b76..1a72098b 100644
--- a/app/controller/api/store/product/StoreSpu.php
+++ b/app/controller/api/store/product/StoreSpu.php
@@ -42,6 +42,7 @@ class StoreSpu extends BaseController
     public function lst()
     {
         [$page, $limit] = $this->getPage();
+        $typeStoreId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeStore'])->value('mer_type_id');
         $where = $this->request->params([
             'keyword',
             'cate_id',
@@ -62,7 +63,7 @@ class StoreSpu extends BaseController
         $where['is_gift_bag'] = 0;
         $where['product_type'] = 0;
         $where['order'] = $where['order'] ?: 'star';
-        $where['mer_ids'] = Merchant::getInstance()->where('type_id', Merchant::TypeStore)
+        $where['mer_ids'] = Merchant::getInstance()->where('type_id', $typeStoreId)
             ->where(['status' => 1, 'mer_state' => 1, 'is_del' => 0])->column('mer_id');
         if ($where['is_trader'] != 1) unset($where['is_trader']);
         $data = $this->repository->getApiSearch($where, $page, $limit, $this->userInfo);