From 0a54c5df5c1a1f77570a07ff008ed90ff9d17da4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 27 Sep 2021 15:51:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsCategoryController.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsCategoryController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsCategoryController.java
index 5baf213..6c52ae7 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsCategoryController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsCategoryController.java
@@ -5,9 +5,9 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.mall.entity.MallGoodsCategory;
-import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.service.IAdminMallGoodsCategoryService;
-import cc.mrbird.febs.system.entity.Role;
+import cc.mrbird.febs.mall.vo.AdminAddAddressTreeVo;
+import cc.mrbird.febs.mall.vo.AdminMallGoodsCategoryTreeVo;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
@@ -17,6 +17,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
+import java.util.List;
import java.util.Map;
@Slf4j
@@ -46,11 +47,29 @@
}
/**
+ * 商品分类-选择
+ */
+ @GetMapping("categorys/tree")
+ @ControllerEndpoint(exceptionMessage = "获取分类失败")
+ public List<AdminMallGoodsCategoryTreeVo> getParentCategorys(){
+ return goodsCategoryService.getParentCategorys();
+ }
+
+ /**
* 商品分类-新增
*/
@PostMapping("addCategory")
- @ControllerEndpoint(operation = " 商品分类-新增", exceptionMessage = "新增失败")
+ @ControllerEndpoint(operation = " 商品分类-新增", exceptionMessage = "操作失败")
public FebsResponse addCategory(@Valid MallGoodsCategory mallGoodsCategory) {
return goodsCategoryService.addCategory(mallGoodsCategory);
}
+
+ /**
+ * 商品分类-编辑
+ */
+ @PostMapping("updateCategory")
+ @ControllerEndpoint(operation = " 商品分类-编辑", exceptionMessage = "操作失败")
+ public FebsResponse updateCategory(@Valid MallGoodsCategory mallGoodsCategory) {
+ return goodsCategoryService.updateCategory(mallGoodsCategory);
+ }
}
--
Gitblit v1.9.1