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

Lyh server



查看合并请求 !2140

@@ -52,9 +52,9 @@ class LyhImportTest extends Command
      * @time   :2023/11/20 15:13
      */
     public function handle(){
-        ProjectServer::useProject(3951);
+        ProjectServer::useProject(3654);
         echo date('Y-m-d H:i:s') . 'start' . PHP_EOL;
-        $this->import2140CustomModule('https://ecdn6.globalso.com/upload/p/2140/file/2025-05/daoru.csv',3951);
+        $this->importProductCategory('https://ecdn6-nc.globalso.com/upload/p/3654/file/2025-06/products-1.csv',3654);
         DB::disconnect('custom_mysql');
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
     }
@@ -129,23 +129,43 @@ class LyhImportTest extends Command
             if($k < 1){
                 continue;
             }
-            if(empty($val[1])){
-                echo '跳过的名称：'.$val[1];
+            if(empty($val[0])){
+                echo '跳过的名称：'.$val[0];
                 continue;
             }
             try {
-                $categoryModel->edit(['sort'=>$val[1]],['title'=>$val[0]]);
-//                $id = $categoryModel->addReturnId(['project_id'=>$project_id,'title'=>$val[1],'seo_title'=>$val[0],'seo_des'=>$val[2]]);
-//                $pid = 0;
-//                if($val[2] != 0){
-//                    //查询上级id
-//                    $pidCate = $categoryModel->read(['seo_title'=>$val[2]]);
-//                    if($pidCate !== false){
-//                        $pid = $pidCate['id'];
-//                    }
-//                }
-//                $route = RouteMap::setRoute($val[1],RouteMap::SOURCE_PRODUCT_CATE,$id,$project_id);
-//                $categoryModel->edit(['route'=>$route,'pid'=>$pid],['id'=>$id]);
+                $cateArr = explode('/',$val[0]);
+                $pid = 0;
+                $two_pid = 0;
+                foreach ($cateArr as $key => $item){
+                    if($key == 0){
+                        //查看一级分类是否存在
+                        $info = $categoryModel->read(['title'=>$item,'pid'=>0],['id']);
+                        if($info === false){
+                            $pid = $categoryModel->addReturnId(['project_id'=>$project_id,'title'=>$item]);
+                            //设置路由
+                            $route = RouteMap::setRoute($item,RouteMap::SOURCE_PRODUCT_CATE,$pid,$project_id);
+                            $categoryModel->edit(['route'=>$route],['id'=>$pid]);
+                        }else{
+                            $pid = $info['id'];
+                        }
+                    }elseif ($key == 1){
+                        //查看当前下面的子级别是否存在
+                        $two_info = $categoryModel->read(['title'=>$item,'pid'=>$pid],['id']);
+                        if($two_info === false){
+                            $two_pid = $categoryModel->addReturnId(['project_id'=>$project_id,'title'=>$item,'pid'=>$pid]);
+                            //设置路由
+                            $route = RouteMap::setRoute($item,RouteMap::SOURCE_PRODUCT_CATE,$two_pid,$project_id);
+                            $categoryModel->edit(['route'=>$route],['id'=>$two_pid]);
+                        }else{
+                            $two_pid = $two_info['id'];
+                        }
+                    }else{
+                        $id = $categoryModel->addReturnId(['project_id'=>$project_id,'title'=>$item,'pid'=>$two_pid]);
+                        $route = RouteMap::setRoute($item,RouteMap::SOURCE_PRODUCT_CATE,$id,$project_id);
+                        $categoryModel->edit(['route'=>$route],['id'=>$id]);
+                    }
+                }
                 echo date('Y-m-d H:i:s') . '产品分类id：'.PHP_EOL;
             }catch (\Exception $e){
                 echo date('Y-m-d H:i:s') . '跳过的名称：'. $val[1];

@@ -359,7 +359,7 @@ class ProductController extends BaseController
         }
         if (!empty($new_content)){
             $detailModel = new Detail();
-            $detailInfo = $detailModel->read(['column_id'=>1]);
+            $detailInfo = $detailModel->read(['column_id'=>1,'product_id'=>$this->param['product_id']]);
             if($detailInfo !== false && !empty($detailInfo['content'])){
                 $productInfo['content'] = $new_content . $detailInfo['content']['content'];
             }