From db7a68d449653790fe405488b4c81586c9f5ac8a Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Mon, 4 Sep 2023 17:48:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?add:=E4=BC=81=E4=B8=9A=E4=BA=BA=E8=84=B8?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/adminapi/controller/CompanyController.php | 43 +++++++++++++++++++ app/api/controller/IndexController.php | 9 ++++ app/api/controller/JunziqianController.php | 20 +++++++++ app/common/logic/CompanyLogic.php | 1 + route/app.php | 1 + 5 files changed, 74 insertions(+) diff --git a/app/adminapi/controller/CompanyController.php b/app/adminapi/controller/CompanyController.php index 7920b1d11..893a6d95f 100644 --- a/app/adminapi/controller/CompanyController.php +++ b/app/adminapi/controller/CompanyController.php @@ -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'); diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index d2ed0138d..c3c80dbfb 100755 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -385,4 +385,13 @@ class IndexController extends BaseApiController return json(['success' => false, 'msg' => '失败,没有参数']); } + + /** + * 企业人脸校验上传回调 + */ + public function notifyOrganizationFaceCreate() + { + $parmas = Request()->param(); + Log::debug('认证回调:'.$parmas); + } } diff --git a/app/api/controller/JunziqianController.php b/app/api/controller/JunziqianController.php index 8d056227b..5fe96daeb 100644 --- a/app/api/controller/JunziqianController.php +++ b/app/api/controller/JunziqianController.php @@ -153,6 +153,25 @@ 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; + $request-> faceAgantIdenName = $data['master_name']; + $request-> faceAgantIdenCard = $data['master_id_card']; + $request-> backUrl = env('url.url_prefix').'/notifyOrganizationFaceCreate?id='.$data['id']; + $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 +182,7 @@ class JunziqianController extends BaseApiController $request->fileType = 1; //合同上传方式 url $request->url = $data['url']; $request->notifyUrl = $notify.'?id='.$id; + $request->needQifengSign = 1; //发起PING请求 // halt($request); diff --git a/app/common/logic/CompanyLogic.php b/app/common/logic/CompanyLogic.php index cbced01fd..8339af017 100644 --- a/app/common/logic/CompanyLogic.php +++ b/app/common/logic/CompanyLogic.php @@ -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'], diff --git a/route/app.php b/route/app.php index dab0d9540..e74188d82 100755 --- a/route/app.php +++ b/route/app.php @@ -36,4 +36,5 @@ Route::rule('crontab', function () { Route::post('/notify_url', IndexController::class . '@notifyUrl'); Route::post('/notifyAuthentication',IndexController::class . '@notifyAuthentication'); +Route::post('/notifyOrganizationFaceCreate',IndexController::class . '@notifyOrganizationFaceCreate'); // 企业人脸上传校验回调接口 Route::get('/api/junziqian/download_file',JunziqianController::class . '@download_file'); \ No newline at end of file From 5bb2db740ab293c30963f638b2e5db033a964fbd Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Tue, 5 Sep 2023 09:52:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?update:=E6=B7=BB=E5=8A=A0=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=A0=A1=E9=AA=8C=E4=B8=BB=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E4=BA=BA=E8=BA=AB=E4=BB=BD=E8=AF=81=E4=B8=8D=E8=83=BD=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/adminapi/validate/CompanyValidate.php | 6 ++++-- app/api/controller/JunziqianController.php | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/adminapi/validate/CompanyValidate.php b/app/adminapi/validate/CompanyValidate.php index 8f24bd6db..45b96bd90 100644 --- a/app/adminapi/validate/CompanyValidate.php +++ b/app/adminapi/validate/CompanyValidate.php @@ -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']); } diff --git a/app/api/controller/JunziqianController.php b/app/api/controller/JunziqianController.php index 5fe96daeb..8177db34b 100644 --- a/app/api/controller/JunziqianController.php +++ b/app/api/controller/JunziqianController.php @@ -154,7 +154,8 @@ class JunziqianController extends BaseApiController } // 企业人脸校验上传 - public function OrganizationFaceCreate($data) { + public function OrganizationFaceCreate($data) + { $requestUtils = new RequestUtils($this->serviceUrl, $this->appkey, $this->appSecret); $request=new OrganizationCreateReq(); $request-> orderNo = uniqid(); @@ -164,7 +165,7 @@ class JunziqianController extends BaseApiController $request-> legalPersonName = $data['master_name']; $request-> legalIdentityCard = $data['master_id_card'];//法人证件号 $request-> legalMobile = $data['master_phone']; - $request-> facePerType = 1; + $request-> facePerType = 1; // 1代理人 $request-> faceAgantIdenName = $data['master_name']; $request-> faceAgantIdenCard = $data['master_id_card']; $request-> backUrl = env('url.url_prefix').'/notifyOrganizationFaceCreate?id='.$data['id']; From f426d39c1dda41b88d73d08757d566d3ea991dcc Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Tue, 5 Sep 2023 11:36:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?update:1.=E7=BC=96=E8=BE=91=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E6=97=B6=EF=BC=8C=E5=8A=A0=E4=B8=8A=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=B8=BB=E8=81=94=E7=B3=BB=E4=BA=BA=E8=BA=AB=E4=BB=BD=E8=AF=81?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91=E3=80=822.=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=81=9A=E5=AE=8C=E4=BA=BA=E8=84=B8=E8=AF=86=E5=88=AB=E5=90=8E?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E4=BE=9B=E9=94=80=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?mobile=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/IndexController.php | 9 --------- app/api/controller/JunziqianController.php | 2 +- app/common/logic/CompanyLogic.php | 1 + route/app.php | 1 - 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index 0215380db..3d72ac2fe 100755 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -383,13 +383,4 @@ class IndexController extends BaseApiController return json(['success' => false, 'msg' => '失败,没有参数']); } - - /** - * 企业人脸校验上传回调 - */ - public function notifyOrganizationFaceCreate() - { - $parmas = Request()->param(); - Log::debug('认证回调:'.$parmas); - } } diff --git a/app/api/controller/JunziqianController.php b/app/api/controller/JunziqianController.php index 8177db34b..8afe13638 100644 --- a/app/api/controller/JunziqianController.php +++ b/app/api/controller/JunziqianController.php @@ -168,7 +168,7 @@ class JunziqianController extends BaseApiController $request-> facePerType = 1; // 1代理人 $request-> faceAgantIdenName = $data['master_name']; $request-> faceAgantIdenCard = $data['master_id_card']; - $request-> backUrl = env('url.url_prefix').'/notifyOrganizationFaceCreate?id='.$data['id']; + $request-> backUrl = env('url.url_prefix').'/mobile'; // 做完人脸识别后，指定跳转到供销系统mobile首页 $response = $requestUtils->doPost("/v2/user/organizationFaceCreate",$request); return $response; } diff --git a/app/common/logic/CompanyLogic.php b/app/common/logic/CompanyLogic.php index 8339af017..b149f10f0 100644 --- a/app/common/logic/CompanyLogic.php +++ b/app/common/logic/CompanyLogic.php @@ -157,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'], diff --git a/route/app.php b/route/app.php index e74188d82..dab0d9540 100755 --- a/route/app.php +++ b/route/app.php @@ -36,5 +36,4 @@ Route::rule('crontab', function () { Route::post('/notify_url', IndexController::class . '@notifyUrl'); Route::post('/notifyAuthentication',IndexController::class . '@notifyAuthentication'); -Route::post('/notifyOrganizationFaceCreate',IndexController::class . '@notifyOrganizationFaceCreate'); // 企业人脸上传校验回调接口 Route::get('/api/junziqian/download_file',JunziqianController::class . '@download_file'); \ No newline at end of file