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

lyh
app/Console/Commands/Inquiry/SyncInquiryRelay.php
app/Http/Controllers/Aside/Optimize/InquiryForwardController.php
app/Http/Logic/Aside/Optimize/InquiryForwardLogic.php
app/Http/Logic/Bside/RankData/RankDataLogic.php
app/Models/Inquiry/InquiryInfo.php
app/Services/InquiryRelayService.php
--- a/app/Console/Commands/Inquiry/SyncInquiryRelay.php
查看文件 @11017ed
+++ b/app/Console/Commands/Inquiry/SyncInquiryRelay.php
查看文件 @11017ed
@@ -46,8 +46,12 @@ class SyncInquiryRelay extends Command
     {
         $this->output('开始同步表单系统询盘');
         $this->getInquiryForm();
-        $this->output('开始同步asp采集询盘');
+
+        $this->output('开始同步SC平台询盘');
         $this->getInquirySzcm();
+
+        $this->output('开始同步FS平台询盘');
+        $this->getInquiryFs();
     }
     /**
@@ -65,9 +69,6 @@ class SyncInquiryRelay extends Command
                     //+86区号过滤
                     continue;
                 }
-                if (strpos($item['refer'], 'findsupply.com') !== false) {
-                    $item['source_type'] = InquiryInfo::TYPE_FIND_SUPPLY;
-                }
                 $this->saveDate($item, $item['source_type']);
             }
         }
@@ -112,6 +113,37 @@ class SyncInquiryRelay extends Command
     }
     /**
+     * @return bool
+     * @throws \Exception
+     * @author Akun
+     * @date 2025/03/04 11:48
+     */
+    public function getInquiryFs()
+    {
+        $service = new InquiryRelayService();
+        $next_page_url = 'https://www.findsupply.com/api/external?page=1&pagesize=50';
+        $model = new InquiryInfo();
+        while ($next_page_url) {
+            $result = $service->getInquiryFs($next_page_url);
+            $data = $result['data'];
+            $next_page_url = $result['next_page_url'];
+
+            if ($data) {
+                foreach ($data as $item) {
+                    $message_sign = md5($item['name'] . $item['email'] . $item['phone'] . $item['ip'] . $item['time']);
+                    $inquiry_info = $model->where('message_sign', $message_sign)->first();
+                    if ($inquiry_info) {
+                        $next_page_url = null;
+                        break;
+                    }
+                    $this->saveDate($item, InquiryInfo::TYPE_FIND_SUPPLY);
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
      * 询盘数据入库
      * @param $data
      * @param $type
@@ -148,6 +180,7 @@ class SyncInquiryRelay extends Command
         $html = curl_c($data['refer'], false);
         if (empty($data['title'])) {
+            $data['title'] = '';
             preg_match_all('/<title>([\w\W]*?)<\/title>/', $html, $matches);
             if (!empty($matches[1])) {
                 $data['title'] = substr($matches[1][0], 0, 255);
--- a/app/Http/Controllers/Aside/Optimize/InquiryForwardController.php
查看文件 @11017ed
+++ b/app/Http/Controllers/Aside/Optimize/InquiryForwardController.php
查看文件 @11017ed
@@ -92,7 +92,6 @@ class InquiryForwardController extends BaseController
             'id' => 'required',//ID
             'name' => 'required',//名称
             'email' => 'required',//邮箱
-            'phone' => 'required',//电话号码
             'ip' => 'required',//ip
             'forward_url' => 'required',//转发网址
             'message' => 'required',//发送内容
@@ -100,7 +99,6 @@ class InquiryForwardController extends BaseController
             'id.required' => 'ID不能为空',
             'name.required' => '名称不能为空',
             'email.required' => '邮箱不能为空',
-            'phone.required' => '电话号码不能为空',
             'ip.required' => 'ip不能为空',
             'forward_url.required' => '转发网址不能为空',
             'message.required' => '内容不能为空',
--- a/app/Http/Logic/Aside/Optimize/InquiryForwardLogic.php
查看文件 @11017ed
+++ b/app/Http/Logic/Aside/Optimize/InquiryForwardLogic.php
查看文件 @11017ed
@@ -176,7 +176,7 @@ class InquiryForwardLogic extends BaseLogic
                     $start_at = $now;
                 }
-                InquiryRelayDetail::createInquiry($info['id'], $website, $info['country'], $this->param['ip'], $this->param['name'], $this->param['email'], $this->param['phone'], $this->param['message'], $is_v6, json_encode([$url]), $start_at);
+                InquiryRelayDetail::createInquiry($info['id'], $website, $info['country'], $this->param['ip'], $this->param['name'], $this->param['email'], $this->param['phone'] ?? '', $this->param['message'], $is_v6, json_encode([$url]), $start_at);
                 $num += 1;
             }
--- a/app/Http/Logic/Bside/RankData/RankDataLogic.php
查看文件 @11017ed
+++ b/app/Http/Logic/Bside/RankData/RankDataLogic.php
查看文件 @11017ed
@@ -488,7 +488,7 @@ class RankDataLogic extends BaseLogic
         $without_project_ids = [];  //不用处理排名的项目
         $without_extension_project_ids = [658]; //是否达标只统计主词的
         $extension_project_ids = [354]; //扩展词也到达标的
-        $compliance_project_ids = [2163]; //直接达标处理的
+        $compliance_project_ids = [2163,257]; //直接达标处理的
         $ceaseProjectId = [
             47,
             354,
--- a/app/Models/Inquiry/InquiryInfo.php
查看文件 @11017ed
+++ b/app/Models/Inquiry/InquiryInfo.php
查看文件 @11017ed
@@ -36,8 +36,9 @@ class InquiryInfo extends Base
     const TYPE_SITE_GROUP = 1;
     const TYPE_ADS = 2;
     const TYPE_AI_SITE_GROUP = 3;
-    const TYPE_SPIDER = 4;
-    const TYPE_FIND_SUPPLY = 5;
+    const TYPE_PROMOTION = 4;
+    const TYPE_SPIDER = 5;
+    const TYPE_FIND_SUPPLY = 6;
     /**
      * 状态映射
@@ -60,9 +61,10 @@ class InquiryInfo extends Base
     public function typeMap()
     {
         return [
-            self::TYPE_SITE_GROUP => '站群询盘',
+            self::TYPE_SITE_GROUP => '自建AI站',
             self::TYPE_ADS => 'ADS采集站',
-            self::TYPE_AI_SITE_GROUP => '自建AI站群',
+            self::TYPE_AI_SITE_GROUP => '客户AI站',
+            self::TYPE_PROMOTION => '客户推广到期站',
             self::TYPE_SPIDER => 'SC平台',
             self::TYPE_FIND_SUPPLY => 'FS平台',
         ];
--- a/app/Services/InquiryRelayService.php
查看文件 @11017ed
+++ b/app/Services/InquiryRelayService.php
查看文件 @11017ed
@@ -5,6 +5,7 @@
  * Date: 2025/2/13
  * Time: 11:01
  */
+
 namespace App\Services;
 use Illuminate\Support\Facades\Log;
@@ -37,30 +38,30 @@ class InquiryRelayService
     {
         try {
             // 获取数据
-            $url = "https://api.szcmapi.com/get_inquiry.aspx?id=".$id;
+            $url = "https://api.szcmapi.com/get_inquiry.aspx?id=" . $id;
             $json = $this->szcmCurl($url);
             // 兼容过去到的数据， 比较乱
-            $json = trim(str_replace("\r\n", '\n', (string) $json));
-            $json = str_replace('3/4"','3/4',$json);
-            $json = str_replace('"Steklopribor"','Steklopribor',$json);
-            $json = str_replace('"Net30 days"','Net30 days',$json);
+            $json = trim(str_replace("\r\n", '\n', (string)$json));
+            $json = str_replace('3/4"', '3/4', $json);
+            $json = str_replace('"Steklopribor"', 'Steklopribor', $json);
+            $json = str_replace('"Net30 days"', 'Net30 days', $json);
             $json = trim($json);
-            $json = str_replace("\n",'',$json);
-            $array = json_decode($json,true);
+            $json = str_replace("\n", '', $json);
+            $array = json_decode($json, true);
             if (empty($array))
                 return false;
             // 整合最终数据
             $title = base64_decode($array['title']);
-            $title = str_replace("'",'',$title);
+            $title = str_replace("'", '', $title);
             $title = html_entity_decode($title, ENT_QUOTES, 'UTF-8');
-            $title = str_replace("'",'',$title);
+            $title = str_replace("'", '', $title);
             $message = html_entity_decode(addslashes(base64_decode($array['Message'])), ENT_QUOTES, 'UTF-8');
-            $message = str_replace("'",'',$message);
+            $message = str_replace("'", '', $message);
             $email = trim($array['Email']);
-            $name  = html_entity_decode($array['Name'], ENT_QUOTES, 'UTF-8');
-            $name = str_replace("'",'',$name);
+            $name = html_entity_decode($array['Name'], ENT_QUOTES, 'UTF-8');
+            $name = str_replace("'", '', $name);
             $result = [
                 'image' => $array['image'] ?: '',
@@ -106,7 +107,43 @@ class InquiryRelayService
         return $result;
     }
+    /**
+     * 获取findsupply询盘
+     * @param $url
+     * @return array
+     * @throws \Exception
+     * @author Akun
+     * @date 2025/03/04 10:48
+     */
+    public function getInquiryFs($url)
+    {
+        $re = curl_get($url);
+        $result = [];
+        $next_page_url = '';
+        if (isset($re['status']) && $re['status'] == 200) {
+            $next_page_url = $re['data']['next_page_url'];
+            foreach ($re['data']['data'] as $v) {
+                $dateTime = new \DateTime($v['created_at']);
+                $time = $dateTime->format('Y-m-d H:i:s');
+                $result[] = [
+                    'time' => $time,
+                    'name' => $v['NAME'] ?: '',
+                    'email' => $v['email'] ?: '',
+                    'phone' => $v['phone_number'] ?: '',
+                    'refer' => $v['page_url'] ?: '',
+                    'message' => $v['content'] ?: '',
+                    'ip' => $v['ip'] ?: '',
+                    'source_address' => 'www.findsupply.com',
+                    'title' => $v['products_title'] ?: '',
+                    'submit_country' => $v['country'] ?: ''
+                ];
+            }
+        }
+
+        return ['next_page_url' => $next_page_url, 'data' => $result];
+    }
+
 ########################################################################################################################
 #                                               询盘结束， 同步项目及路由                                                  #
 ########################################################################################################################
-}
+}