no message

.env.example

@@ -52,6 +52,13 @@ PUSHER_APP_CLUSTER=mt1
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
+#企业宝短信配置
+QYB_USERNAME=
+QYB_PASSWORD=
+SIGN_TEXT=振合网
+IS_CURRENT=true
+
+
 #阿里OSS配置
 ALI_OSS_ACCESS_ID=
 ALI_OSS_ACCESS_KEY=

app/Console/Commands/TestCommand.php

@@ -10,6 +10,7 @@ use App\Models\FactoringProperty;
 use App\Models\Firm;
 use App\Models\IndentNum;
 use App\Models\Member;
+use App\Models\MemberSeal;
 use App\Models\SignMember;
 use App\Models\SignSeal;
 use App\Models\SignSealAuth;
@@ -64,13 +65,19 @@ class TestCommand extends Command
      */
     public function handle()
     {
-        dd(11111);
+//        dd(11111);
 //        $file_path = 'storage/contract/测试.docx';
 //
 //        $json = '{"name": "江雨","text":"测试一下","phone":"13012341234"}';
 //        $file = WordServer::creatServer()->replaceWordText($file_path,'123.docx',$json);
 //        dd($file);
-        ESignContractServer::creatServer()->setContractContract(111,11);
-        dd(111);
+//        ESignContractServer::creatServer()->setContractContract(111,11);
+//        dd(111);
+
+        $content='尊敬的，您有待认证信息，点击认证 ';
+        $r = SmsServer::creatServer()->sendContent('18323851679',$content);
+        dd($r);
+        $Res = ESignServer::creatServer()->personsidentityinfo(1,18323851679,'江雨',500221200002194310);
+        dd($Res);
     }
 }

app/Http/Controllers/AdminApi/FirmController.php

@@ -6,6 +6,7 @@ use App\Http\Controllers\AdminController;
 use App\Models\Firm;
 use App\Servers\ESign\ESignFirmServer;
 use App\Servers\System\CommonServer;
+use App\Servers\System\JobServer;
 
 class FirmController extends AdminController
 {
@@ -77,7 +78,6 @@ class FirmController extends AdminController
         //查询个人认证信息
         ESignFirmServer::creatServer()->organizationsIdentityInfo($firm_id,$firm_name);
 
-
         if ($res) {
             return $this->apiResponseSuccess('操作成功');
         } else {

app/Http/Controllers/AdminApi/MemberController.php

@@ -6,6 +6,7 @@ use App\Http\Controllers\AdminController;
 use App\Models\Member;
 use App\Servers\ESign\ESignServer;
 use App\Servers\System\CommonServer;
+use App\Servers\System\JobServer;
 
 class MemberController extends AdminController
 {
@@ -73,7 +74,6 @@ class MemberController extends AdminController
         //查询个人认证信息
         ESignServer::creatServer()->personsidentityinfo($m_id,$phone,$name,$id_number);
 
-
         if ($res) {
             return $this->apiResponseSuccess('操作成功');
         } else {

app/Servers/ESign/ESignFirmServer.php

@@ -72,9 +72,9 @@ class ESignFirmServer
      * @return mixed
      */
     function organizationsIdentityInfo($firm_id,$orgName){
-        $info =  Firm::where('id',$firm_id)->where('authType','ORG')->first();
-        if($info->{'realnameStatus'}==1 && $info->{'orgId'}!=''){
-            return $info;
+        $info =  Firm::where('id',$firm_id)->where('authType','ORG')->select(['realnameStatus','authorizeUserInfo','orgId'])->first();
+        if($info->{'realnameStatus'}==1  && $info->{'authorizeUserInfo'} == 1 && $info->{'orgId'}!=''){
+            return $info->{'realnameStatus'};
         }
 
         $config=$this->config;
@@ -105,12 +105,18 @@ class ESignFirmServer
             if (empty($realnameStatus) || empty($authorizeUserInfo)){//走认证授权流程
                 $this->orgAuthUrl($firm_id,$orgName);
             }
-        }else{
+        }else{//证明从来没有在e签宝注册过
+            //realnameStatus 0 - 未实名，1 - 已实名
+            $realnameStatus = 0;
+            //true - 已授权，false - 未授权
+            $authorizeUserInfo = 0;
+            //个人账号ID
+            $orgId = '';
             //走认证授权流程
             $this->orgAuthUrl($firm_id,$orgName);
         }
 
-        return $info;
+        return $realnameStatus;
     }
 
     /**

app/Servers/ESign/ESignServer.php

@@ -86,7 +86,7 @@ class ESignServer
             "redirectConfig"=>[
                 "redirectUrl"=>'',
             ],
-            "notifyUrl"=>route('notify.esignNotify'),
+            "notifyUrl"=>route('adminApi.notify.esignNotify'),
             "clientType"=>"ALL",
             "appScheme"=>""
         ];
@@ -96,13 +96,12 @@ class ESignServer
         //发起接口请求
         $response = EsignHttpHelper::doCommHttp($config['eSignHost'], $apiaddr, $requestType, $signAndBuildSignAndJsonHeader, $paramStr);
         $ret=json_decode($response->getBody(),true);
-
         if(isset($ret['code']) && $ret['code']==0){
             $authShortUrl=RedisDataServer::creatServer()->getData($m_id.'_memberUrl');
             if($authShortUrl){
                 return true;
             }
-            $signMember=Member::where('m_id',$m_id)->where('authType','PSN')->where([['updated_at','<=',date('Y-m-d H:i:s',time()-600),'or'],['authShortUrl','=','','or']])->first();
+            $signMember=Member::where('id',$m_id)->where('authType','PSN')->where([['updated_at','<=',date('Y-m-d H:i:s',time()-600),'or'],['authShortUrl','=','','or']])->first();
             if($signMember){
                 $authUrl = $ret['data']['authUrl'];
                 $authShortUrl = $ret['data']['authShortUrl'];
@@ -133,8 +132,8 @@ class ESignServer
      */
     function personsidentityinfo($m_id,$phone,$psnName,$id_number)
     {
-        $info =  Member::where('id_number',$id_number)->where('id',$m_id)->where('authType','PSN')->first();
-        if($info->{'realnameStatus'}==1 && $info->{'psnId'}!=''){
+        $info =  Member::where('id_number',$id_number)->where('id',$m_id)->where('authType','PSN')->select(['realnameStatus','authorizeUserInfo','psnId'])->first();
+        if($info->{'realnameStatus'}==1 && $info->{'authorizeUserInfo'} == 1 && $info->{'psnId'}!=''){
             return $info->{'realnameStatus'};
         }
 
@@ -158,7 +157,6 @@ class ESignServer
                 'authorizeUserInfo'=>$authorizeUserInfo,
                 'psnId'=>$psnId,
             ]);
-
             if (empty($realnameStatus) || empty($authorizeUserInfo)){//走个人认证授权流程
                 $this->psnauthurl($m_id,$phone,$psnName,$id_number,$psnId);
             }