Merge branch 'master' of e.coding.net:zdap/weixiu/weixiu_api into m--accessory_settlement

app/adminapi/logic/works/ServiceWorkLogic.php

@@ -1201,11 +1201,12 @@ class ServiceWorkLogic extends BaseLogic
             }
             $encryptedData = encrypt($params['work_sn'], \think\facade\Config::get('project.work_sn_key'));
             $user_website = \think\facade\Config::get('project.user_website');
+            $quoted_price = env('project.quoted_price')?:$user_website.'pages/quoted_price';
             $type = $params['type']??1;
             if($type == 1){
                 $user_website .= '?code='.$encryptedData;
             }elseif($type == 2){
-                $user_website .= 'pages/quoted_price?code='.$encryptedData;
+                $user_website = $quoted_price.'?code='.$encryptedData;
             }
             return ['url'=>$user_website];
         }catch  (\Exception $e) {

app/workerapi/controller/MasterWorkerController.php

@@ -195,8 +195,16 @@ class MasterWorkerController extends BaseApiController
     }
     public function getAltitudeCredential()
     {
-        $result = MasterWorkerRegisterLogic::credential($this->userId,'高处作业');
-        return $this->success('', ['isAltitude'=>$result?1:0], 1, 1);
+        $params = request()->get();
+        if(in_array($params['credential_type'],[3,52,109,17])){
+            $result = MasterWorkerRegisterLogic::credential($this->userId,'高处作业',1);
+            if($result){
+                return $this->success('', ['isAltitude'=>$result?1:0], 1, 1);
+            }else{
+                return $this->fail('尊敬的工程师，你好，因相关法律法规要求，空调加氟、空调移机安装、空调外机维修等涉高作业，需要持有高处作业证书，如您想开启相关类目，请前往上传证书配置。谢谢合作！');
+            }
+        }
+        return $this->success('', [], 1, 1);
     }
 
 }

app/workerapi/logic/MasterWorkerRegisterLogic.php

@@ -109,11 +109,12 @@ class MasterWorkerRegisterLogic extends BaseLogic
     /**
      * 获取证件
      */
-    public static function credential($worker_id,$image_name=''): array
+    public static function credential($worker_id,$image_name='',$is_ok = 0): array
     {
         $worker_register_id = MasterWorkerRegister::where('worker_id',$worker_id)->value('id');
         $where[] = ['worker_register_id','=',$worker_register_id];
         $image_name && $where[] = ['image_name','=',$image_name];
+        $is_ok && $where[] = ['audit_state','=',1];
         $list = MasterWorkerCredentialImages::where($where)->select()->toArray();
         foreach ($list as &$item) {
             switch ($item['image_name']){
@@ -123,7 +124,7 @@ class MasterWorkerRegisterLogic extends BaseLogic
                 case '焊工':
                     $item['credential_type'] = 179;
                     break;
-                case '高处':
+                case '高处作业':
                     $item['credential_type'] = 180;
                     break;
                 case '制冷':
@@ -152,7 +153,7 @@ class MasterWorkerRegisterLogic extends BaseLogic
                     $params['image_name'] = '焊工';
                     break;
                 case 180:
-                    $params['image_name'] = '高处';
+                    $params['image_name'] = '高处作业';
                     break;
                 case 181:
                     $params['image_name'] = '制冷';
@@ -167,6 +168,7 @@ class MasterWorkerRegisterLogic extends BaseLogic
             $params['worker_register_id'] && $where[] = ['worker_register_id','=',$params['worker_register_id']];
             $id && $where[] = ['id','=',$params['id']];
             $isAltitude && $where[] = ['image_name','=','高处作业'];
+            $params['image_name'] && $where[] = ['image_name','=',$params['image_name']];
             $credentialImages = MasterWorkerCredentialImages::where($where)->findOrEmpty();
             if($credentialImages->isEmpty()){
                 MasterWorkerCredentialImages::create([