gx

lyh
app/Http/Controllers/Bside/Blog/BlogCategoryController.php
app/Http/Controllers/Bside/News/NewsCategoryController.php
app/Http/Controllers/Bside/Product/CategoryController.php
app/Http/Controllers/Bside/Product/ProductController.php
app/Http/Logic/Bside/Blog/BlogCategoryLogic.php
app/Http/Logic/Bside/Blog/BlogLogic.php
app/Http/Logic/Bside/News/NewsLogic.php
app/Http/Logic/Bside/Product/CategoryLogic.php
app/Http/Logic/Bside/Product/ProductLogic.php
app/Models/RouteMap/RouteMap.php
routes/bside.php
--- a/app/Http/Controllers/Bside/Blog/BlogCategoryController.php
查看文件 @f5676aa
+++ b/app/Http/Controllers/Bside/Blog/BlogCategoryController.php
查看文件 @f5676aa
@@ -58,36 +58,23 @@ class BlogCategoryController extends BaseController
             'id.required' => 'ID不能为空'
         ]);
         $info = $blogCategoryLogic->info_blog_category();
-        $info['alias'] = RouteMap::getRoute(RouteMap::SOURCE_BLOG_CATE, $info['id'], $this->user['project_id']);
-        $info['url'] = $this->user['domain'] . RouteMap::PATH_BLOG_CATE . '/' . $info['alias'];
+        $info['url'] = $this->user['domain'] . $info['alias'];
         $this->response('success',Code::SUCCESS,$info);
     }
+
     /**
-     * @name :添加分类
-     * @author :liyuhang
-     * @method
+     * @remark :保存数据
+     * @name   :save
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/7 14:04
      */
-    public function add(BlogCategoryRequest $request,BlogCategoryLogic $blogCategoryLogic){
+    public function save(BlogCategoryRequest $request,BlogCategoryLogic $blogCategoryLogic){
         $request->validated();
-        //添加时，验证分类上级分类是否有，有则更新到当前分类中，没有时直接添加
-        $blogCategoryLogic->add_blog_category();
+        $blogCategoryLogic->categorySave();
         $this->response('success');
     }
-    /**
-     * @name :编辑分类
-     * @author :liyuhang
-     * @method
-     */
-    public function edit(BlogCategoryRequest $request,BlogCategoryLogic $blogCategoryLogic){
-        $request->validate([
-            'id'=>['required']
-        ],[
-            'id.required' => 'ID不能为空'
-        ]);
-        $blogCategoryLogic->edit_blog_category();
-        $this->response('success');
-    }
     /**
      * @name :编辑状态/与排序
--- a/app/Http/Controllers/Bside/News/NewsCategoryController.php
查看文件 @f5676aa
+++ b/app/Http/Controllers/Bside/News/NewsCategoryController.php
查看文件 @f5676aa
@@ -58,8 +58,7 @@ class NewsCategoryController extends BaseController
             'id.required' => 'ID不能为空'
         ]);
         $info = $newsCategoryLogic->info_news_category();
-        $info['alias'] = RouteMap::getRoute(RouteMap::SOURCE_NEWS_CATE, $info['id'], $this->user['project_id']);
-        $info['url'] = $this->user['domain'] . RouteMap::PATH_NEWS_CATE . '/' . $info['alias'];
+        $info['url'] = $this->user['domain'] . $info['alias'];
         $this->response('success',Code::SUCCESS,$info);
     }
     /**
--- a/app/Http/Controllers/Bside/Product/CategoryController.php
查看文件 @f5676aa
+++ b/app/Http/Controllers/Bside/Product/CategoryController.php
查看文件 @f5676aa
@@ -126,7 +126,6 @@ class CategoryController extends BaseController
         ],[
             'ids.required' => 'ID不能为空'
         ]);
-
         $data = $logic->categoryDelete();
         return $this->success($data);
     }
--- a/app/Http/Controllers/Bside/Product/ProductController.php
查看文件 @f5676aa
+++ b/app/Http/Controllers/Bside/Product/ProductController.php
查看文件 @f5676aa
@@ -118,8 +118,8 @@ class ProductController extends BaseController
     public function save(ProductRequest $request, ProductLogic $logic)
     {
         $request->validated();
-        $data = $logic->productSave();
-        return $this->success($data);
+        $logic->productSave();
+        $this->response('success');
     }
     /**
--- a/app/Http/Logic/Bside/Blog/BlogCategoryLogic.php
查看文件 @f5676aa
+++ b/app/Http/Logic/Bside/Blog/BlogCategoryLogic.php
查看文件 @f5676aa
@@ -52,7 +52,7 @@ class BlogCategoryLogic extends BaseLogic
                 //验证参数是否可编辑
                 $this->verifyParamEdit($this->param['id'],$this->param['pid']);
                 //查看路由是否更新
-                $this->editCategoryRoute($this->param['id'],$this->param['alias']);
+                $id = $this->editCategoryRoute($this->param['id'],$this->param['alias']);
                 $this->param['operator_id'] = $this->user['id'];
                 $this->edit($this->param,['id'=>$this->param['id']]);
             }else{
@@ -94,51 +94,6 @@ class BlogCategoryLogic extends BaseLogic
         return $this->success();
     }
-    /**
-     * @name :添加时验证上级分类是否有商品，有则替换带当前分类下
-     * @return void
-     * @author :liyuhang
-     * @method
-     */
-    public function add_blog_category(){
-        //验证名称是否存在
-        $this->verifyParamName($this->param['name']);
-        //拼接参数
-        $this->param = $this->addParamProcessing($this->param);
-        DB::beginTransaction();
-        try {
-            $cate_id = $this->model->insertGetId($this->param);
-            //处理子集
-            $this->addProcessingSon($cate_id);
-            $route = RouteMap::setRoute($this->param['alias'] ?: $this->param['name'], RouteMap::SOURCE_BLOG_CATE, $cate_id, $this->user['project_id']);
-            DB::commit();
-        }catch (\Exception $e){
-            DB::rollBack();
-            $this->fail('error');
-        }
-        //通知更新
-        $this->updateNotify(['project_id'=>$this->user['project_id'], 'type'=>RouteMap::SOURCE_BLOG_CATE, 'route'=>$route]);
-        return $this->success();
-    }
-
-    /**
-     * @name :编辑分类
-     * @return void
-     * @author :liyuhang
-     * @method
-     */
-    public function edit_blog_category(){
-        //验证名称是否存在
-        $this->verifyParamName($this->param['name'],$this->param['id']);
-        //验证参数是否可编辑
-        $this->verifyParamEdit($this->param['id'],$this->param['pid']);
-        $this->param['operator_id'] = $this->user['id'];
-        $this->edit($this->param,['id'=>$this->param['id']]);
-        $route = RouteMap::setRoute($this->param['alias'] ?: $this->param['name'], RouteMap::SOURCE_BLOG_CATE, $this->param['id'], $this->user['project_id']);
-        //通知更新
-        $this->updateNotify(['project_id'=>$this->user['project_id'], 'type'=>RouteMap::SOURCE_BLOG_CATE, 'route'=>$route]);
-        return $this->success();
-    }
     /**
      * @remark :查看参数是否可编辑
--- a/app/Http/Logic/Bside/Blog/BlogLogic.php
查看文件 @f5676aa
+++ b/app/Http/Logic/Bside/Blog/BlogLogic.php
查看文件 @f5676aa
@@ -113,6 +113,8 @@ class BlogLogic extends BaseLogic
         }
         return $this->success();
     }
+
+
     /**
      * @name ：获取数据详情
      * @return array
--- a/app/Http/Logic/Bside/News/NewsLogic.php
查看文件 @f5676aa
+++ b/app/Http/Logic/Bside/News/NewsLogic.php
查看文件 @f5676aa
@@ -233,10 +233,10 @@ class NewsLogic extends BaseLogic
         //删除路由映射
         RouteMap::delRoute(RouteMap::SOURCE_NEWS, $id, $this->user['project_id']);
         //生成一条删除路由记录
-        $info = $this->model->read(['id'=>$id],['id','route']);
+        $info = $this->model->read(['id'=>$id],['id','url']);
         $data = [
             'source'=>RouteMap::SOURCE_NEWS,
-            'route'=>$info['route'],
+            'route'=>$info['url'],
         ];
         $this->setRouteDeleteSave($data);
         return $this->success();
--- a/app/Http/Logic/Bside/Product/CategoryLogic.php
查看文件 @f5676aa
+++ b/app/Http/Logic/Bside/Product/CategoryLogic.php
查看文件 @f5676aa
@@ -156,8 +156,8 @@ class CategoryLogic extends  BaseLogic
                 }
                 //删除路由
                 $this->delRoute($id);
+                $this->model->del(['id'=>$id]);
             }
-            $this->model->del(['id'=>['in',$ids]]);
             DB::commit();
         }catch (\Exception $e){
             DB::rollBack();
--- a/app/Http/Logic/Bside/Product/ProductLogic.php
查看文件 @f5676aa
+++ b/app/Http/Logic/Bside/Product/ProductLogic.php
查看文件 @f5676aa
@@ -129,14 +129,7 @@ class ProductLogic extends  BaseLogic
             foreach ($this->param['ids'] as $k => $id) {
                 $info = $this->model->read(['id'=>$id]);
                 if($info['status'] == Product::STATUS_RECYCLE){
-                    //删除路由映射
-                    RouteMap::delRoute(RouteMap::SOURCE_PRODUCT, $id, $this->user['project_id']);
-                    //生成一条删除路由记录
-                    $data = [
-                        'source'=>RouteMap::SOURCE_PRODUCT,
-                        'route'=>$info['route'],
-                    ];
-                    $this->setRouteDeleteSave($data);
+                    $this->delRoute($id);
                     //删除当前产品模版
                     $this->delProductModule($id);
                     $this->model->del(['id'=>$id]);
@@ -155,6 +148,26 @@ class ProductLogic extends  BaseLogic
     }
     /**
+     * @remark :删除路由
+     * @name   :delRoute
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/7 10:50
+     */
+    public function delRoute($id){
+        //删除路由映射
+        RouteMap::delRoute(RouteMap::SOURCE_PRODUCT, $id, $this->user['project_id']);
+        //生成一条删除路由记录
+        $info = $this->model->read(['id'=>$id],['id','route']);
+        $data = [
+            'source'=>RouteMap::SOURCE_PRODUCT,
+            'route'=>$info['route'],
+        ];
+        $this->setRouteDeleteSave($data);
+        return $this->success();
+    }
+
+    /**
      * @remark :统计数据
      * @name   :getStatusNumber
      * @author :lyh
--- a/app/Models/RouteMap/RouteMap.php
查看文件 @f5676aa
+++ b/app/Models/RouteMap/RouteMap.php
查看文件 @f5676aa
@@ -76,7 +76,6 @@ class RouteMap extends Base
         $where = [
             'project_id' => $project_id,
             'route' => $route,
-//            'source' => $source
         ];
         $route = self::where($where)->first();
         if($route){
--- a/routes/bside.php
查看文件 @f5676aa
+++ b/routes/bside.php
查看文件 @f5676aa
@@ -84,9 +84,9 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/statusNum', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'getStatusNumber'])->name('blog_statusNum');
         //分类
         Route::any('/category/', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'lists'])->name('blog_category_lists');
-        Route::any('/category/add', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'add'])->name('blog_category_add');
+        Route::any('/category/add', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'save'])->name('blog_category_add');
         Route::any('/category/info', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'info'])->name('blog_category_info');
-        Route::any('/category/edit', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'edit'])->name('blog_category_edit');
+        Route::any('/category/edit', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'save'])->name('blog_category_edit');
         Route::any('/category/del', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'del'])->name('blog_category_del');
         Route::any('/category/status', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'status'])->name('blog_category_status');
         Route::any('/category/categoryTopList', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'categoryTopList'])->name('blog_category_categoryTopList');