This commit is contained in:
mkm 2023-12-04 16:01:22 +08:00
parent b445e29f30
commit 44b26d517c

View File

@ -62,17 +62,17 @@ class Merchant extends BaseController
if (empty($where['type_id'])) { if (empty($where['type_id'])) {
$where['type_id'] =[10,17]; $where['type_id'] =[10,17];
} }
// if($where['store_category_id']>0){ if($where['store_category_id']>0){
// $arr= Db::name('store_category')->where(['pid'=>$where['store_category_id'],'mer_id'=>0,'level'=>1,'is_show'=>1])->column('cate_name'); $arr= Db::name('store_category')->where(['pid'=>$where['store_category_id'],'mer_id'=>0,'level'=>1,'is_show'=>1])->column('cate_name');
// if($arr){ if($arr){
// $category_id=Db::name('merchant_category')->whereIn('category_name',$arr)->column('merchant_category_id'); $category_id=Db::name('merchant_category')->whereIn('category_name',$arr)->column('merchant_category_id');
// if($category_id){ if($category_id){
// $where['category_id']=implode(',',$category_id); $where['category_id']=implode(',',$category_id);
// } }
// } }
// unset($where['store_category_id']); unset($where['store_category_id']);
// } }
$where['category_id']=$where['store_category_id']??''; // $where['category_id']=$where['store_category_id']??'';
return app('json')->success($this->repository->getList($where, $page, $limit, $this->userInfo)); return app('json')->success($this->repository->getList($where, $page, $limit, $this->userInfo));
} }