合并分支 'master-server' 到 'master'

Master server



查看合并请求 !778

@@ -60,7 +60,7 @@ class InquiryController extends BaseController
                     $value['phone_data'] = [];
                     foreach ($phoneDataList as  $valuePhone){
                         if($value['phone'] == $valuePhone['phone']){
-                            $value['phone_data'] = json_decode($valuePhone['data']);
+                            $value['phone_data'] = $valuePhone;
                             break;
                         }
                     }

@@ -185,24 +185,30 @@ class InquiryLogic extends BaseLogic
      */
     public function sendMobileVerifyData($phone){
         $phoneDataModel = new PhoneData();
-        $info = $phoneDataModel->read(['phone'=>$phone]);
+        $num_phone = preg_replace('/\D/', '',$phone) ?? ''; // \D 匹配所有非数字字符
+        $info = $phoneDataModel->read(['phone'=>$num_phone]);
         if($info === false){
             $url = 'https://fob.ai.cc/api/mobile_verify_data/'.$phone;
             $data = http_get($url);
             if(!empty($data)){
                 $param = [
                     'phone'=>$phone,
+                    'num_phone'=>$num_phone,
                     'data'=>json_encode($data,true),
-                    'wa_status'=>$data['wa_status'] ?? '',
+                    'wa_status'=>$data['wa_status'] ?? 0,
+                    'wa_phone'=>$data['wa_phone'] ?? '',
                     'wa_name'=>$data['wa_name'] ?? '',
-                    'wa_profile_pic'=>$data['wa_profile_pic'] ?? ''
+                    'wa_profile_pic'=>$data['wa_profile_pic'] ?? '',
+                    'phone_status'=>$data['phone_status'] ?? 0,
+                    'phone_type'=>$data['phone_type'] ?? '',
+                    'country_code'=>$data['country_code'] ?? '',
+                    'phone_region'=>$data['phone_region'] ?? '',
                 ];
                 (new PhoneData())->addReturnId($param);
+                return $this->success($param);
             }
-        }else{
-            $data = json_decode($info['data']);
         }
-        return $this->success(['data'=>$data]);
+        return $this->success($data);
     }
 
 }

@@ -14,4 +14,18 @@ use App\Models\Base;
 class PhoneData extends Base
 {
     protected $table = 'gl_phone_data';
+
+    const STATUS_VALID = 1;
+    const STATUS_INVALID = 2;
+    const STATUS_ERROR = 9;
+
+
+    public static function statusMapping()
+    {
+        return [
+            self::STATUS_VALID => '有效WA',
+            self::STATUS_INVALID => '无效WA',
+            self::STATUS_ERROR => '查询失败',
+        ];
+    }
 }