gx

lyh
app/Http/Logic/Bside/Blog/BlogCategoryLogic.php
app/Http/Logic/Bside/Blog/BlogLogic.php
app/Http/Logic/Bside/News/NewsCategoryLogic.php
app/Http/Logic/Bside/News/NewsLogic.php
app/Http/Logic/Bside/Product/CategoryLogic.php
app/Http/Logic/Bside/Product/ProductLogic.php
app/Models/Product/CategoryRelated.php
app/Models/RouteMap/RouteMap.php
--- a/app/Http/Logic/Bside/Blog/BlogCategoryLogic.php
查看文件 @d48bf15
+++ b/app/Http/Logic/Bside/Blog/BlogCategoryLogic.php
查看文件 @d48bf15
@@ -33,7 +33,8 @@ class BlogCategoryLogic extends BaseLogic
         try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
                 //查看路由是否更新
-                $id = $this->editCategoryRoute($this->param['id'], $this->param['alias']);
+                $id = $this->param['id'];
+                $this->editCategoryRoute($this->param['id'], $this->param['alias']);
                 $this->editHandleCategory($this->param['id'],$this->param['pid']);
                 $this->param['operator_id'] = $this->user['id'];
                 $this->edit($this->param,['id'=>$this->param['id']]);
@@ -119,7 +120,7 @@ class BlogCategoryLogic extends BaseLogic
             ];
             $this->setRouteDeleteSave($data);
         }
-        return $this->success($id);
+        return true;
     }
     /**
--- a/app/Http/Logic/Bside/Blog/BlogLogic.php
查看文件 @d48bf15
+++ b/app/Http/Logic/Bside/Blog/BlogLogic.php
查看文件 @d48bf15
@@ -35,7 +35,8 @@ class BlogLogic extends BaseLogic
             $this->param = $this->paramProcessing($this->param);
             if(isset($this->param['id']) && !empty($this->param['id'])){
                 //是否更新路由
-                $id = $this->editNewsRoute($this->param['id'],$this->param['url']);
+                $id = $this->param['id'];
+                $this->editNewsRoute($this->param['id'],$this->param['url']);
                 $this->edit($this->param,['id'=>$this->param['id']]);
             }else{
                 $id = $this->model->addReturnId($this->param);
@@ -69,7 +70,7 @@ class BlogLogic extends BaseLogic
             ];
             $this->setRouteDeleteSave($data);
         }
-        return $id;
+        return true;
     }
     /**
--- a/app/Http/Logic/Bside/News/NewsCategoryLogic.php
查看文件 @d48bf15
+++ b/app/Http/Logic/Bside/News/NewsCategoryLogic.php
查看文件 @d48bf15
@@ -46,7 +46,8 @@ class NewsCategoryLogic extends BaseLogic
             if(isset($this->param['id']) && !empty($this->param['id'])){
                 $this->param['operator_id'] = $this->user['id'];
                 //查看路由是否更新
-                $id = $this->editCategoryRoute($this->param['id'],$this->param['alias']);
+                $id = $this->param['id'];
+                $this->editCategoryRoute($this->param['id'],$this->param['alias']);
                 $this->editHandleCategory($this->param['id'],$this->param['pid']);
                 $this->edit($this->param,['id'=>$this->param['id']]);
             }else{
@@ -129,7 +130,7 @@ class NewsCategoryLogic extends BaseLogic
             ];
             $this->setRouteDeleteSave($data);
         }
-        return $id;
+        return true;
     }
--- a/app/Http/Logic/Bside/News/NewsLogic.php
查看文件 @d48bf15
+++ b/app/Http/Logic/Bside/News/NewsLogic.php
查看文件 @d48bf15
@@ -64,7 +64,8 @@ class NewsLogic extends BaseLogic
             $this->param = $this->paramProcessing($this->param);
             if (isset($this->param['id']) && !empty($this->param['id'])) {
                 //是否更新路由
-                $id = $this->editNewsRoute($this->param['id'], $this->param['url']);
+                $this->editNewsRoute($this->param['id'], $this->param['url']);
+                $id = $this->param['id'];
                 $this->edit($this->param, ['id' => $this->param['id']]);
             } else {
                 $id = $this->model->addReturnId($this->param);
@@ -100,7 +101,7 @@ class NewsLogic extends BaseLogic
             ];
             $this->setRouteDeleteSave($data);
         }
-        return $id;
+        return true;
     }
--- a/app/Http/Logic/Bside/Product/CategoryLogic.php
查看文件 @d48bf15
+++ b/app/Http/Logic/Bside/Product/CategoryLogic.php
查看文件 @d48bf15
@@ -115,6 +115,7 @@ class CategoryLogic extends  BaseLogic
             if(isset($this->param['id']) && !empty($this->param['id'])){
                 //是否编辑路由
                 $id = $this->editCategoryRoute($this->param['id'],$this->param['route']);
+                //处理子集
                 $this->editHandleCategory($this->param['id'],$this->param['pid']);
                 $this->model->edit($this->param,['id'=>$this->param['id']]);
             }else{
--- a/app/Http/Logic/Bside/Product/ProductLogic.php
查看文件 @d48bf15
+++ b/app/Http/Logic/Bside/Product/ProductLogic.php
查看文件 @d48bf15
@@ -47,13 +47,15 @@ class ProductLogic extends  BaseLogic
         DB::connection('custom_mysql')->beginTransaction();
         try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
+                $id = $this->param['id'];
                 //查看路由是否更新
-                $id = $this->editProductRoute($this->param['id'],$this->param['route']);
+                $this->param['route'] = $this->editProductRoute($this->param['route']);
                 $this->model->edit($this->param,['id'=>$this->param['id']]);
             }else{
                 $this->param['project_id'] = $this->user['project_id'];
                 $this->param['created_at'] = date('Y-m-d H:i:s');
                 $this->param['updated_at'] = $this->param['created_at'];
+                $this->param['route'] = $this->param['route'].'-'.RouteMap::SOURCE_PRODUCT;
                 $id = $this->model->addReturnId($this->param);
             }
             $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $id, $this->user['project_id']);
@@ -204,7 +206,7 @@ class ProductLogic extends  BaseLogic
      * @method :post
      * @time   :2023/9/7 10:02
      */
-    public function editProductRoute($id,$route){
+    public function editProductRoute($route){
         $info = $this->model->read(['id'=>$this->param['id']]);
         if($info['route'] != $route){
             //生成一条删除路由记录
@@ -213,8 +215,12 @@ class ProductLogic extends  BaseLogic
                 'route'=>$route,
             ];
             $this->setRouteDeleteSave($data);
+            //"字符串以\"-product\"结尾"
+            if (!endsWith($route, "-product")) {
+                $route = $route."-product";
             }
-        return $id;
+        }
+        return $route;
     }
     /**
@@ -431,17 +437,20 @@ class ProductLogic extends  BaseLogic
      * @time   :2023/8/15 17:53
      */
     public function batchSetCategory(){
+        if(isset($this->param['category_id']) && !empty($this->param['category_id'])) {
             DB::connection('custom_mysql')->beginTransaction();
+            $category_ids = $this->getLastCategoryArr($this->param['category_id']);
+            $this->param['category_id'] = ','.implode(',',$category_ids).',';
             try {
                 //批量
                 $param = [
-                'category_id'=>','.Arr::arrToSet($this->param['category_id']).',',
+                    'category_id'=>$this->param['category_id'],
                     'status'=>$this->param['status']
                 ];
                 $this->model->edit($param,['id'=>['in',$this->param['id']]]);
                 //分类关联
                 foreach ($this->param['id'] as $id){
-               CategoryRelated::saveRelated($id, $this->param['category_id']);
+                    CategoryRelated::saveRelated($id, $category_ids);
                 }
                 DB::connection('custom_mysql')->commit();
                 //对应添加关联表
@@ -449,6 +458,7 @@ class ProductLogic extends  BaseLogic
                 DB::connection('custom_mysql')->rollBack();
                 $this->fail('系统错误，请联系管理员');
             }
+        }
         return $this->success();
     }
--- a/app/Models/Product/CategoryRelated.php
查看文件 @d48bf15
+++ b/app/Models/Product/CategoryRelated.php
查看文件 @d48bf15
@@ -34,6 +34,7 @@ class CategoryRelated extends Base
         self::where('product_id', $product_id)->delete();
         //批量保存
         $data = [];
+        if(!empty($cate_ids)){
             foreach ($cate_ids as $cate_id){
                 $data[] = [
                     'product_id' => $product_id,
@@ -42,4 +43,6 @@ class CategoryRelated extends Base
             }
             self::insert($data);
         }
+        return true;
+    }
 }
--- a/app/Models/RouteMap/RouteMap.php
查看文件 @d48bf15
+++ b/app/Models/RouteMap/RouteMap.php
查看文件 @d48bf15
@@ -109,6 +109,15 @@ class RouteMap extends Base
             if(!$route_map){
                 $route_map = new self();
                 $route_map->source = $source;
+                if($source == self::SOURCE_NEWS){
+                    $route_map->path = self::SOURCE_NEWS;
+                }elseif($source == self::SOURCE_NEWS_CATE){
+                    $route_map->path = self::PATH_NEWS_CATE;
+                }elseif ($source == self::SOURCE_BLOG){
+                    $route_map->path = self::SOURCE_BLOG;
+                }elseif ($source == self::SOURCE_BLOG_CATE){
+                    $route_map->path = self::PATH_BLOG_CATE;
+                }
                 $route_map->source_id = $source_id;
                 $route_map->project_id = $project_id;
             }