Merge branch 'dev' of http://47.244.231.31:8099/zhl/globalso-v6 into dev

@@ -88,12 +88,12 @@ class BaseController extends Controller
                 case "name":
                 case "name":
                     $this->map['name'] = ['like','%'.$v.'%'];
                     $this->map['name'] = ['like','%'.$v.'%'];
                     break;
                     break;
-                case "created_at":
+                case "start_at":
                     $this->_btw[0]                             = $v;
                     $this->_btw[0]                             = $v;
                     $this->_btw[1]                             = date('Y-m-d H:i:s',time());
                     $this->_btw[1]                             = date('Y-m-d H:i:s',time());
                     $this->map['created_at'] = ['between', $this->_btw];
                     $this->map['created_at'] = ['between', $this->_btw];
                     break;
                     break;
-                case "updated_at":
+                case "end_at":
                     $this->_btw[1]                             = $v;
                     $this->_btw[1]                             = $v;
                     $this->map['updated_at'] = ['between', $this->_btw];
                     $this->map['updated_at'] = ['between', $this->_btw];
                     break;
                     break;

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Bside\Blog;
 namespace App\Http\Controllers\Bside\Blog;
 
 
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
+use App\Http\Logic\Bside\Blog\BlogCategoryLogic;
 use App\Http\Requests\Bside\Blog\BlogCategoryRequest;
 use App\Http\Requests\Bside\Blog\BlogCategoryRequest;
 use App\Models\Blog\Blog as BlogModel;
 use App\Models\Blog\Blog as BlogModel;
 use App\Models\Blog\BlogCategory as BlogCategoryModel;
 use App\Models\Blog\BlogCategory as BlogCategoryModel;
@@ -46,36 +47,10 @@ class BlogCategoryController extends BaseController
      * @author :liyuhang
      * @author :liyuhang
      * @method
      * @method
      */
      */
-    public function add(BlogCategoryRequest $request,BlogCategoryModel $blogCategoryModel,BlogModel $blogModel){
+    public function add(BlogCategoryRequest $request,BlogCategoryLogic $blogCategoryLogic){
         $request->validated();
         $request->validated();
-        $this->param['project_id'] = $this->user['project_id'];
-        $this->param['operator_id'] = $this->uid;
-        $this->param['create_id'] = $this->uid;
-        DB::beginTransaction();
-        $rs = $blogCategoryModel->add($this->param);
-        if($rs ===  false){
-            DB::rollBack();
-            $this->response('error',Code::USER_ERROR);
-        }
-        //TODO::判断当前分内是否为一级分类
-        if(isset($this->param['pid']) && !empty($this->param['pid'])){
-            //查看当前上级分类下是否有其他分类
-            $cate_info = $blogCategoryModel->read(['pid'=>$this->param['pid'],'id'=>['!=',$blogCategoryModel->id]]);
-            if($cate_info === false){
-                //查看当前上一级分类下是否有商品
-                $news_info = $blogModel->read(['category_id'=>$this->param['pid'],'pid'=>0]);
-                if($news_info !== false){
-                    //更新所有商品到当前分类
-                    $rs = $blogModel->edit(['category_id'=>$blogCategoryModel->id],['category_id'=>$this->param['pid']]);
-                    if($rs === false){
-                        DB::rollBack();
-                        $this->response('error',Code::USER_ERROR);
-                    }
-                }
-            }
-        }
-        //TODO::写入日志
-        DB::commit();
+        //添加时，验证分类上级分类是否有，有则更新到当前分类中，没有时直接添加
+        $blogCategoryLogic->add_blog_category();
         $this->response('success');
         $this->response('success');
     }
     }
 
 

@@ -52,7 +52,7 @@ class NewsCategoryController extends BaseController
      */
      */
     public function add(NewsCategoryRequest $request,NewsCategoryLogic $newsCategoryLogic){
     public function add(NewsCategoryRequest $request,NewsCategoryLogic $newsCategoryLogic){
         $request->validated();
         $request->validated();
-        //添加商品时，验证分类上级分类是否有商品，有则更新到当前分类中，没有时直接添加
+        //添加时，验证分类上级分类是否有，有则更新到当前分类中，没有时直接添加
         $newsCategoryLogic->add_news_category();
         $newsCategoryLogic->add_news_category();
         //TODO::写入日志
         //TODO::写入日志
         $this->response('success',Code::SUCCESS,[]);
         $this->response('success',Code::SUCCESS,[]);
@@ -76,7 +76,7 @@ class NewsCategoryController extends BaseController
             $this->response('error',Code::USER_ERROR);
             $this->response('error',Code::USER_ERROR);
         }
         }
         //TODO::写入日志
         //TODO::写入日志
-        $this->response('success',Code::SUCCESS);
+        $this->response('success');
     }
     }
 
 
     /**
     /**
@@ -105,29 +105,13 @@ class NewsCategoryController extends BaseController
      * @author :liyuhang
      * @author :liyuhang
      * @method
      * @method
      */
      */
-    public function del(Request $request,NewsCategoryModel $newsCategory,NewsModel $news){
+    public function del(Request $request,NewsCategoryLogic $newsCategoryLogic){
         $request->validate([
         $request->validate([
             'id'=>['required'],
             'id'=>['required'],
         ],[
         ],[
             'id.required' => 'ID不能为空',
             'id.required' => 'ID不能为空',
         ]);
         ]);
-        foreach ($this->param['id'] as $v){
-            //查询是否有子分类
-            $rs = $newsCategory->read(['pid'=>$v],['id']);
-            if($rs !== false){
-                $this->response('当前分类拥有子分类不允许删除',Code::USER_ERROR);
-            }
-            //查看当前分内下是否有商品
-            $rs = $news->read(['category_id'=>$v],['id']);
-            if($rs !== false){
-                $this->response('当前分类拥有商品',Code::USER_ERROR);
-            }
-        }
-        $this->param['id'] = ['in',$this->param['id']];
-        $rs = $newsCategory->del($this->param);
-        if($rs === false){
-            $this->response('error',Code::USER_ERROR);
-        }
+        $newsCategoryLogic->del_news_category();
         $this->response('success');
         $this->response('success');
     }
     }
 }
 }

+<?php
+
+namespace App\Http\Logic\Bside\Blog;
+
+use App\Enums\Common\Code;
+use App\Http\Logic\Bside\BaseLogic;
+use App\Models\Blog\BlogCategory as BlogCategoryModel;
+use App\Models\Blog\Blog as BlogModel;
+use Illuminate\Support\Facades\DB;
+
+class BlogCategoryLogic extends BaseLogic
+{
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->model = new BlogCategoryModel();
+    }
+
+    /**
+     * @name :添加时验证上级分类是否有商品，有则替换带当前分类下
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function add_blog_category(){
+        DB::beginTransaction();
+        $this->param = $this->requestAll;
+        $this->param['project_id'] = $this->user['project_id'];
+        $this->param['operator_id'] = $this->user['id'];
+        $this->param['create_id'] = $this->user['id'];
+        $this->param['created_at'] = date('Y-m-d H:i:s');
+        $this->param['updated_at'] = date('Y-m-d H:i:s');
+        $cate_id = $this->model->insertGetId($this->param);
+        if($cate_id === false){
+            DB::rollBack();
+            $this->fail('error',Code::USER_ERROR);
+        }
+        //判断为子分类时
+        if(isset($this->param['pid']) && !empty($this->param['pid'])) {
+            //查看当前上级分类下是否有其他分类
+            $cate_info = $this->model->read(['pid' => $this->param['pid'], 'id' => ['!=', $cate_id]]);
+            if ($cate_info === false) {
+                //查看当前上一级分类下是否有新闻
+                $blogModel = new BlogModel();
+                $news_info = $blogModel->read(['category_id' => ['like', ',' . $this->param['pid'] . ',']]);
+                if ($news_info !== false) {
+                    $replacement = ',' . $cate_id . ',';
+                    $old = ',' . $this->param['pid'] . ',';
+                    //更新所有商品到当前分类
+                    $rs = DB::table('gl_Blog')->where('category_id', 'like', '%' . $old . '%')
+                        ->update(['category_id' => DB::raw("REPLACE(category_id, '$old', '$replacement')")]);
+                    if ($rs === false) {
+                        DB::rollBack();
+                        $this->fail('error', Code::USER_ERROR);
+                    }
+                }
+            }
+        }
+        DB::commit();
+        return $this->success();
+    }
+}

+<?php
+
+namespace App\Http\Logic\Bside\Blog;
+
+use App\Http\Logic\Bside\BaseLogic;
+
+class BlogLogic extends BaseLogic
+{
+
+}

@@ -57,6 +57,36 @@ class NewsCategoryLogic extends BaseLogic
             }
             }
         }
         }
         DB::commit();
         DB::commit();
-        $this->success();
+        return $this->success();
+    }
+
+    /**
+     * @name :删除新闻分类
+     * @return array
+     * @throws \App\Exceptions\BsideGlobalException
+     * @author :liyuhang
+     * @method
+     */
+    public function del_news_category(){
+        $this->param = $this->requestAll;
+        foreach ($this->param['id'] as $v){
+            //查询是否有子分类
+            $rs = $this->model->read(['pid'=>$v],['id']);
+            if($rs !== false){
+                $this->fail('当前分类拥有子分类不允许删除',Code::USER_ERROR);
+            }
+            //查看当前分内下是否有商品
+            $newsModel = new NewsModel();
+            $rs = $newsModel->read(['category_id'=>$v],['id']);
+            if($rs !== false){
+                $this->fail('当前分类拥有商品',Code::USER_ERROR);
+            }
+        }
+        $this->param['id'] = ['in',$this->param['id']];
+        $rs = $this->model->del($this->param);
+        if($rs === false){
+            $this->fail('error',Code::USER_ERROR);
+        }
+        return $this->success();
     }
     }
 }
 }