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

更新商户类型处理

Browse Source
This commit is contained in:
yaooo 2023-09-26 14:25:58 +08:00
parent 6041ab67ba
commit 7dc2bf4dbb
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controller/admin/system/merchant/MerchantType.php
View File

@ -91,7 +91,7 @@ class MerchantType extends BaseController
protected function getValidParams()
{
$data = $this->request->params(['type_name', 'type_info', 'is_margin', 'margin', 'auth', 'description', 'is_allow_apply', 'is_search_display', 'is_sync_prod', 'type_code']);
$data = $this->request->params(['type_name', 'type_info', 'is_margin', 'margin', 'first_margin', 'auth', 'description', 'is_allow_apply', 'is_search_display', 'is_sync_prod', 'type_code']);
$validate = app()->make(MerchantTypeValidate::class);
$validate->check($data);
if ($data['is_margin'] == 1) {

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

@ -156,6 +156,31 @@ class MerchantIntention extends BaseController
$intenInfo = Db::name('merchant_intention')->where('mer_intention_id', $merInfo['mer_intention_id'] ?? 0)->where('type', 1)->find();
if (empty($intenInfo)) {
return app('json')->fail('商户状态异常');
} else {
/*
'phone',
'mer_name',
'company_name',
'address',
'name',
'code',
'images',
'merchant_category_id',
'mer_type_id',
'social_credit_code',
'area_id',
'street_id',
'village_id',
$intenInfo = [
'uid' => 0,
'phone' => 0,
'mer_name' => 0,
'company_name' => 0,
'name' => 0,
'social_credit_code' => 0,
'address' => 0,
];
*/
}
$intenInfo['bank_username'] = $data['bank_username'];
@ -203,7 +228,7 @@ class MerchantIntention extends BaseController
return app('json')->success('申请成功');
}
//发送商户入驻申请
//发送商户申请
public function sendMerIntentionApply($data, $postUrl)
{
Log::info("商户申请URL: {$postUrl}");