From d6e10621845bc752f176051924b6cb0411118eb4 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Thu, 25 May 2023 17:26:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E5=B9=B3=E5=8F=B0=E6=89=8B?=
 =?UTF-8?q?=E7=BB=AD=E8=B4=B9=E5=88=86=E6=B6=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/store/product/CloudWarehouse.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/controller/api/store/product/CloudWarehouse.php b/app/controller/api/store/product/CloudWarehouse.php
index 5a262d7f..26dbe786 100644
--- a/app/controller/api/store/product/CloudWarehouse.php
+++ b/app/controller/api/store/product/CloudWarehouse.php
@@ -50,12 +50,24 @@ class CloudWarehouse extends BaseController
             'street_id' => $params['street_code'],
             'type_id' => Merchant::TypeStore,
             'category_id' => $params['category_id'],
+            'status' => 1,
+            'is_del' => 0,
+            'mer_state' => 1,
         ];
         $merchantIds = $this->merchantDao->search($search)->column('mer_id');
         [$page, $limit] = $this->getPage();
         if (empty($merchantIds)) {
             return app('json')->success(['count' => 0, 'list' => []]);
         }
+        $entryWhere = [
+            'street_id' => $params['street_code'],
+            'type_id' => Merchant::TypeCloudWarehouse,
+            'category_id' => $params['category_id'],
+            'status' => 1,
+            'is_del' => 0,
+            'mer_state' => 1,
+        ];
+        $where['entry_mer_id'] = $this->merchantDao->search($entryWhere)->value('mer_id');
         $where['keyword'] = $params['keyword'];
         $where['mer_ids'] = $merchantIds;
         $where['product_type'] = $params['product_type'];