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

@@ -54,25 +54,25 @@ class RecommendedSuppliers extends Command
         $project_list = $projectModel->list(['is_supplier'=>1]);//TODO::已开启推荐供应商
         $project_list = $projectModel->list(['is_supplier'=>1]);//TODO::已开启推荐供应商
         foreach ($project_list as $k => $v){
         foreach ($project_list as $k => $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['project_id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['project_id'] . PHP_EOL;
-            ProjectServer::useProject($v['id']);
+            ProjectServer::useProject($v['project_id']);
             $info = Keyword::inRandomOrder()->first();
             $info = Keyword::inRandomOrder()->first();
             if(empty($info)){
             if(empty($info)){
                continue;
                continue;
             }
             }
-            $keywordInfo = $this->getPurchaser($info['title']);
+            $keywordInfo = $this->getPurchaser($info->title,$v['project_id']);
             if($keywordInfo !== false){
             if($keywordInfo !== false){
                 continue;
                 continue;
             }
             }
             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;
-            $this->savePurchaser($v['id'],$info['title']);
+            $this->savePurchaser($v['project_id'],$info->title);
             DB::disconnect('custom_mysql');
             DB::disconnect('custom_mysql');
         }
         }
         return true;
         return true;
     }
     }
 
 
-    public function getPurchaser($keyword){
+    public function getPurchaser($keyword,$project_id){
         $purchaserModel = new Purchaser();
         $purchaserModel = new Purchaser();
-        return $purchaserModel->read(['keyword'=>$keyword]);
+        return $purchaserModel->read(['keyword'=>$keyword,'project_id'=>$project_id]);
     }
     }
 
 
     /**
     /**
@@ -83,7 +83,7 @@ class RecommendedSuppliers extends Command
      * @time   :2024/3/5 11:38
      * @time   :2024/3/5 11:38
      */
      */
     public function savePurchaser($project_id,$keyword,$row = 10){
     public function savePurchaser($project_id,$keyword,$row = 10){
-        $url = 'https://admin.hagro.cn/api/company_list';
+        $url = 'https://fob.ai.cc/api/company_list';
         $data = [
         $data = [
             'prod_desc'=>$keyword,
             'prod_desc'=>$keyword,
             'total'=>$row ?? 10,
             'total'=>$row ?? 10,
@@ -97,6 +97,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 date('Y-m-d H:i:s') . json_encode($res) . PHP_EOL;
         if(!empty($res) && $res['code'] == 200){
         if(!empty($res) && $res['code'] == 200){
             $saveData = [
             $saveData = [
                 'project_id'=>$project_id,
                 'project_id'=>$project_id,

@@ -54,12 +54,12 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['delete_status'=>0,'status'=>['!=',0],'id'=>['<=',219]]);
+        $list = $projectModel->list(['id'=>917]);
         $data = [];
         $data = [];
         foreach ($list as $v){
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
             ProjectServer::useProject($v['id']);
-            $this->routeMapDeduplication();
+            $this->setProductKeyword();
             DB::disconnect('custom_mysql');
             DB::disconnect('custom_mysql');
         }
         }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
@@ -392,8 +392,6 @@ class UpdateRoute extends Command
             if($info !== false){
             if($info !== false){
                 //删除其他一样的数据
                 //删除其他一样的数据
                 $routeMapModel->del(['id'=>['!=',$info['id']],'source'=>'product_keyword','source_id'=>$info['source_id']]);
                 $routeMapModel->del(['id'=>['!=',$info['id']],'source'=>'product_keyword','source_id'=>$info['source_id']]);
-            }{
-                echo date('Y-m-d H:i:s') . '保留的id:'.$v['id'] . PHP_EOL;
             }
             }
         }
         }
         return true;
         return true;

@@ -165,9 +165,14 @@ class KeywordLogic extends  BaseLogic
         $ids = $this->param['ids'];
         $ids = $this->param['ids'];
         $productModel = new Product();
         $productModel = new Product();
         foreach ($ids as $id){
         foreach ($ids as $id){
+            $replace_id = ','.$id.',';
             $productModel->where('keyword_id', 'like', '%,' . $id . ',%')
             $productModel->where('keyword_id', 'like', '%,' . $id . ',%')
                 ->update([
                 ->update([
-                    'email' => DB::raw("REPLACE(keyword_id, ',' . $id . ',', ',')")
+                    'keyword_id' => DB::raw("REPLACE(keyword_id, '$replace_id' , ',')")
+                ]);
+            $productModel->where('keyword_id', ',')
+                ->update([
+                    'keyword_id' => DB::raw("REPLACE(keyword_id, ',' , '')")
                 ]);
                 ]);
             $this->delRoute($id);
             $this->delRoute($id);
             $this->model->del(['id'=>$id]);
             $this->model->del(['id'=>$id]);