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

Merge pull request 'chenbo_dev_0904' (#6) from chenbo_dev_0904 into master

Browse Source 
Reviewed-on: #6
This commit is contained in:
chenbo 2023-09-05 14:24:32 +08:00
commit 79ac7be63f
4 changed files with 70 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,6 +203,8 @@ class CompanyController extends BaseAdminController
} else {
return $this->fail($res->msg);
}
} else {
return $this->fail("公司不存在");
}
}
//重新认证
@ -229,6 +231,47 @@ class CompanyController extends BaseAdminController
}
}
// 企业人脸校验上传
public function organizationFaceCreate()
{
$params = (new CompanyValidate())->goCheck('detail');
$company = Db::name('company')->where('id', $params['id'])->find();
// 公司数据合法性校验
$this->companyCheck($company);
$data = [
'company_name' => $company['company_name'],
'organization_code' => $company['organization_code'],
'master_name' => $company['master_name'],
'master_id_card' => $company['master_id_card'],
'master_email' => $company['master_email'],
'master_phone' => $company['master_phone'],
'id' => $company['id'],
];
$res = app(JunziqianController::class)->organizationFaceCreate($data);
if ($res->success == true && !empty($res->data)) {
return $this->success('成功',["faceCreateUrl"=>$res->data],1, 1);
} else {
return $this->fail($res->msg);
}
}
private function companyCheck($company) {
if (empty($company)) {
return $this->fail("公司不存在");
}
if (empty($company['master_face'])) {
return $this->fail("未上传主联系人头像信息，无法上传企业人脸");
}
if(empty($company['master_id_card'])) {
return $this->fail("主联系人证件号为空，无法上传企业人脸");
}
if(empty($company['master_email'])) {
return $this->fail("主联系人邮箱为空，无法上传企业人脸");
}
}
public function userList()
{
$existUsers = Company::where('status', '<>', -1)->column('admin_id');

6
app/adminapi/validate/CompanyValidate.php
View File

@ -35,6 +35,7 @@ class CompanyValidate extends BaseValidate
'company_name' => 'require|unique:Company',
'organization_code' => 'require',
'master_name' => 'require',
'id_card' => 'require',
'master_position' => 'require',
'master_phone' => 'require',
'master_email' => 'require',
@ -52,6 +53,7 @@ class CompanyValidate extends BaseValidate
'company_name' => '公司名称',
'organization_code' => '组织机构代码',
'master_name' => '主联系人姓名',
'id_card' => '主联系人身份证',
'master_position' => '主联系人职务',
'master_phone' => '主联系人手机',
'master_email' => '主联系人邮箱',
@ -68,7 +70,7 @@ class CompanyValidate extends BaseValidate
*/
public function sceneAdd()
{
return $this->only(['company_name','organization_code','master_name','master_position','master_phone']);
return $this->only(['company_name','organization_code','master_name','id_card','master_position','master_phone']);
}
@ -80,7 +82,7 @@ class CompanyValidate extends BaseValidate
*/
public function sceneEdit()
{
return $this->only(['id','company_name','organization_code','master_name','master_position','master_phone']);
return $this->only(['id','company_name','organization_code','master_name','id_card','master_position','master_phone']);
}

21
app/api/controller/JunziqianController.php
View File

@ -153,6 +153,26 @@ class JunziqianController extends BaseApiController
return $response;
}
// 企业人脸校验上传
public function OrganizationFaceCreate($data)
{
$requestUtils = new RequestUtils($this->serviceUrl, $this->appkey, $this->appSecret);
$request=new OrganizationCreateReq();
$request-> orderNo = uniqid();
$request-> email = $data['master_email'];
$request-> enterpriseName = $data['company_name'];
$request-> identityNo = $data['organization_code'];
$request-> legalPersonName = $data['master_name'];
$request-> legalIdentityCard = $data['master_id_card'];//法人证件号
$request-> legalMobile = $data['master_phone'];
$request-> facePerType = 1; // 1代理人
$request-> faceAgantIdenName = $data['master_name'];
$request-> faceAgantIdenCard = $data['master_id_card'];
$request-> backUrl = env('url.url_prefix').'/mobile'; // 做完人脸识别后，指定跳转到供销系统mobile首页
$response = $requestUtils->doPost("/v2/user/organizationFaceCreate",$request);
return $response;
}
public function VehicleRentSigning($data, $id, $notify)
{
$requestUtils = new RequestUtils($this->serviceUrl, $this->appkey, $this->appSecret);
@ -163,6 +183,7 @@ class JunziqianController extends BaseApiController
$request->fileType = 1; //合同上传方式 url
$request->url = $data['url'];
$request->notifyUrl = $notify.'?id='.$id;
$request->needQifengSign = 1;
//发起PING请求
// halt($request);

2
app/common/logic/CompanyLogic.php
View File

@ -66,6 +66,7 @@ class CompanyLogic extends BaseLogic
'address' => $params['address'],
'company_type' => $params['company_type'],
'master_name' => $params['master_name'],
'master_id_card' => $params['id_card'], // 主联系人证件号
'master_position' => $params['master_position'],
'master_phone' => $params['master_phone'],
'master_email' => $params['master_email'],
@ -156,6 +157,7 @@ class CompanyLogic extends BaseLogic
'address' => $params['address'],
'company_type' => $params['company_type'],
'master_name' => $params['master_name'],
'master_id_card' => $params['id_card'], // 主联系人证件号
'master_position' => $params['master_position'],
'master_phone' => $params['master_phone'],
'master_email' => $params['master_email'],