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

Merge pull request 'dev' (#7) from dev into master

Browse Source 
Reviewed-on: #7
This commit is contained in:
mkm 2023-09-05 17:32:04 +08:00
commit 1e7e676592
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/common/repositories/system/merchant/MerchantCategoryRepository.php
View File

@ -114,10 +114,17 @@ class MerchantCategoryRepository extends BaseRepository
* @Date: 2020/9/15
* @return array
*/
public function getSelect()
public function getSelect($v2=0)
{
$query = $this->search([])->field('merchant_category_id,category_name,background');
$list = $query->select()->toArray();
if ($v2) {
foreach($list as $k=>$v) {
if ($v['category_name'] == '区域特色') {
unset($list[$k]);
}
}
}
return $list;
}
}

12
app/controller/api/store/merchant/MerchantIntention.php
View File

@ -157,6 +157,18 @@ class MerchantIntention extends BaseController
return app('json')->success($lst);
}
/**
* v2商户分类
* @Author:Qinii
* @Date: 2020/9/15
* @return mixed
*/
public function v2CateLst()
{
$lst = app()->make(MerchantCategoryRepository::class)->getSelect(1);
return app('json')->success($lst);
}
public function typeLst()
{
/** @var MerchantTypeRepository $repo */

1
route/api.php
View File

@ -549,6 +549,7 @@ Route::group('api/', function () {
//申请商户
Route::post('intention/create', 'api.store.merchant.MerchantIntention/create');
Route::get('intention/cate', 'api.store.merchant.MerchantIntention/cateLst');
Route::get('intention/v2/cate', 'api.store.merchant.MerchantIntention/v2CateLst');
Route::get('intention/type', 'api.store.merchant.MerchantIntention/typeLst');
//浏览
Route::post('common/visit', 'api.Common/visit');