Merge remote-tracking branch 'origin/master' into akun

@@ -162,18 +162,16 @@ class RecommendedSuppliers extends Command
         $res = http_post($url,json_encode($param));
         $res = http_post($url,json_encode($param));
         echo '请求返回状态'. ($res['code']?? '').PHP_EOL;
         echo '请求返回状态'. ($res['code']?? '').PHP_EOL;
 //        echo date('Y-m-d H:i:s') . json_encode($res) . PHP_EOL;
 //        echo date('Y-m-d H:i:s') . json_encode($res) . PHP_EOL;
-        if(isset($res['code']) && $res['code'] == 200){
-            //保存多条数据
-            $saveData = [
-                'project_id'=>$project_id,
-                'keyword'=>$keyword,
-                'data'=>json_encode($res['data'])
-            ];
-            $purchaserModel = new Purchaser();
-            $purchaserModel->add($saveData);
-            if(!empty($res['data'])){
-                $this->savePurchaserInfo($project_id,$keyword,$res['data']);
-            }
+        //保存多条数据
+        $saveData = [
+            'project_id'=>$project_id,
+            'keyword'=>$keyword,
+            'data'=>json_encode($res['data'] ?? '')
+        ];
+        $purchaserModel = new Purchaser();
+        $purchaserModel->add($saveData);
+        if(isset($res['code']) && $res['code'] == 200 && !empty($res['data'])){
+            $this->savePurchaserInfo($project_id,$keyword,$res['data']);
         }else{
         }else{
             echo '未正常返回数据，跳过项目'.PHP_EOL;
             echo '未正常返回数据，跳过项目'.PHP_EOL;
         }
         }
@@ -190,7 +188,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 +205,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);