update

@@ -219,7 +219,7 @@ class postInquiry extends Command
         } else {
         } else {
             $data['__amp_source_origin'] = trim($website, '/');
             $data['__amp_source_origin'] = trim($website, '/');
         }
         }
-        $res = Http::withoutVerifying()->timeout(10)->withHeaders(['User-Agent' => $detail['user_agent']])->post($website . 'api/inquiryQd/', $data)->json();
+        $res = Http::withoutVerifying()->timeout(10)->withHeaders(['User-Agent' => $detail['user_agent']])->post($website . 'api/inquiryQd?source=5', $data)->json();
         if (empty($res['code']) || $res['code'] != 200) {
         if (empty($res['code']) || $res['code'] != 200) {
             $log->status = ReInquiryDetailLog::STATUS_FAIL;
             $log->status = ReInquiryDetailLog::STATUS_FAIL;
             $log->remark = mb_substr($res['message'] ?? '', 0, 200);
             $log->remark = mb_substr($res['message'] ?? '', 0, 200);

@@ -140,7 +140,7 @@ class FormGlobalsoApi
      * @author zbj
      * @author zbj
      * @date 2024/1/20
      * @date 2024/1/20
      */
      */
-    public function submitInquiry($ip, $referer, $submit_at, $data)
+    public function submitInquiry($ip, $referer, $submit_at, $data, $traffic = 0)
     {
     {
         $api_url = $this->url . '/api/external-interface/add/fa043f9cbec6b38f';
         $api_url = $this->url . '/api/external-interface/add/fa043f9cbec6b38f';
 
 
@@ -148,7 +148,7 @@ class FormGlobalsoApi
         $data['token'] = md5($referer . $data['name'] . $ip . date("Y-m-d"));
         $data['token'] = md5($referer . $data['name'] . $ip . date("Y-m-d"));
         $data['refer'] = $referer;
         $data['refer'] = $referer;
         $data['submit_time'] = date('Y-m-d H:i:s', strtotime($submit_at));
         $data['submit_time'] = date('Y-m-d H:i:s', strtotime($submit_at));
-        $data['source'] = 1; //固定
+        $data['source'] = $traffic ? 5 : 1; //1 固定 5 FB广告
 
 
         try {
         try {
             $res = HttpUtils::post($api_url, $data);
             $res = HttpUtils::post($api_url, $data);

@@ -41,7 +41,7 @@ class InquiryFormData extends Base
      * @author zbj
      * @author zbj
      * @date 2023/12/4
      * @date 2023/12/4
      */
      */
-    public static function saveData($form_id, $domain, $ip, $country, $referer, $user_agent, $submit_at, $data){
+    public static function saveData($form_id, $domain, $ip, $country, $referer, $user_agent, $submit_at, $data, $traffic = 0){
         if(!empty($data['email'])){
         if(!empty($data['email'])){
             $data['email'] = str_replace(' ', '', $data['email']);
             $data['email'] = str_replace(' ', '', $data['email']);
         }
         }
@@ -100,7 +100,7 @@ class InquiryFormData extends Base
                 }
                 }
             }
             }
             if(!$has_file) {
             if(!$has_file) {
-                $res = (new FormGlobalsoApi())->submitInquiry($ip, $referer, $submit_at, $data);
+                $res = (new FormGlobalsoApi())->submitInquiry($ip, $referer, $submit_at, $data, $traffic);
                 Log::channel('inquiry')->info('询盘发送邮件', [$data, $res]);
                 Log::channel('inquiry')->info('询盘发送邮件', [$data, $res]);
             }
             }
         }
         }

@@ -4,6 +4,8 @@
 namespace App\Services;
 namespace App\Services;
 
 
 use App\Exceptions\InquiryFilterException;
 use App\Exceptions\InquiryFilterException;
+use App\Models\Domain\CountryCode;
+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\Project\AutoEmail;
 use App\Models\Project\AutoEmail;
@@ -71,6 +73,20 @@ class SyncSubmitTaskService
             }
             }
         }
         }
 
 
+        //域名 过滤国家或ip
+        $domain_info = DomainInfo::where('project_id', $project['id'])->first();
+        if(!empty($domain_info['not_allow_country'])){
+            $not_allow_countries = CountryCode::whereIn('id', $domain_info['not_allow_country'])->pluck('c_name')->toArray();
+            if(in_array($data['country'], $not_allow_countries)){
+                return false;
+            }
+        }
+        if(!empty($domain_info['not_allow_ip'])){
+            if(in_array($data['ip'], $domain_info['not_allow_ip'])){
+                return false;
+            }
+        }
+
         if(!ProjectServer::useProject($project['id'])){
         if(!ProjectServer::useProject($project['id'])){
             return false;
             return false;
         }
         }
@@ -91,7 +107,7 @@ class SyncSubmitTaskService
         }
         }
 
 
         $handler = new self();
         $handler = new self();
-        return $handler->$action($data, $date, $task['id']);
+        return $handler->$action($data, $date, $task['id'], $task['traffic']);
     }
     }
 
 
 
 
@@ -122,7 +138,7 @@ class SyncSubmitTaskService
      * @author zbj
      * @author zbj
      * @date 2024/8/27
      * @date 2024/8/27
      */
      */
-    public function subscribe($data, $date, $task_id){
+    public function subscribe($data, $date, $task_id, $traffic = 0){
         $email = $data['data']['email'];
         $email = $data['data']['email'];
         if (filter_var($email, FILTER_VALIDATE_EMAIL)) {
         if (filter_var($email, FILTER_VALIDATE_EMAIL)) {
             $model = Email::where('email', $email)->first();
             $model = Email::where('email', $email)->first();
@@ -170,7 +186,7 @@ class SyncSubmitTaskService
      * @author zbj
      * @author zbj
      * @date 2023/12/4
      * @date 2023/12/4
      */
      */
-    public function inquiry($data, $date, $task_id)
+    public function inquiry($data, $date, $task_id, $traffic = 0)
     {
     {
         //数组key转为小写
         //数组key转为小写
         $data['data'] = array_change_key_case($data['data'], CASE_LOWER);
         $data['data'] = array_change_key_case($data['data'], CASE_LOWER);
@@ -194,7 +210,7 @@ class SyncSubmitTaskService
 
 
         $data['referer'] = $this->handle_referer($data['referer']);
         $data['referer'] = $this->handle_referer($data['referer']);
 
 
-        $id = InquiryFormData::saveData($form_id, $data['domain'], $data['ip'], $data['country'], $data['referer'], $data['user_agent'], $data['submit_at'], $data['data']);
+        $id = InquiryFormData::saveData($form_id, $data['domain'], $data['ip'], $data['country'], $data['referer'], $data['user_agent'], $data['submit_at'], $data['data'], $traffic);
 
 
 
 
         //转化询盘
         //转化询盘
@@ -224,7 +240,7 @@ class SyncSubmitTaskService
      * @author zbj
      * @author zbj
      * @date 2023/12/4
      * @date 2023/12/4
      */
      */
-    public function visit($data, $date, $task_id)
+    public function visit($data, $date, $task_id, $traffic = 0)
     {
     {
 
 
         $visit_data = $data['data'];
         $visit_data = $data['data'];