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

@@ -75,6 +75,7 @@ class CopyProject extends Command
                     $this->output('CopyProjectJob end, old project_id: ' . $old_project_id . ', new project_id: ' . $project_id);
                     $this->output('CopyProjectJob end, old project_id: ' . $old_project_id . ', new project_id: ' . $project_id);
                 }catch (\Exception $e){
                 }catch (\Exception $e){
                     echo '复制数据库失败：'.$old_project_id . '<->'.$project_id;
                     echo '复制数据库失败：'.$old_project_id . '<->'.$project_id;
+                    echo $e->getMessage().PHP_EOL;
                 }
                 }
                 //修改项目状态
                 //修改项目状态
                 $projectModel->edit(['delete_status'=>0],['id'=>$project_id]);
                 $projectModel->edit(['delete_status'=>0],['id'=>$project_id]);

@@ -62,7 +62,11 @@ class RecommendedSuppliers extends Command
             if($result !== false){
             if($result !== false){
                 ProjectServer::useProject($v['project_id']);
                 ProjectServer::useProject($v['project_id']);
                 $title = $this->getKeywords($v['project_id']);
                 $title = $this->getKeywords($v['project_id']);
-                $this->savePurchaser($v['project_id'],$title);
+                if(!empty($title)){
+                    $this->savePurchaser($v['project_id'],$title);
+                }else{
+                    echo '关键词已取完'.PHP_EOL;
+                }
                 DB::disconnect('custom_mysql');
                 DB::disconnect('custom_mysql');
             }
             }
         }
         }
@@ -84,7 +88,9 @@ class RecommendedSuppliers extends Command
             $count = $purchaserInfoModel->counts(['project_id'=>$v['project_id']]);
             $count = $purchaserInfoModel->counts(['project_id'=>$v['project_id']]);
             //获取项目版本
             //获取项目版本
             $plan = ['专业版'=>300, '标准版'=>500, '商务版'=>800, '旗舰版'=>1200];
             $plan = ['专业版'=>300, '标准版'=>500, '商务版'=>800, '旗舰版'=>1200];
-            $total_number = $plan[Project::planMap()[$v['plan']]] ?? 300;
+            $typePlan = Project::planMap();
+            $version = $typePlan[$v['plan']] ?? '专业版';
+            $total_number = $plan[$version] ?? 300;
             if($count > $total_number){
             if($count > $total_number){
                 echo date('Y-m-d H:i:s') . '达到数量上线关闭的项目:'.$v['project_id'] . PHP_EOL;
                 echo date('Y-m-d H:i:s') . '达到数量上线关闭的项目:'.$v['project_id'] . PHP_EOL;
                 //更新数量上限字段,并关闭推荐供应商
                 //更新数量上限字段,并关闭推荐供应商
@@ -95,12 +101,31 @@ class RecommendedSuppliers extends Command
         return true;
         return true;
     }
     }
 
 
+    /**
+     * @remark :获取关键词数据
+     * @name   :getPurchaser
+     * @author :lyh
+     * @method :post
+     * @time   :2025/4/15 17:55
+     */
     public function getPurchaser($keyword,$project_id){
     public function getPurchaser($keyword,$project_id){
         $purchaserModel = new Purchaser();
         $purchaserModel = new Purchaser();
         return $purchaserModel->read(['keyword'=>$keyword,'project_id'=>$project_id]);
         return $purchaserModel->read(['keyword'=>$keyword,'project_id'=>$project_id]);
     }
     }
 
 
     /**
     /**
+     * @remark :获取已经处理过的关键词
+     * @name   :getPurchaserList
+     * @author :lyh
+     * @method :post
+     * @time   :2025/4/15 17:55
+     */
+    public function getPurchaserList($project_id){
+        $purchaserModel = new Purchaser();
+        return $purchaserModel->selectField(['project_id'=>$project_id],'keyword');
+    }
+
+    /**
      * @remark :保存供应商
      * @remark :保存供应商
      * @name   :getPurchaser
      * @name   :getPurchaser
      * @author :lyh
      * @author :lyh
@@ -110,6 +135,7 @@ class RecommendedSuppliers extends Command
     public function savePurchaser($project_id,$keyword,$row = 10){
     public function savePurchaser($project_id,$keyword,$row = 10){
         //项目还没有关键词
         //项目还没有关键词
         if(!$keyword){
         if(!$keyword){
+            echo '项目还没有关键词'.PHP_EOL;
             return true;
             return true;
         }
         }
         $url = 'https://fob.ai.cc/api/company_list';
         $url = 'https://fob.ai.cc/api/company_list';
@@ -126,6 +152,7 @@ class RecommendedSuppliers extends Command
             'total'=>$this->param['row'] ?? 10,
             'total'=>$this->param['row'] ?? 10,
         ];
         ];
         $res = http_post($url,json_encode($param));
         $res = http_post($url,json_encode($param));
+        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(!empty($res) && isset($res['code']) && $res['code'] == 200 && !empty($res['data'])){
         if(!empty($res) && isset($res['code']) && $res['code'] == 200 && !empty($res['data'])){
             //保存多条数据
             //保存多条数据
@@ -152,15 +179,13 @@ class RecommendedSuppliers extends Command
      * @time   :2024/7/1 18:07
      * @time   :2024/7/1 18:07
      */
      */
     public function getKeywords($project_id){
     public function getKeywords($project_id){
-        $info = Keyword::inRandomOrder()->first();
-        if(!$info){
+        $keywordModel = new Keyword();
+        $keyword_array = $this->getPurchaserList($project_id);
+        $info = $keywordModel->read(['title'=>['not in',$keyword_array]],'title');
+        if($info === false){
             return '';
             return '';
         }
         }
-        $keywordInfo = $this->getPurchaser($info->title,$project_id);
-        if($keywordInfo !== false){
-            $this->getKeywords($project_id);
-        }
-        return $info->title;
+        return $info['title'] ?? '';
     }
     }
 
 
     /**
     /**