更新店铺列表
This commit is contained in:
parent
1a7d6fcf0d
commit
d8dfe71b7d
@ -59,8 +59,7 @@ class Merchant extends BaseController
|
|||||||
[$page, $limit] = $this->getPage();
|
[$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']);
|
$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'])) {
|
if (empty($where['type_id'])) {
|
||||||
//$where['type_id'] = [MerchantModel::TypeCloudWarehouse, MerchantModel::TypeStore, MerchantModel::TypeSupplyChain, MerchantModel::TypePlatform];
|
$where['type_id'] =[10,17];
|
||||||
$where['type_id'] = Db::name('MerchantType')->where('is_allow_apply', 1)->where('type_code', '<>', MerchantModel::TypeCode['TypeSupplyChain'])->column('mer_type_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));
|
||||||
}
|
}
|
||||||
|
@ -130,7 +130,6 @@ class CloudWarehouse extends BaseController
|
|||||||
*/
|
*/
|
||||||
public function town()
|
public function town()
|
||||||
{
|
{
|
||||||
// 除了市级供应链都可以查询
|
|
||||||
$params = $this->request->params(['category_id', 'street_code', 'order', ['product_type', 0], 'keyword', 'page']);
|
$params = $this->request->params(['category_id', 'street_code', 'order', ['product_type', 0], 'keyword', 'page']);
|
||||||
$search = [
|
$search = [
|
||||||
'street_id' => $params['street_code'],
|
'street_id' => $params['street_code'],
|
||||||
|
Loading…
x
Reference in New Issue
Block a user