合并分支 'akun' 到 'master'

Akun



查看合并请求 !880

@@ -23,6 +23,7 @@ use App\Models\Product\CategoryRelated;
 use App\Models\Product\Extend;
 use App\Models\Product\Extend;
 use App\Models\Product\ExtendInfo;
 use App\Models\Product\ExtendInfo;
 use App\Models\Product\Keyword;
 use App\Models\Product\Keyword;
+use App\Models\Product\KeywordRelated;
 use App\Models\Product\Product;
 use App\Models\Product\Product;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
 use App\Models\Template\BCustomTemplate;
 use App\Models\Template\BCustomTemplate;
@@ -248,7 +249,7 @@ class ProjectUpdate extends Command
                     if ($custom_types) {
                     if ($custom_types) {
                         $custom_model = new CustomModule();
                         $custom_model = new CustomModule();
                         foreach ($custom_types as $v_custom) {
                         foreach ($custom_types as $v_custom) {
-                            if($project_id == 1646 && $v_custom == 'downloads'){
+                            if ($project_id == 1646 && $v_custom == 'downloads') {
                                 //项目ID：1646，不再采集downloads扩展模块
                                 //项目ID：1646，不再采集downloads扩展模块
                                 continue;
                                 continue;
                             }
                             }
@@ -395,6 +396,8 @@ class ProjectUpdate extends Command
                                         if ($six_read) {
                                         if ($six_read) {
                                             //关联分类
                                             //关联分类
                                             CategoryRelated::saveRelated($id, array_column($category_arr, 'id'));
                                             CategoryRelated::saveRelated($id, array_column($category_arr, 'id'));
+                                            //关联关键词
+                                            KeywordRelated::saveRelated($id, $keyword_id);
                                             //扩展字段
                                             //扩展字段
                                             if ($item['extend'] ?? []) {
                                             if ($item['extend'] ?? []) {
                                                 foreach (array_reverse($item['extend']) as $ke => $ve) {
                                                 foreach (array_reverse($item['extend']) as $ke => $ve) {

@@ -9,6 +9,7 @@ use App\Models\Product\Category;
 use App\Models\Product\CategoryRelated;
 use App\Models\Product\CategoryRelated;
 use App\Models\Product\ExtendInfo;
 use App\Models\Product\ExtendInfo;
 use App\Models\Product\Keyword;
 use App\Models\Product\Keyword;
+use App\Models\Product\KeywordRelated;
 use App\Models\Product\Product;
 use App\Models\Product\Product;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
 use App\Models\Template\BTemplate;
 use App\Models\Template\BTemplate;
@@ -894,6 +895,10 @@ class ProductLogic extends  BaseLogic
             if($category_arr){
             if($category_arr){
                 CategoryRelated::saveRelated($id, $category_arr);
                 CategoryRelated::saveRelated($id, $category_arr);
             }
             }
+            //关联关键词
+            if($keyword_id){
+                KeywordRelated::saveRelated($id, $keyword_id);
+            }
             return true;
             return true;
         }
         }
         return false;
         return false;