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

Merge branch 'feature_business_apply' into dev

Browse Source
This commit is contained in:
yaooo 2023-09-19 13:27:41 +08:00
commit d8bd156cbd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,6 +80,7 @@ class MerchantIntention extends BaseController
'type' => 1, 'type' => 1,
'type_name' => Db::name('merchant_type')->where('mer_type_id', $data['mer_type_id'])->value('type_name', ''), 'type_name' => Db::name('merchant_type')->where('mer_type_id', $data['mer_type_id'])->value('type_name', ''),
'category_name' => Db::name('merchant_category')->where('merchant_category_id', $data['merchant_category_id'])->value('category_name', ''), 'category_name' => Db::name('merchant_category')->where('merchant_category_id', $data['merchant_category_id'])->value('category_name', ''),
'mer_name' => $data['mer_name'] ?? '',
'company_name' => $data['company_name'] ?? '', 'company_name' => $data['company_name'] ?? '',
'organization_code' => $data['social_credit_code'] ?? '', 'organization_code' => $data['social_credit_code'] ?? '',
'master_name' => $data['name'], 'master_name' => $data['name'],
@ -123,7 +124,6 @@ class MerchantIntention extends BaseController
'type_name' => Db::name('merchant_type')->where('mer_type_id', $merInfo['type_id'])->value('type_name', ''), 'type_name' => Db::name('merchant_type')->where('mer_type_id', $merInfo['type_id'])->value('type_name', ''),
'category_name' => Db::name('merchant_category')->where('merchant_category_id', $merInfo['category_id'])->value('category_name', ''), 'category_name' => Db::name('merchant_category')->where('merchant_category_id', $merInfo['category_id'])->value('category_name', ''),
'mer_name' => $intenInfo['mer_name'] ?? '', 'mer_name' => $intenInfo['mer_name'] ?? '',
'mer_name' => $intenInfo['mer_name'] ?? '',
'company_name' => $intenInfo['company_name'] ?? '', 'company_name' => $intenInfo['company_name'] ?? '',
'organization_code' => $intenInfo['social_credit_code'] ?? '', 'organization_code' => $intenInfo['social_credit_code'] ?? '',
'master_name' => $intenInfo['name'], 'master_name' => $intenInfo['name'],
@ -212,7 +212,7 @@ class MerchantIntention extends BaseController
'type' => 1, 'type' => 1,
'type_name' => Db::name('merchant_type')->where('mer_type_id', $data['mer_type_id'])->value('type_name', ''), 'type_name' => Db::name('merchant_type')->where('mer_type_id', $data['mer_type_id'])->value('type_name', ''),
'category_name' => Db::name('merchant_category')->where('merchant_category_id', $data['merchant_category_id'])->value('category_name', ''), 'category_name' => Db::name('merchant_category')->where('merchant_category_id', $data['merchant_category_id'])->value('category_name', ''),
'mer_name' => $intenInfo['mer_name'] ?? '', 'mer_name' => $data['mer_name'] ?? '',
'company_name' => $data['company_name'] ?? '', 'company_name' => $data['company_name'] ?? '',
'organization_code' => $data['social_credit_code'] ?? '', 'organization_code' => $data['social_credit_code'] ?? '',
'master_name' => $data['name'], 'master_name' => $data['name'],