mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master-fix-0914' into dev

Browse Source 
# Conflicts:
#	app/common/model/ShopContract.php
This commit is contained in:
chenbo 2023-09-14 11:18:58 +08:00
commit c56d1ca88d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/adminapi/controller/CompanyController.php
View File

@ -371,6 +371,7 @@ class CompanyController extends BaseAdminController
if (empty($params['master_name'])) { if (empty($params['master_name'])) {
throw new Exception('商户法人名称不能为空'); throw new Exception('商户法人名称不能为空');
} }
$data = [ $data = [
'mer_intention_id' => $params['mer_intention_id'], // 商城商户入驻申请id，签约完成后回调使用 'mer_intention_id' => $params['mer_intention_id'], // 商城商户入驻申请id，签约完成后回调使用
'company_name' => $params['company_name'], 'company_name' => $params['company_name'],
@ -381,7 +382,8 @@ class CompanyController extends BaseAdminController
'master_name' => $params['master_name'], 'master_name' => $params['master_name'],
'master_phone' => $params['master_phone'], 'master_phone' => $params['master_phone'],
'master_email' => substr(md5(uniqid()),rand(0, 22),10)."@lihai.com", 'master_email' => substr(md5(uniqid()),rand(0, 22),10)."@lihai.com",
'face_create_status' => 1 'face_create_status' => 1,
'qualification' => $params['images']
]; ];
$shopMerchantModel = ShopMerchant::create($data); $shopMerchantModel = ShopMerchant::create($data);

3
app/common/model/ShopContract.php
View File

@ -16,7 +16,7 @@ namespace app\common\model;
use app\common\model\BaseModel; use app\common\model\BaseModel;
use app\common\model\dict\DictData;
/** /**
@ -30,6 +30,7 @@ class ShopContract extends BaseModel
protected $name = 'shop_contract'; protected $name = 'shop_contract';
/** /**
* @notes 关联company_name * @notes 关联company_name
* @return \think\model\relation\HasOne * @return \think\model\relation\HasOne