From d8dfe71b7defa5b74356e86ab1556c8daf5f19a5 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Wed, 8 Nov 2023 16:01:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BA=97=E9=93=BA=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/api/store/merchant/Merchant.php | 3 +-- app/controller/api/store/product/CloudWarehouse.php | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php index 78b59eaf..a839ab51 100644 --- a/app/controller/api/store/merchant/Merchant.php +++ b/app/controller/api/store/merchant/Merchant.php @@ -59,8 +59,7 @@ class Merchant extends BaseController [$page, $limit] = $this->getPage(); $where = $this->request->params(['keyword', 'order', 'is_best', 'location', 'category_id', 'type_id', 'type_code', 'is_trader', 'street_id', 'credit_buy']); if (empty($where['type_id'])) { - //$where['type_id'] = [MerchantModel::TypeCloudWarehouse, MerchantModel::TypeStore, MerchantModel::TypeSupplyChain, MerchantModel::TypePlatform]; - $where['type_id'] = Db::name('MerchantType')->where('is_allow_apply', 1)->where('type_code', '<>', MerchantModel::TypeCode['TypeSupplyChain'])->column('mer_type_id'); + $where['type_id'] =[10,17]; } return app('json')->success($this->repository->getList($where, $page, $limit, $this->userInfo)); } diff --git a/app/controller/api/store/product/CloudWarehouse.php b/app/controller/api/store/product/CloudWarehouse.php index e8a6b822..7610742c 100644 --- a/app/controller/api/store/product/CloudWarehouse.php +++ b/app/controller/api/store/product/CloudWarehouse.php @@ -130,7 +130,6 @@ class CloudWarehouse extends BaseController */ public function town() { - // 除了市级供应链都可以查询 $params = $this->request->params(['category_id', 'street_code', 'order', ['product_type', 0], 'keyword', 'page']); $search = [ 'street_id' => $params['street_code'],