From e8b81e406c7a4348709af54070ec96d8353886d9 Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Mon, 11 Sep 2023 13:52:29 +0800 Subject: [PATCH] =?UTF-8?q?update:=E5=B9=B3=E5=8F=B0=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E4=B8=8D=E5=81=9A=E4=BB=BB=E5=8A=A1=E5=AE=89=E6=8E=92=E5=92=8C?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=90=88=E5=90=8C=EF=BC=8C=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E4=BC=81=E4=B8=9A=E8=AE=A4=E8=AF=81=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E5=90=8E=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0=E7=AD=BE?= =?UTF-8?q?=E7=BA=A6=E7=8A=B6=E6=80=81=E4=B8=BA=E5=B7=B2=E7=AD=BE=E7=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/adminapi/controller/CompanyController.php | 11 ++++++++--- app/api/controller/IndexController.php | 1 + app/common/logic/CompanyLogic.php | 17 ++++++++++------- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/app/adminapi/controller/CompanyController.php b/app/adminapi/controller/CompanyController.php index 344597565..eaa83aa2a 100644 --- a/app/adminapi/controller/CompanyController.php +++ b/app/adminapi/controller/CompanyController.php @@ -203,15 +203,20 @@ class CompanyController extends BaseAdminController $res = app(JunziqianController::class)->EnterpriseCertification($data); Log::info(['企业认证同步结果',$res]); if ($res->success == true) { - $email = $res->data; // 企业人脸上传 // $company['master_email'] = $email; // 法人邮箱 // $faceCreateRe = CompanyLogic::originationFaceCreate($company); // if ($faceCreateRe !== true) { // return $this->fail($faceCreateRe); // } - // 修改法人邮箱 - Db::name('company')->where('id', $params['id'])->update(['master_email' => $email, 'face_create_status'=>1]); + // + if ($company->company_type == 30) { + // 平台公司不用初始化生成合同 合同签约暂不用人脸识别,预留人脸采集状态为已采集 + Db::name('company')->where('id', $params['id'])->update([ 'is_contract'=>1,'face_create_status'=>1]); + } else { + Db::name('company')->where('id', $params['id'])->update([ 'face_create_status'=>1]); + } + // 加入缓存中,is_callback用于判断是否获取到异步通知 RedisLogic::getInstance()->set('authentication_company_id_'.$company['id'], json_encode(['company_id'=>$company['id'],'is_callback'=>0, 'timing'=>time()])); // return $this->success('认证成功',[],1, 1); diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index 12bda7c55..659d174a4 100755 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -511,6 +511,7 @@ class IndexController extends BaseApiController if($data['status']==2){ // 记录认证失败原因 Db::name('company_authentication_fail_log')->insert(['company_id'=>$parmas['id'],'fail_reason'=>$data['msg'],'create_time'=>time()]); + Company::where('id', $parmas['id'])->update([ 'is_contract'=>0]); } return json(['success' => true, 'msg' => '成功']); } diff --git a/app/common/logic/CompanyLogic.php b/app/common/logic/CompanyLogic.php index 6faabc6ba..a3bc677c4 100644 --- a/app/common/logic/CompanyLogic.php +++ b/app/common/logic/CompanyLogic.php @@ -81,7 +81,7 @@ class CompanyLogic extends BaseLogic 'master_id_card' => $params['id_card'], // 主联系人证件号 todo DDL 新增字段 'master_position' => $params['master_position'], 'master_phone' => $params['master_phone'], - 'master_email' => $params['master_email'], + 'master_email' => substr(md5(uniqid(),uniqid()),rand(0, 32),10)."@lihai.com", // 随机邮箱 'other_contacts' => $params['other_contacts'], 'area_manager' => $params['area_manager'] ?? 0, 'qualification' => $params['qualification'], @@ -130,12 +130,15 @@ class CompanyLogic extends BaseLogic $user_id = User::strict(false)->insertGetId($admin); Company::where('id',$data['id'])->update(['admin_id'=>$admin_id,'user_id'=>$user_id]); - $scheduling=[ - 'create_user_id'=>$params['area_manager'] ?? 0, - 'company_id'=>$data['id'], - 'company_type'=>$params['company_type'], - ]; - TaskScheduling::create($scheduling); + // 平台公司没有合同和发布业务 + if ($params['company_type'] != 30){ + $scheduling=[ + 'create_user_id'=>$params['area_manager'] ?? 0, + 'company_id'=>$data['id'], + 'company_type'=>$params['company_type'], + ]; + TaskScheduling::create($scheduling); + } // 企业人脸校验上传 // self::originationFaceCreate($data);