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/KeywordLogic.php
app/Http/Logic/Bside/Product/ProductLogic.php
--- a/app/Http/Logic/Bside/Blog/BlogCategoryLogic.php
查看文件 @7f20bc5
+++ b/app/Http/Logic/Bside/Blog/BlogCategoryLogic.php
查看文件 @7f20bc5
@@ -33,7 +33,7 @@ class BlogCategoryLogic extends BaseLogic
         try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
                 $this->param['alias'] = RouteMap::setRoute($this->param['alias'], RouteMap::SOURCE_BLOG_CATE, $this->param['id'], $this->user['project_id']);
-                $this->editCategoryRoute($this->param['id'], $this->param['alias']);
+                $route = $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']]);
@@ -46,12 +46,12 @@ class BlogCategoryLogic extends BaseLogic
                 $this->param = $this->addParamProcessing($this->param);
                 $id = $this->model->addReturnId($this->param);
                 $route = RouteMap::setRoute($this->param['alias'], RouteMap::SOURCE_BLOG_CATE, $id, $this->user['project_id']);
-                $this->addUpdateNotify(RouteMap::SOURCE_BLOG_CATE,$route);
-                $this->curlDelRoute(['new_route'=>$route]);
                 $this->edit(['alias'=>$route],['id'=>$id]);
                 //处理子集
                 $this->addProcessingSon($id);
             }
+            $this->addUpdateNotify(RouteMap::SOURCE_BLOG_CATE,$route);
+            $this->curlDelRoute(['new_route'=>$route]);
             DB::commit();
         }catch (\Exception $e){
             DB::rollBack();
@@ -103,23 +103,6 @@ class BlogCategoryLogic extends BaseLogic
     }
     /**
-     * @remark :编辑路由时生成路由记录
-     * @name   :editCategoryRoute
-     * @author :lyh
-     * @method :post
-     * @time   :2023/9/7 10:51
-     */
-    public function editCategoryRoute($id,$route){
-        //生成一条删除路由记录
-        $info = $this->model->read(['id'=>$id],['id','alias']);
-        if($info['alias'] != $route){
-            $this->addUpdateNotify(RouteMap::SOURCE_BLOG_CATE,$route);
-            $this->curlDelRoute(['route'=>$info['alias'],'new_route'=>$route]);
-        }
-        return true;
-    }
-
-    /**
      * @name :详情
      * @return array
      * @author :liyuhang
--- a/app/Http/Logic/Bside/Blog/BlogLogic.php
查看文件 @7f20bc5
+++ b/app/Http/Logic/Bside/Blog/BlogLogic.php
查看文件 @7f20bc5
@@ -35,15 +35,15 @@ class BlogLogic extends BaseLogic
             $this->param = $this->paramProcessing($this->param);
             if(isset($this->param['id']) && !empty($this->param['id'])){
                 $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_BLOG, $this->param['id'], $this->user['project_id']);
-                $this->editNewsRoute($this->param['id'],$this->param['url']);
+                $route = $this->param['url'];
                 $this->edit($this->param,['id'=>$this->param['id']]);
             }else{
                 $id = $this->model->addReturnId($this->param);
                 $route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_BLOG, $id, $this->user['project_id']);
-                $this->addUpdateNotify(RouteMap::SOURCE_BLOG,$route);
-                $this->curlDelRoute(['new_route'=>$route]);
                 $this->edit(['url'=>$route],['id'=>$id]);
             }
+            $this->addUpdateNotify(RouteMap::SOURCE_BLOG,$route);
+            $this->curlDelRoute(['new_route'=>$route]);
             DB::commit();
         }catch (\Exception $e){
             DB::rollBack();
@@ -53,23 +53,6 @@ class BlogLogic extends BaseLogic
     }
     /**
-     * @remark :查看是否编辑路由
-     * @name   :editCategoryRoute
-     * @author :lyh
-     * @method :post
-     * @time   :2023/9/7 11:05
-     */
-    public function editNewsRoute($id,$route){
-        //生成一条删除路由记录
-        $info = $this->model->read(['id'=>$id],['id','url']);
-        if($info['url'] != $route){
-            $this->addUpdateNotify(RouteMap::SOURCE_BLOG,$route);
-        }
-        $this->curlDelRoute(['route'=>$info['url'],'new_route'=>$route]);
-        return true;
-    }
-
-    /**
      * @name :编辑seo
      * @return void
      * @author :liyuhang
--- a/app/Http/Logic/Bside/News/NewsCategoryLogic.php
查看文件 @7f20bc5
+++ b/app/Http/Logic/Bside/News/NewsCategoryLogic.php
查看文件 @7f20bc5
@@ -45,7 +45,7 @@ class NewsCategoryLogic extends BaseLogic
         try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
                 $this->param['alias'] = RouteMap::setRoute($this->param['alias'], RouteMap::SOURCE_NEWS_CATE, $this->param['id'], $this->user['project_id']);
-                $this->editCategoryRoute($this->param['id'],$this->param['alias']);
+                $route = $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']]);
@@ -56,12 +56,12 @@ class NewsCategoryLogic extends BaseLogic
                 $this->param = $this->addParamProcessing($this->param);
                 $id = $this->model->addReturnId($this->param);
                 $route = RouteMap::setRoute($this->param['alias'], RouteMap::SOURCE_NEWS_CATE, $id, $this->user['project_id']);
-                $this->addUpdateNotify(RouteMap::SOURCE_NEWS_CATE,$route);
-                $this->curlDelRoute(['new_route'=>$route]);
                 $this->model->edit(['alias'=>$route],['id'=>$id]);
                 //当父级分类拥有产品时，处理子集
                 $this->addProcessingSon($id);
             }
+            $this->addUpdateNotify(RouteMap::SOURCE_NEWS_CATE,$route);
+            $this->curlDelRoute(['new_route'=>$route]);
             DB::commit();
         }catch (\Exception $e){
             DB::rollBack();
@@ -112,23 +112,6 @@ class NewsCategoryLogic extends BaseLogic
         }
     }
-    /**
-     * @remark :编辑路由时生成路由记录
-     * @name   :editCategoryRoute
-     * @author :lyh
-     * @method :post
-     * @time   :2023/9/7 10:51
-     */
-    public function editCategoryRoute($id,$route){
-        //生成一条删除路由记录
-        $info = $this->model->read(['id'=>$id],['id','alias']);
-        if($info['alias'] != $route){
-            $this->addUpdateNotify(RouteMap::SOURCE_NEWS_CATE,$route);
-            $this->curlDelRoute(['route'=>$info['alias'],'new_route'=>$route]);
-        }
-        return true;
-    }
-
     /**
      * @remark :修改状态
--- a/app/Http/Logic/Bside/News/NewsLogic.php
查看文件 @7f20bc5
+++ b/app/Http/Logic/Bside/News/NewsLogic.php
查看文件 @7f20bc5
@@ -65,15 +65,15 @@ class NewsLogic extends BaseLogic
             if (isset($this->param['id']) && !empty($this->param['id'])) {
                 $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $this->param['id'], $this->user['project_id']);
                 //是否更新路由
-                $this->editNewsRoute($this->param['id'], $this->param['url']);
+                $route = $this->param['url'];
                 $this->edit($this->param, ['id' => $this->param['id']]);
             } else {
                 $id = $this->model->addReturnId($this->param);
                 $route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $id, $this->user['project_id']);
-                $this->addUpdateNotify(RouteMap::SOURCE_NEWS,$route);
-                $this->curlDelRoute(['new_route'=>$route]);
                 $this->edit(['url' => $route], ['id' => $id]);
             }
+            $this->addUpdateNotify(RouteMap::SOURCE_NEWS,$route);
+            $this->curlDelRoute(['new_route'=>$route]);
             //更新路由
             DB::commit();
         } catch (\Exception $e) {
@@ -84,24 +84,6 @@ class NewsLogic extends BaseLogic
     }
     /**
-     * @remark :查看是否编辑路由
-     * @name   :editCategoryRoute
-     * @author :lyh
-     * @method :post
-     * @time   :2023/9/7 11:05
-     */
-    public function editNewsRoute($id, $route)
-    {
-        //生成一条删除路由记录
-        $info = $this->model->read(['id' => $id], ['id', 'url']);
-        if ($info['url'] != $route) {
-            $this->addUpdateNotify(RouteMap::SOURCE_NEWS,$route);
-        }
-        $this->curlDelRoute(['route'=>$info['url'],'new_route'=>$route]);
-        return true;
-    }
-
-    /**
      * @name :编辑seo
      * @return void
      * @author :liyuhang
--- a/app/Http/Logic/Bside/Product/CategoryLogic.php
查看文件 @7f20bc5
+++ b/app/Http/Logic/Bside/Product/CategoryLogic.php
查看文件 @7f20bc5
@@ -114,7 +114,7 @@ class CategoryLogic extends  BaseLogic
         try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
                 $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT_CATE, $this->param['id'], $this->user['project_id']);
-                $this->editCategoryRoute($this->param['id'],$this->param['route']);
+                $route = $this->param['route'];
                 //处理子集
                 $this->editHandleCategory($this->param['id'],$this->param['pid']);
                 $this->model->edit($this->param,['id'=>$this->param['id']]);
@@ -122,12 +122,12 @@ class CategoryLogic extends  BaseLogic
                 $this->param['project_id'] = $this->user['project_id'];
                 $id = $this->model->addReturnId($this->param);
                 $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT_CATE, $id, $this->user['project_id']);
-                $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT_CATE,$route);
-                $this->curlDelRoute(['new_route'=>$route]);
                 $this->edit(['route'=>$route],['id'=>$id]);
                 //处理子集
                 $this->addProcessingSon($id);
             }
+            $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT_CATE,$route);
+            $this->curlDelRoute(['new_route'=>$route]);
             //清除缓存
             Common::del_user_cache('product_category',$this->user['project_id']);
             DB::commit();
@@ -223,23 +223,6 @@ class CategoryLogic extends  BaseLogic
     }
     /**
-     * @remark :编辑路由时生成路由记录
-     * @name   :editCategoryRoute
-     * @author :lyh
-     * @method :post
-     * @time   :2023/9/7 10:51
-     */
-    public function editCategoryRoute($id,$route){
-        //生成一条删除路由记录
-        $info = $this->model->read(['id'=>$id],['id','route']);
-        if($info['route'] != $route){
-            $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT_CATE,$route);
-            $this->curlDelRoute(['route'=>$info['route'],'new_route'=>$route]);
-        }
-        return true;
-    }
-
-    /**
      * @remark :删除
      * @name   :delete
      * @author :lyh
--- a/app/Http/Logic/Bside/Product/KeywordLogic.php
查看文件 @7f20bc5
+++ b/app/Http/Logic/Bside/Product/KeywordLogic.php
查看文件 @7f20bc5
@@ -58,15 +58,16 @@ class KeywordLogic extends  BaseLogic
             if(isset($this->param['id']) && !empty($this->param['id'])){
                 //TODO::不能修改路由
                 $this->model->edit($this->param,['id'=>$this->param['id']]);
+                $route = $this->param['route'];
             }else{
                 $this->param = $this->addHandleParam($this->param);
                 $id = $this->model->insertGetId($this->param);
                 //路由映射
                 $route = RouteMap::setRoute($this->param['title'], RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $this->user['project_id']);
-                $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT_KEYWORD,$route);
-                $this->curlDelRoute(['new_route'=>$route]);
                 $this->model->edit(['route'=>$route],['id'=>$id]);
             }
+            $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT_KEYWORD,$route);
+            $this->curlDelRoute(['new_route'=>$route]);
             //清除缓存
             Common::del_user_cache('product_keyword',$this->user['project_id']);
             DB::commit();
--- a/app/Http/Logic/Bside/Product/ProductLogic.php
查看文件 @7f20bc5
+++ b/app/Http/Logic/Bside/Product/ProductLogic.php
查看文件 @7f20bc5
@@ -48,18 +48,17 @@ class ProductLogic extends  BaseLogic
         try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
                 $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']);
-                //查看路由是否更新
-                $this->editProductRoute($this->param['id'],$this->param['route']);
+                $route = $this->param['route'];
                 $this->model->edit($this->param,['id'=>$this->param['id']]);
                 $id = $this->param['id'];
             }else{
                 $this->param = $this->addHandleParam($this->param);
                 $id = $this->model->addReturnId($this->param);
                 $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $id, $this->user['project_id']);
-                $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT,$route);
-                $this->curlDelRoute(['new_route'=>$route]);
                 $this->model->edit(['route'=>$route],['id'=>$id]);
             }
+            $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT,$route);
+            $this->curlDelRoute(['new_route'=>$route]);
             //产品分类关联
             CategoryRelated::saveRelated($id, $category_ids);
             //保存扩展字段