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'];