合并分支 'akun' 到 'master'

Akun



查看合并请求 !1303

@@ -64,6 +64,9 @@ class SyncInquiryRelay extends Command
                     //+86区号过滤
                     continue;
                 }
+                if (strpos($data['refer'], 'findsupply.com') !== false) {
+                    $item['source_type'] = InquiryInfo::TYPE_FIND_SUPPLY;
+                }
                 $this->saveDate($item, $item['source_type']);
             }
         }

@@ -28,6 +28,9 @@ class InquiryForwardController extends BaseController
         if (isset($this->param['url_keyword'])) {
             $this->map['url_keyword'] = ['like', '%' . $this->map['url_keyword'] . '%'];
         }
+        if (isset($this->param['message'])) {
+            $this->map['message'] = ['like', '%' . $this->map['message'] . '%'];
+        }
         $lists = $inquiryForwardLogic->getInquiryLists($this->map, $this->page, $this->row, $this->order);
         $this->response('success', Code::SUCCESS, $lists);
     }
@@ -40,14 +43,15 @@ class InquiryForwardController extends BaseController
      * @author Akun
      * @date 2025/03/01 11:21
      */
-    public function getInquiryInfo(InquiryForwardLogic $inquiryForwardLogic){
+    public function getInquiryInfo(InquiryForwardLogic $inquiryForwardLogic)
+    {
         $this->request->validate([
-            'id'=>'required',
-        ],[
+            'id' => 'required',
+        ], [
             'id.required' => 'ID不能为空',
         ]);
         $info = $inquiryForwardLogic->infoInquiry();
-        $this->response('success',Code::SUCCESS,$info);
+        $this->response('success', Code::SUCCESS, $info);
     }
 
     /**
@@ -190,7 +194,8 @@ class InquiryForwardController extends BaseController
      * @author Akun
      * @date 2025/03/01 9:22
      */
-    public function getInquiryDetailList(InquiryForwardLogic $inquiryForwardLogic){
+    public function getInquiryDetailList(InquiryForwardLogic $inquiryForwardLogic)
+    {
         if (isset($this->param['country'])) {
             $this->map['country'] = ['like', '%' . $this->map['country'] . '%'];
         }

@@ -332,7 +332,14 @@ class InquiryForwardLogic extends BaseLogic
      */
     public function expiredInquiry()
     {
-        $rs = $this->model->edit(['status' => InquiryInfo::STATUS_INVALID], ['id' => $this->param['id']]);
+        if (isset($this->param['type']) && $this->param['type'] == 1) {
+            //启用
+            $status = InquiryInfo::STATUS_INIT;
+        } else {
+            //无效
+            $status = InquiryInfo::STATUS_INVALID;
+        }
+        $rs = $this->model->edit(['status' => $status], ['id' => $this->param['id']]);
 
         if ($rs === false) {
             $this->fail('设置无效失败');

@@ -37,6 +37,7 @@ class InquiryInfo extends Base
     const TYPE_ADS = 2;
     const TYPE_AI_SITE_GROUP = 3;
     const TYPE_SPIDER = 4;
+    const TYPE_FIND_SUPPLY = 5;
 
     /**
      * 状态映射
@@ -60,9 +61,10 @@ class InquiryInfo extends Base
     {
         return [
             self::TYPE_SITE_GROUP => '站群询盘',
-            self::TYPE_ADS => 'ads采集站询盘',
-            self::TYPE_AI_SITE_GROUP => 'AI站群询盘',
-            self::TYPE_SPIDER => '蜘蛛询盘',
+            self::TYPE_ADS => 'ADS采集站',
+            self::TYPE_AI_SITE_GROUP => '自建AI群',
+            self::TYPE_SPIDER => 'SC平台',
+            self::TYPE_FIND_SUPPLY => 'FS平台',
         ];
     }