From b31b69a4d0ff44020f81b6b26c4b3a25d1d758e9 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Thu, 7 Sep 2023 16:20:26 +0800
Subject: [PATCH] =?UTF-8?q?add:1.=E4=BC=81=E4=B8=9A=E5=AE=9E=E5=90=8D?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=97=B6=E5=8D=B3=E5=81=9A=E4=BA=BA=E8=84=B8?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E4=B8=8A=E4=BC=A0=E6=A0=A1=E9=AA=8C=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=BA=BA=E8=84=B8=E8=AF=86=E5=88=AB=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E5=90=8E=E5=8F=91=E7=9F=AD=E4=BF=A1=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=85=AC=E5=8F=B8=E6=B3=95=E4=BA=BA=E5=81=9A=E4=BA=BA=E8=84=B8?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/controller/CompanyController.php |  6 ++++++
 app/common/logic/CompanyLogic.php             | 18 ++++++------------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/adminapi/controller/CompanyController.php b/app/adminapi/controller/CompanyController.php
index 7b3afb172..0c371d074 100644
--- a/app/adminapi/controller/CompanyController.php
+++ b/app/adminapi/controller/CompanyController.php
@@ -200,6 +200,12 @@ class CompanyController extends BaseAdminController
             $res = app(JunziqianController::class)->EnterpriseCertification($data);
             if ($res->success == true) {
                 Db::name('company')->where('id', $params['id'])->update(['master_email' => $res->data,'is_authentication'=>1]);
+                // 企业人脸上传
+                $company['master_email'] = $res->data; // 法人邮箱
+                $faceCreateRe = CompanyLogic::originationFaceCreate($company);
+                if ($faceCreateRe !== true) {
+                    return $this->fail($faceCreateRe);
+                }
                 return $this->success('认证成功',[],1, 1);
                 // return $this->success('系统认证中，请稍后刷新页面查看', ['email' => $res->data], 1, 1);
             } else {
diff --git a/app/common/logic/CompanyLogic.php b/app/common/logic/CompanyLogic.php
index c204eedc3..00680cd6e 100644
--- a/app/common/logic/CompanyLogic.php
+++ b/app/common/logic/CompanyLogic.php
@@ -133,7 +133,7 @@ class CompanyLogic extends BaseLogic
             TaskScheduling::create($scheduling);
 
             // 企业人脸校验上传
-            self::originationFaceCreate($data);
+//            self::originationFaceCreate($data);
             Db::commit();
             return true;
         } catch (\Exception $e) {
@@ -155,18 +155,11 @@ class CompanyLogic extends BaseLogic
             'master_phone' => $data['master_phone'],
             'id' => $data['id'],
         ];
-        $sms = [
-            'mobile' => $data['master_phone'],
-            'name' => $data['master_name'],
-            'code' => 'api/Hetong/toFaceCreate?id=' . $data['id'],
-            'scene' => 'FACE_CREATE',
-            'type' => ''
-        ];
-        $smsRes = SmsLogic::contractUrl($sms);
+
         // 公司数据合法性校验
         $checkCompany = self::companyCheck($organizationFaceCreateData);
         if ($checkCompany !== true){
-            throw new Exception($checkCompany);
+            return $checkCompany;
         }
 
         $res = app(JunziqianController::class)->organizationFaceCreate($data);
@@ -183,11 +176,12 @@ class CompanyLogic extends BaseLogic
             ];
             $smsRes = SmsLogic::contractUrl($sms);
             if ($smsRes != true) {
-                throw new Exception(SmsLogic::getError());
+                return SmsLogic::getError();
             }
         } else {
-            throw new Exception($res->msg);
+            return $res->msg;
         }
+        return true;
     }
     private static function companyCheck($company) {
         if (empty($company)) {