Merge remote-tracking branch 'origin/master' into akun

刘锟
app/Http/Logic/Aside/Project/OnlineCheckLogic.php
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/Aside/Project/OnlineCheckLogic.php
查看文件 @6367641
+++ b/app/Http/Logic/Aside/Project/OnlineCheckLogic.php
查看文件 @6367641
@@ -69,15 +69,16 @@ class OnlineCheckLogic extends BaseLogic
      */
     public function saveOnlineCheck(){
         $info = $this->model->read(['project_id'=>$this->param['id']]);
+        $projectModel = new Project();
         if($info !== false){
-            $this->fail('已提交，请勿重复提交');
+            $projectInfo = $projectModel->read(['id'=>$this->param['id']],['id','status']);
+            if($projectInfo['status'] != $projectModel::STATUS_ONE){
+                $projectModel->edit(['status'=>$projectModel::STATUS_ONE],['id'=>$projectInfo['id']]);
+            }
         }else{
             if(($this->param['optimist_mid'] == 0) || ($this->param['qa_mid'] == 0)){
                 $this->fail('请先选择优化师和品控,在提交审核');
             }
-            $projectModel = new Project();
-            //提交审核修改状态为审核中
-            $projectModel->edit(['status'=>1],['id'=>$this->param['id']]);
             //组装数据
             $data = [
                 'project_id' => $this->param['id'],
@@ -86,9 +87,11 @@ class OnlineCheckLogic extends BaseLogic
                 'qa_mid' => $this->param['qa_mid'],
                 'created_at'=>date('Y-m-d H:i:s')
             ];
-            $rs = $this->model->add($data);
-            if($rs === false){
-                $this->fail('error');
+            try {
+                $projectModel->edit(['status'=>$projectModel::STATUS_ONE],['id'=>$this->param['id']]);
+                $this->model->add($data);
+            }catch (\Exception $e){
+                $this->fail('提交失败，请联系开发人员');
             }
         }
         return $this->success();
--- a/app/Http/Logic/Bside/Blog/BlogCategoryLogic.php
查看文件 @6367641
+++ b/app/Http/Logic/Bside/Blog/BlogCategoryLogic.php
查看文件 @6367641
@@ -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,8 +46,6 @@ 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);
@@ -57,6 +55,8 @@ class BlogCategoryLogic extends BaseLogic
             DB::rollBack();
             $this->fail('系统错误，请联系管理');
         }
+        $this->addUpdateNotify(RouteMap::SOURCE_BLOG_CATE,$route);
+        $this->curlDelRoute(['new_route'=>$route]);
         return $this->success();
     }
@@ -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
查看文件 @6367641
+++ b/app/Http/Logic/Bside/Blog/BlogLogic.php
查看文件 @6367641
@@ -35,13 +35,11 @@ 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]);
             }
             DB::commit();
@@ -49,24 +47,9 @@ class BlogLogic extends BaseLogic
             DB::rollBack();
             $this->fail('error');
         }
-        return $this->success();
-    }
-
-    /**
-     * @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;
+        $this->curlDelRoute(['new_route'=>$route]);
+        return $this->success();
     }
     /**
--- a/app/Http/Logic/Bside/News/NewsCategoryLogic.php
查看文件 @6367641
+++ b/app/Http/Logic/Bside/News/NewsCategoryLogic.php
查看文件 @6367641
@@ -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,8 +56,6 @@ 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);
@@ -67,6 +65,8 @@ class NewsCategoryLogic extends BaseLogic
             DB::rollBack();
             $this->fail('系统错误，请联系管理员');
         }
+        $this->addUpdateNotify(RouteMap::SOURCE_NEWS_CATE,$route);
+        $this->curlDelRoute(['new_route'=>$route]);
         return $this->success();
     }
@@ -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
查看文件 @6367641
+++ b/app/Http/Logic/Bside/News/NewsLogic.php
查看文件 @6367641
@@ -65,13 +65,11 @@ 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]);
             }
             //更新路由
@@ -80,25 +78,9 @@ class NewsLogic extends BaseLogic
             DB::rollBack();
             $this->fail('系统错误，请联系管理员');
         }
-        return $this->success();
-    }
-
-    /**
-     * @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;
+        $this->curlDelRoute(['new_route'=>$route]);
+        return $this->success();
     }
     /**
--- a/app/Http/Logic/Bside/Product/CategoryLogic.php
查看文件 @6367641
+++ b/app/Http/Logic/Bside/Product/CategoryLogic.php
查看文件 @6367641
@@ -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,8 +122,6 @@ 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);
@@ -135,6 +133,8 @@ class CategoryLogic extends  BaseLogic
             DB::rollBack();
             $this->fail('系统错误，请联系管理员');
         }
+        $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT_CATE,$route);
+        $this->curlDelRoute(['new_route'=>$route]);
         return $this->success();
     }
@@ -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
查看文件 @6367641
+++ b/app/Http/Logic/Bside/Product/KeywordLogic.php
查看文件 @6367641
@@ -58,13 +58,12 @@ 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]);
             }
             //清除缓存
@@ -74,6 +73,8 @@ class KeywordLogic extends  BaseLogic
             DB::rollBack();
             $this->fail('保存失败');
         }
+        $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT_KEYWORD,$route);
+        $this->curlDelRoute(['new_route'=>$route]);
         return $this->success();
     }
--- a/app/Http/Logic/Bside/Product/ProductLogic.php
查看文件 @6367641
+++ b/app/Http/Logic/Bside/Product/ProductLogic.php
查看文件 @6367641
@@ -44,31 +44,27 @@ class ProductLogic extends  BaseLogic
         $category_ids = $this->handleCategory();
         //处理其他字段
         $this->param = $this->handleSaveParam($this->param);
-        DB::connection('custom_mysql')->beginTransaction();
         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]);
             }
             //产品分类关联
             CategoryRelated::saveRelated($id, $category_ids);
             //保存扩展字段
             $this->saveExtendInfo($id,$extend);
-            DB::connection('custom_mysql')->commit();
         }catch (\Exception $e){
-            DB::connection('custom_mysql')->rollBack();
             $this->fail('系统错误请联系管理员');
         }
+        $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT,$route);
+        $this->curlDelRoute(['new_route'=>$route]);
         return $this->success();
     }