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

@@ -85,14 +85,17 @@ class BaseController extends Controller
                 case 'row':
                 case 'row':
                     $this->row = $v;
                     $this->row = $v;
                     break;
                     break;
+                case "name":
+                    $this->map['name'] = ['like','%'.$v.'%'];
+                    break;
                 case "created_at":
                 case "created_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['create_at'] = ['between', $this->_btw];
+                    $this->map['created_at'] = ['between', $this->_btw];
                     break;
                     break;
                 case "updated_at":
                 case "updated_at":
                     $this->_btw[1]                             = $v;
                     $this->_btw[1]                             = $v;
-                    $this->map['update_at'] = ['between', $this->_btw];
+                    $this->map['updated_at'] = ['between', $this->_btw];
                     break;
                     break;
                 default:
                 default:
                     if (!empty($v)) {
                     if (!empty($v)) {
@@ -101,7 +104,6 @@ class BaseController extends Controller
                     break;
                     break;
             }
             }
         }
         }
-
     }
     }
     /**
     /**
      * @name 统一返回参数
      * @name 统一返回参数

@@ -8,6 +8,7 @@ use App\Http\Requests\Bside\News\NewsCategoryRequest;
 use App\Models\News\News as NewsModel;
 use App\Models\News\News as NewsModel;
 use App\Models\News\NewsCategory as NewsCategoryModel;
 use App\Models\News\NewsCategory as NewsCategoryModel;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 
 
 class NewsCategoryController extends BaseController
 class NewsCategoryController extends BaseController
 {
 {
@@ -18,25 +19,64 @@ class NewsCategoryController extends BaseController
      * @method
      * @method
      */
      */
     public function lists(NewsCategoryModel $newsCategory){
     public function lists(NewsCategoryModel $newsCategory){
+        //搜索条件
         $lists = $newsCategory->lists($this->map,$this->page,$this->row);
         $lists = $newsCategory->lists($this->map,$this->page,$this->row);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 
     /**
     /**
+     * @name :获取当前分类详情
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function info(Request $request,NewsCategoryModel $newsCategory){
+        $request->validate([
+            'id'=>['required']
+        ],[
+            'id.required' => 'ID不能为空'
+        ]);
+        $info = $newsCategory->read($this->param);
+        if($info === false){
+            $this->response('error',Code::USER_ERROR);
+        }
+        $this->response('success',Code::SUCCESS,$info);
+    }
+    /**
      * @name :添加分类
      * @name :添加分类
      * @return json
      * @return json
      * @author :liyuhang
      * @author :liyuhang
      * @method
      * @method
      */
      */
-    public function add(NewsCategoryRequest $request,NewsCategoryModel $newsCategory){
+    public function add(NewsCategoryRequest $request,NewsCategoryModel $newsCategory,NewsModel $news){
         $request->validated();
         $request->validated();
         $this->param['project_id'] = $this->user['project_id'];
         $this->param['project_id'] = $this->user['project_id'];
         $this->param['Operator_id'] = $this->uid;
         $this->param['Operator_id'] = $this->uid;
         $this->param['create_id'] = $this->uid;
         $this->param['create_id'] = $this->uid;
+        DB::beginTransaction();
         $rs = $newsCategory->add($this->param);
         $rs = $newsCategory->add($this->param);
         if($rs ===  false){
         if($rs ===  false){
+            DB::rollBack();
             $this->response('error',Code::USER_ERROR);
             $this->response('error',Code::USER_ERROR);
         }
         }
+        //TODO::判断当前分内是否为一级分类
+        if(isset($this->param['pid']) && !empty($this->param['pid'])){
+            //查看当前上级分类下是否有其他分类
+            $cate_info = $newsCategory->read(['pid'=>$this->param['pid'],'id'=>['!=',$newsCategory->id]]);
+            if($cate_info === false){
+                //查看当前上一级分类下是否有商品
+                $news_info = $news->read(['category_id'=>$this->param['pid'],'pid'=>0]);
+                if($news_info !== false){
+                    //更新所有商品到当前分类
+                    $rs = $news->edit(['category_id'=>$newsCategory->id],['category_id'=>$this->param['pid']]);
+                    if($rs === false){
+                        DB::rollBack();
+                        $this->response('error',Code::USER_ERROR);
+                    }
+                }
+            }
+        }
+        DB::commit();
         $this->response('success',Code::SUCCESS);
         $this->response('success',Code::SUCCESS);
     }
     }
 
 

@@ -95,6 +95,7 @@ class NewsController extends BaseController
         if($rs === false){
         if($rs === false){
             $this->response('error',Code::USER_ERROR);
             $this->response('error',Code::USER_ERROR);
         }
         }
+        //TODO::清空相关资源
         $this->response('success');
         $this->response('success');
     }
     }
 }
 }

@@ -21,9 +21,9 @@ class UserController extends BaseController
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['project_id'] = $this->user['project_id'];
         $lists = $userModel->lists($this->map,$this->page,$this->row,$this->order,['id','name','mobile','created_at']);
         $lists = $userModel->lists($this->map,$this->page,$this->row,$this->order,['id','name','mobile','created_at']);
         if(empty($lists)){
         if(empty($lists)){
-            $this->response('请求失败',Code::USER_ERROR,[]);
+            $this->response('error',Code::USER_ERROR,[]);
         }
         }
-        $this->response('列表',Code::SUCCESS,$lists);
+        $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 
     /**
     /**
@@ -39,7 +39,7 @@ class UserController extends BaseController
         if($rs === false){
         if($rs === false){
             $this->response('当前添加用户已存在或参数错误,添加失败',Code::USER_REGISTER_ERROE,[]);
             $this->response('当前添加用户已存在或参数错误,添加失败',Code::USER_REGISTER_ERROE,[]);
         }
         }
-        $this->response('添加成功',Code::SUCCESS,[]);
+        $this->response('success',Code::SUCCESS);
     }
     }
 
 
     /**
     /**
@@ -86,9 +86,28 @@ class UserController extends BaseController
         }
         }
         $this->response($this->param['status'] == 0 ? '启用成功' : '禁用成功');
         $this->response($this->param['status'] == 0 ? '启用成功' : '禁用成功');
     }
     }
+
+    /**
+     * @name :详情
+     * @return json
+     * @author :liyuhang
+     * @method
+     */
+    public function info(Request $request,UserModel $userModel){
+        $request->validate([
+            'id'=>['required', new Ids()],
+        ],[
+            'id.required' => 'ID不能为空',
+        ]);
+        $rs = $userModel->read($this->param);
+        if($rs === false){
+            $this->response('error',Code::USER_ERROR);
+        }
+        $this->response('success');
+    }
     /**
     /**
      * @name :删除管理员
      * @name :删除管理员
-     * @return void
+     * @return json
      * @author :liyuhang
      * @author :liyuhang
      * @method
      * @method
      */
      */
@@ -100,8 +119,8 @@ class UserController extends BaseController
         ]);
         ]);
         $rs = $userModel->del($this->param);
         $rs = $userModel->del($this->param);
         if($rs === false){
         if($rs === false){
-            $this->response('删除失败',Code::USER_ERROR);
+            $this->response('error',Code::USER_ERROR);
         }
         }
-        $this->response('删除成功');
+        $this->response('success');
     }
     }
 }
 }

@@ -14,32 +14,54 @@ Route::middleware(['bloginauth'])->group(function () {
     //获取当前登录用户项目详情
     //获取当前登录用户项目详情
     Route::any('/get_project', [\App\Http\Controllers\Bside\ComController::class, 'get_project'])->name('get_project');
     Route::any('/get_project', [\App\Http\Controllers\Bside\ComController::class, 'get_project'])->name('get_project');
     //用户相关路由
     //用户相关路由
-    Route::any('/user/add', [\App\Http\Controllers\Bside\UserController::class, 'add'])->name('user_add');
-    Route::any('/user/edit', [\App\Http\Controllers\Bside\UserController::class, 'edit'])->name('user_edit');
-    Route::any('/user/status', [\App\Http\Controllers\Bside\UserController::class, 'status'])->name('user_status');
-    Route::any('/user/lists', [\App\Http\Controllers\Bside\UserController::class, 'lists'])->name('user_lists');
-    Route::any('/user/del', [\App\Http\Controllers\Bside\UserController::class, 'del'])->name('user_del');
+    Route::prefix('user')->group(function () {
+        Route::any('/', [\App\Http\Controllers\Bside\UserController::class, 'lists'])->name('user_lists');
+        Route::any('/add', [\App\Http\Controllers\Bside\UserController::class, 'add'])->name('user_add');
+        Route::any('/edit', [\App\Http\Controllers\Bside\UserController::class, 'edit'])->name('user_edit');
+        Route::any('/status', [\App\Http\Controllers\Bside\UserController::class, 'status'])->name('user_status');
+        Route::any('/info', [\App\Http\Controllers\Bside\UserController::class, 'info'])->name('user_info');
+        Route::any('/del', [\App\Http\Controllers\Bside\UserController::class, 'del'])->name('user_del');
+    });
+
     //用户角色相关路由
     //用户角色相关路由
-    Route::any('/project_role/lists', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'lists'])->name('project_role_lists');
-    Route::any('/project_role/get_role_menu', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'get_role_menu'])->name('project_get_role_add');
-    Route::any('/project_role/add', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'add'])->name('project_role_add');
-    Route::any('/project_role/edit', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'edit'])->name('project_role_edit');
-    Route::any('/project_role/status', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'status'])->name('project_role_status');
-    Route::any('/project_role/del', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'del'])->name('project_role_del');
+    Route::prefix('role')->group(function () {
+        Route::any('/', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'lists'])->name('project_role_lists');
+        Route::any('/get_role_menu', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'get_role_menu'])->name('project_get_role_add');
+        Route::any('/add', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'add'])->name('project_role_add');
+        Route::any('/edit', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'edit'])->name('project_role_edit');
+        Route::any('/info', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'status'])->name('project_role_info');
+        Route::any('/status', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'status'])->name('project_role_status');
+        Route::any('/del', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'del'])->name('project_role_del');
+    });
 
 
-    //group相关路由
-    Route::any('/project_group/add', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'add'])->name('project_group_add');
-    Route::any('/project_group/edit', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'edit'])->name('project_group_edit');
-    Route::any('/project_group/lists', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'lists'])->name('project_group_lists');
-    Route::any('/project_group/del', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'del'])->name('project_group_del');
-    Route::any('/project_group/get_user_lists', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'get_user_lists'])->name('project_group_get_user_lists');
+    //group相关路
+    Route::prefix('group')->group(function () {
+        Route::any('/', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'lists'])->name('project_group_lists');
+        Route::any('/add', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'add'])->name('project_group_add');
+        Route::any('/edit', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'edit'])->name('project_group_edit');
+        Route::any('/info', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'info'])->name('project_group_info');
+        Route::any('/del', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'del'])->name('project_group_del');
+        Route::any('/get_user_lists', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'get_user_lists'])->name('project_group_get_user_lists');
+
+    //新闻相关路由
+    Route::prefix('news')->group(function () {
+        //分类
+        Route::any('/category/add', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'add'])->name('news_category_add');
+        Route::any('/category/info', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'info'])->name('news_category_info');
+        Route::any('/category/edit', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'edit'])->name('news_category_edit');
+        Route::any('/category/lists', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'lists'])->name('news_category_lists');
+        Route::any('/category/del', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'del'])->name('news_category_del');
+        Route::any('/category/status', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'status'])->name('news_category_status');
+
+        //新闻
+        Route::any('/add', [\App\Http\Controllers\Bside\News\NewsController::class, 'add'])->name('news_category_add');
+        Route::any('/info', [\App\Http\Controllers\Bside\News\NewsController::class, 'info'])->name('news_category_info');
+        Route::any('/edit', [\App\Http\Controllers\Bside\News\NewsController::class, 'edit'])->name('news_category_edit');
+        Route::any('/lists', [\App\Http\Controllers\Bside\News\NewsController::class, 'lists'])->name('news_category_lists');
+        Route::any('/del', [\App\Http\Controllers\Bside\News\NewsController::class, 'del'])->name('news_category_del');
+        Route::any('/status', [\App\Http\Controllers\Bside\News\NewsController::class, 'status'])->name('news_category_status');
+    });
 
 
-    //新闻分类相关路由
-    Route::any('/news_category/add', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'add'])->name('news_category_add');
-    Route::any('/news_category/edit', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'edit'])->name('news_category_edit');
-    Route::any('/news_category/lists', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'lists'])->name('news_category_lists');
-    Route::any('/news_category/del', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'del'])->name('news_category_del');
-    Route::any('/news_category/status', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'get_user_lists'])->name('news_category_status');
 
 
 
 
     //产品
     //产品