mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

商户按地址搜索

Browse Source
This commit is contained in:
彭桃 2023-03-08 17:26:39 +08:00 committed by monanxiao
parent b07ecee60b
commit a537dfb8e9
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/common/dao/system/merchant/MerchantDao.php
View File

@ -52,6 +52,10 @@ class MerchantDao extends BaseDao
->when(isset($where['is_trader']) && $where['is_trader'] !== '', function ($query) use ($where) { ->when(isset($where['is_trader']) && $where['is_trader'] !== '', function ($query) use ($where) {
$query->where('is_trader', $where['is_trader']); $query->where('is_trader', $where['is_trader']);
}) })
->when(isset($where['street_id']) && $where['street_id'] !== '', function ($query) use ($where) {
$mer_id = Db::name('merchant_address')->where('street_id', $where['street_id'])->column('mer_id');
$query->whereIn('mer_id',$mer_id ?: '' );
})
->when(isset($where['is_best']) && $where['is_best'] !== '', function ($query) use ($where) { ->when(isset($where['is_best']) && $where['is_best'] !== '', function ($query) use ($where) {
$query->where('is_best', $where['is_best']); $query->where('is_best', $where['is_best']);
}) })

2
app/controller/api/store/merchant/Merchant.php
View File

@ -42,7 +42,7 @@ class Merchant extends BaseController
public function lst() public function lst()
{ {
[$page, $limit] = $this->getPage(); [$page, $limit] = $this->getPage();
$where = $this->request->params(['keyword', 'order', 'is_best', 'location', 'category_id', 'type_id','is_trader']); $where = $this->request->params(['keyword', 'order', 'is_best', 'location', 'category_id', 'type_id','is_trader','street_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));
} }