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

Merge branch 'feat_agree' into dev

Browse Source
This commit is contained in:
yaooo 2023-09-23 14:00:47 +08:00
commit 0f6857c627
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -253,6 +253,21 @@ class Merchant extends BaseController
return app('json')->success($data);
}
/**
* @return mixed
* @author xaboy
* @day 2020/7/21
*/
public function marginInfo(MerchantTakeRepository $repository)
{
$id = $this->request->param('id');
if(empty($id)){
return app('json')->fail('参数错误');
}
$data = Db::name('merchant')->where('mer_id',$id)->field('uid,mer_id,mer_name,margin,is_margin')->find();
return app('json')->success($data);
}
public function apply($merId){
$merchant = app()->make(MerchantRepository::class)->search(['mer_id' => $merId])->field('uid,mer_id,mer_name,mer_money,financial_bank,financial_wechat,financial_alipay,financial_type')->find();
if (($msg = $this->checkAuth($merchant)) !== true) {

1
route/api.php
View File

@ -546,6 +546,7 @@ Route::group('api/', function () {
Route::post('update', 'Merchant/update');
// 商户信息
Route::get('info', 'Merchant/info');
Route::get('margin', 'Merchant/marginInfo');
})->prefix('api.store.merchant.');
Route::post('store/certificate/:merId', 'api.Auth/getMerCertificate');