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

gx



查看合并请求 !1551

@@ -89,18 +89,19 @@ class LyhImportTest extends Command
                 continue;
             }
             if(empty($val[1])){
+                echo '跳过的名称：'.$val[1];
                 continue;
             }
             try {
-                $id = $categoryModel->addReturnId(['project_id'=>$project_id,'title'=>$val[1],'seo_title'=>$val[0],'seo_keyword'=>$val[2]]);
+                $id = $categoryModel->addReturnId(['project_id'=>$project_id,'title'=>$val[1],'seo_title'=>$val[0],'seo_des'=>$val[2],'sort'=>$val[3]]);
                 $pid = 0;
-//                if($val[2] != 0){
-//                    //查询上级id
-//                    $pidCate = $categoryModel->read(['seo_title'=>$val[2]]);
-//                    if($pidCate !== false){
-//                        $pid = $pidCate['id'];
-//                    }
-//                }
+                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]);
                 echo date('Y-m-d H:i:s') . '产品分类id：'. $id.PHP_EOL;