合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !1881

@@ -190,7 +190,7 @@ class RecommendedSuppliers extends Command
     public function getKeywords($project_id){
     public function getKeywords($project_id){
         $keywordModel = new Keyword();
         $keywordModel = new Keyword();
         $keyword_array = $this->getPurchaserList($project_id);
         $keyword_array = $this->getPurchaserList($project_id);
-        $title = $keywordModel->where('title', 'not in', $keyword_array)->orderRaw('RAND()')->limit(1)->value('title');     // 只返回 title 字段
+        $title = $keywordModel->whereNotIn('title', $keyword_array)->inRandomOrder()->limit(1)->value('title');
         if(empty($title)){
         if(empty($title)){
             return '';
             return '';
         }
         }
@@ -207,6 +207,9 @@ class RecommendedSuppliers extends Command
     public function savePurchaserInfo($project_id,$keyword,$data){
     public function savePurchaserInfo($project_id,$keyword,$data){
         $purchaserInfoModel = new PurchaserInfo();
         $purchaserInfoModel = new PurchaserInfo();
         foreach ($data as $k =>$v){
         foreach ($data as $k =>$v){
+            if(empty($v['buyer_id'])){
+                continue;
+            }
             $v['project_id'] = $project_id;
             $v['project_id'] = $project_id;
             $v['keyword'] = $keyword;
             $v['keyword'] = $keyword;
             $v['email'] = json_encode($v['email']??[],JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
             $v['email'] = json_encode($v['email']??[],JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);