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

gx复制项目脚本



查看合并请求 !1316

@@ -14,6 +14,7 @@ use App\Models\CustomModule\CustomModuleContent;
 use App\Models\CustomModule\CustomModuleExtentContent;
 use App\Models\News\News;
 use App\Models\Product\Category;
+use App\Models\Product\CategoryRelated;
 use App\Models\Product\Column;
 use App\Models\Product\Detail;
 use App\Models\Product\Product;
@@ -99,7 +100,7 @@ class LyhImportTest extends Command
             if($val[0] ?? ''){
                 $cateInfo = $cateModel->read(['seo_title'=>trim($val[0])]);
                 if($cateInfo !== false){
-                    $saveData['category_id']  = $cateInfo['id'];
+                    $saveData['category_id']  = ','.$cateInfo['id'].',';
                 }
             }
             $saveData['intro'] = $val[2];
@@ -112,6 +113,10 @@ class LyhImportTest extends Command
             $saveData['gallery'] = json_encode($gallery,true);
             $id = $productModel->addReturnId($saveData);
             echo date('Y-m-d H:i:s') . '新增产品id:'.$id . PHP_EOL;
+            //设置关联关系
+            if(isset($cateInfo)){
+                CategoryRelated::saveRelated($id,[$cateInfo['id']]);
+            }
             //设置路由
             $route = RouteMap::setRoute($val[1],RouteMap::SOURCE_PRODUCT,$id,$project_id);
             $productModel->edit(['route'=>$route],['id'=>$id]);