Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -28,7 +28,7 @@ class RemainDay extends Command
      * @var 按上线时间统计
      * @var 按上线时间统计
      */
      */
     protected $projectId = [
     protected $projectId = [
-        1434,1812
+        1434,1812,276
     ];//需要单独处理的项目
     ];//需要单独处理的项目
 
 
     /**
     /**

@@ -187,7 +187,7 @@ class ExtensionModuleController extends BaseController
                 if($this->user['project_id'] == 2205 && $this->param['module_id'] == 1){
                 if($this->user['project_id'] == 2205 && $this->param['module_id'] == 1){
                     if($v['field_id'] == 12 && !empty($v['value'])){//下拉框数据
                     if($v['field_id'] == 12 && !empty($v['value'])){//下拉框数据
                         if($v['value'] != 'Ordered'){
                         if($v['value'] != 'Ordered'){
-                            $this->fail('请重第一个流程开始选择');
+                            $this->fail('请从第一个流程开始选择。');
                         }
                         }
                     }
                     }
                 }
                 }

@@ -51,14 +51,7 @@ class InquiryController extends BaseController
                 if(isset($v['phone']) && !empty($v['phone'])){
                 if(isset($v['phone']) && !empty($v['phone'])){
                     $phoneInfo = (new PhoneData())->read(['phone'=>$v['phone']]);
                     $phoneInfo = (new PhoneData())->read(['phone'=>$v['phone']]);
                     if($phoneInfo === false){
                     if($phoneInfo === false){
-                        $url = 'https://fob.ai.cc/api/mobile_verify_data/'.$v['phone'];
-                        $data = http_get($url);
-                        $param = [
-                            'phone'=>$v['phone'],
-                            'data'=>json_encode($data,true)
-                        ];
-                        (new PhoneData())->addReturnId($param);
-                        $v['phone_data'] = $data;
+                        $v['phone_data'] = [];
                     }else{
                     }else{
                         $v['phone_data'] = json_decode($phoneInfo['data']);
                         $v['phone_data'] = json_decode($phoneInfo['data']);
                     }
                     }
@@ -68,6 +61,23 @@ class InquiryController extends BaseController
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
+    /**
+     * @remark :发送请求(获取手机号码对应信息)
+     * @name   :sendMobileVerifyData
+     * @author :lyh
+     * @method :post
+     * @time   :2024/9/5 17:44
+     */
+    public function sendMobileVerifyData(InquiryLogic $logic){
+        $this->request->validate([
+            'phone' => 'required',
+        ],[
+            'phone.required' => 'phone不能为空'
+        ]);
+        $data = $logic->sendMobileVerifyData($this->param['phone']);
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
     public function info(Request $request, InquiryLogic $logic){
     public function info(Request $request, InquiryLogic $logic){
         $request->validate([
         $request->validate([
             'id' => 'required',
             'id' => 'required',

@@ -11,6 +11,7 @@ use App\Models\Domain\DomainInfo;
 use App\Models\Inquiry\InquiryForm;
 use App\Models\Inquiry\InquiryForm;
 use App\Models\Inquiry\InquiryFormData;
 use App\Models\Inquiry\InquiryFormData;
 use App\Models\Inquiry\InquiryOther;
 use App\Models\Inquiry\InquiryOther;
+use App\Models\Inquiry\PhoneData;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
 
 
 /**
 /**
@@ -175,6 +176,28 @@ class InquiryLogic extends BaseLogic
         return $this->success();
         return $this->success();
     }
     }
 
 
-
+    /**
+     * @remark :获取手机号码下是否拥有wa
+     * @name   :sendMobileVerifyData
+     * @author :lyh
+     * @method :post
+     * @time   :2024/9/5 17:40
+     */
+    public function sendMobileVerifyData($phone){
+        $phoneDataModel = new PhoneData();
+        $info = $phoneDataModel->read(['phone'=>$phone]);
+        if($info === false){
+            $url = 'https://fob.ai.cc/api/mobile_verify_data/'.$phone;
+            $data = http_get($url);
+            $param = [
+                'phone'=>$phone,
+                'data'=>json_encode($data,true)
+            ];
+            (new PhoneData())->addReturnId($param);
+        }else{
+            $data = json_decode($info['data']);
+        }
+        return $this->success(['data'=>$data]);
+    }
 
 
 }
 }

@@ -341,6 +341,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/info', [\App\Http\Controllers\Bside\Inquiry\InquiryController::class, 'info'])->name('inquiry_info');
         Route::any('/info', [\App\Http\Controllers\Bside\Inquiry\InquiryController::class, 'info'])->name('inquiry_info');
         Route::any('/delete', [\App\Http\Controllers\Bside\Inquiry\InquiryController::class, 'delete'])->name('inquiry_delete');
         Route::any('/delete', [\App\Http\Controllers\Bside\Inquiry\InquiryController::class, 'delete'])->name('inquiry_delete');
         Route::any('/export', [\App\Http\Controllers\Bside\Inquiry\InquiryController::class, 'export'])->name('inquiry_export');
         Route::any('/export', [\App\Http\Controllers\Bside\Inquiry\InquiryController::class, 'export'])->name('inquiry_export');
+        Route::any('/send', [\App\Http\Controllers\Bside\Inquiry\InquiryController::class, 'sendMobileVerifyData'])->name('inquiry_sendMobileVerifyData');
     });
     });
 
 
     //生成路由
     //生成路由