From 048ca68ac7a7d34bc6aa17d8a3383594d1e6251d Mon Sep 17 00:00:00 2001 From: "home.fengxinyhyl" Date: Wed, 5 Jun 2024 21:06:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repositories/system/merchant/MerchantRepository.php | 4 ++-- app/controller/api/store/product/StoreSpu.php | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/common/repositories/system/merchant/MerchantRepository.php b/app/common/repositories/system/merchant/MerchantRepository.php index 6b35292..5714a7f 100644 --- a/app/common/repositories/system/merchant/MerchantRepository.php +++ b/app/common/repositories/system/merchant/MerchantRepository.php @@ -347,10 +347,10 @@ class MerchantRepository extends BaseRepository public function detail($id, $userInfo) { $merchant = $this->dao->apiGetOne($id)->hidden([ - "real_name", "mer_phone", "reg_admin_id", "sort", "is_del", "is_audit", "is_best", "mer_state", "bank", "bank_number", "bank_name", 'update_time', + "real_name", "reg_admin_id", "sort", "is_del", "is_audit", "is_best", "mer_state", "bank", "bank_number", "bank_name", 'update_time', 'financial_alipay', 'financial_bank', 'financial_wechat', 'financial_type','mer_take_phone' ]); - $merchant->append(['type_name', 'isset_certificate', 'services_type']); + $merchant->append(['type_name', 'isset_certificate', 'services_type','mer_certificate']); $merchant['care'] = false; if ($userInfo) $merchant['care'] = $this->getCareByUser($id, $userInfo->uid); diff --git a/app/controller/api/store/product/StoreSpu.php b/app/controller/api/store/product/StoreSpu.php index 2fb8303..6e65439 100644 --- a/app/controller/api/store/product/StoreSpu.php +++ b/app/controller/api/store/product/StoreSpu.php @@ -64,7 +64,9 @@ class StoreSpu extends BaseController ]); $where['is_gift_bag'] = 0; $where['product_type'] = 0; - $where['is_good'] = 1; + if($limit == 20){ + $where['is_good'] = 1; + } $where['order'] = $where['order'] ?: 'rank'; if ($where['is_trader'] != 1) unset($where['is_trader']); $data = $this->repository->getApiSearch($where, $page, $limit, $this->userInfo);