合并分支 'akun' 到 'master'

Akun



查看合并请求 !2915

@@ -252,13 +252,16 @@ class SyncInquiryRelay extends Command
                 //关键词查询项目着陆页：先精准匹配，没有数据再全文索引匹配
                 //关键词查询项目着陆页：先精准匹配，没有数据再全文索引匹配
                 $inquiryForwardLogic = new InquiryForwardLogic();
                 $inquiryForwardLogic = new InquiryForwardLogic();
                 $forward_list = $inquiryForwardLogic->searchKeywords($ai_keyword, 2, 3);
                 $forward_list = $inquiryForwardLogic->searchKeywords($ai_keyword, 2, 3);
-                if (empty($forward_list)) {
-                    $forward_list = $inquiryForwardLogic->searchKeywords($ai_keyword, 1, 3);
-                    if (empty($forward_list)) {
-                        $this->output('询盘ID:' . $form_id . ',根据关键词[' . $ai_keyword . ']查询项目着陆页为空');
-                        return true;
+                if (count($forward_list) < 3) {
+                    $forward_list_against = $inquiryForwardLogic->searchKeywords($ai_keyword, 1, 3 - count($forward_list));
+                    foreach ($forward_list_against as $against) {
+                        array_push($forward_list, $against);
                     }
                     }
                 }
                 }
+                if (empty($forward_list)) {
+                    $this->output('询盘ID:' . $form_id . ',根据关键词[' . $ai_keyword . ']查询项目着陆页为空');
+                    return true;
+                }
 
 
                 //重写询盘内容
                 //重写询盘内容
                 $ai_message_list = [];
                 $ai_message_list = [];

@@ -331,7 +331,8 @@ class InquiryForwardLogic extends BaseLogic
                             'route' => $vp->domain . $route,
                             'route' => $vp->domain . $route,
                             'recent_inquiry' => $vp->recent_inquiry,
                             'recent_inquiry' => $vp->recent_inquiry,
                             'remark' => $vp->remark ?: '',
                             'remark' => $vp->remark ?: '',
-                            'version' => $vp->version
+                            'version' => $vp->version,
+                            'type' => $type
                         ];
                         ];
                     }
                     }
                 }
                 }