From 20f8f204b2f0bb411033bcc05614e3168fb06a15 Mon Sep 17 00:00:00 2001 From: HH Date: Sun, 8 May 2022 17:02:30 +0800 Subject: [PATCH] dept category --- .../goods/GoodsDeptCategoryController.java | 48 ++++++++ .../templates/goods/deptcategory/add.html | 64 ++++++++++ .../goods/deptcategory/deptcategory.html | 113 ++++++++++++++++++ .../ghy/goods/domain/DeptGoodsCategory.java | 2 +- .../goods/mapper/DeptGoodsCategoryMapper.java | 36 ++++++ .../service/GoodsDeptCategoryService.java | 11 ++ .../mapper/goods/DeptGoodsCategoryMapper.xml | 78 ++++++++++-- 7 files changed, 344 insertions(+), 8 deletions(-) create mode 100644 ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsDeptCategoryController.java create mode 100644 ghy-admin/src/main/resources/templates/goods/deptcategory/add.html create mode 100644 ghy-admin/src/main/resources/templates/goods/deptcategory/deptcategory.html create mode 100644 ghy-goods/src/main/java/com/ghy/goods/service/GoodsDeptCategoryService.java diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsDeptCategoryController.java b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsDeptCategoryController.java new file mode 100644 index 00000000..46cedd5e --- /dev/null +++ b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsDeptCategoryController.java @@ -0,0 +1,48 @@ +package com.ghy.web.controller.goods; + +import com.ghy.common.core.controller.BaseController; +import com.ghy.common.core.domain.Ztree; +import com.ghy.goods.service.GoodsCategoryService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +@Controller +@RequestMapping("goods/deptcategory") +public class GoodsDeptCategoryController extends BaseController { + + private static final String PREFIX = "goods/deptcategory"; + + @Resource + GoodsCategoryService goodsCategoryService; +// @Resource +// GoodsDeptCategoryService goodsDeptCategoryService; + + @RequiresPermissions("goods:deptcategory:view") + @GetMapping() + public String goodsCategory() { + return PREFIX + "/deptcategory"; + } + + + @RequiresPermissions("goods:deptcategory:add") + @GetMapping("/add") + public String edit(ModelMap mmap) { + return PREFIX + "/add"; + } + + @GetMapping("/tree") + @ResponseBody + public List goodsDeptCategoryTree() { +// Long parentId = ShiroUtils.getSysUser().getParentId(); +// List ztrees = goodsDeptCategoryService.tree(parentId); + return goodsCategoryService.selectCategoryTree(null); + } + +} diff --git a/ghy-admin/src/main/resources/templates/goods/deptcategory/add.html b/ghy-admin/src/main/resources/templates/goods/deptcategory/add.html new file mode 100644 index 00000000..697b2635 --- /dev/null +++ b/ghy-admin/src/main/resources/templates/goods/deptcategory/add.html @@ -0,0 +1,64 @@ + + + + + + + +
+
+
+ +
+ + + + +
+
+
+
+ + + + + diff --git a/ghy-admin/src/main/resources/templates/goods/deptcategory/deptcategory.html b/ghy-admin/src/main/resources/templates/goods/deptcategory/deptcategory.html new file mode 100644 index 00000000..fd93b16b --- /dev/null +++ b/ghy-admin/src/main/resources/templates/goods/deptcategory/deptcategory.html @@ -0,0 +1,113 @@ + + + + + + +
+
+
+
+
+
    +
  • + 类目名称： +
    • +
  • + 类目状态： +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ghy-goods/src/main/java/com/ghy/goods/domain/DeptGoodsCategory.java b/ghy-goods/src/main/java/com/ghy/goods/domain/DeptGoodsCategory.java index 9ef33db4..f860eba1 100644 --- a/ghy-goods/src/main/java/com/ghy/goods/domain/DeptGoodsCategory.java +++ b/ghy-goods/src/main/java/com/ghy/goods/domain/DeptGoodsCategory.java @@ -21,7 +21,7 @@ public class DeptGoodsCategory extends BaseEntity { private Long goodsCategoryId; @Excel(name = "排序", cellType = Excel.ColumnType.STRING) - private String categorySort; + private Integer categorySort; @Excel(name = "一级分销扣点比例", cellType = Excel.ColumnType.STRING) private String oneRate; diff --git a/ghy-goods/src/main/java/com/ghy/goods/mapper/DeptGoodsCategoryMapper.java b/ghy-goods/src/main/java/com/ghy/goods/mapper/DeptGoodsCategoryMapper.java index 2dc0d633..44e757a4 100644 --- a/ghy-goods/src/main/java/com/ghy/goods/mapper/DeptGoodsCategoryMapper.java +++ b/ghy-goods/src/main/java/com/ghy/goods/mapper/DeptGoodsCategoryMapper.java @@ -1,11 +1,47 @@ package com.ghy.goods.mapper; +import com.ghy.goods.domain.DeptGoodsCategory; + +import java.util.List; + /** * 分公司使用类目mapper + * * @author clunt */ public interface DeptGoodsCategoryMapper { + /** + * @param category 商品属性 + * @return 成功条数 + */ + int insertDeptGoodsCategory(DeptGoodsCategory category); + /** + * @param category 商品属性 + * @return 成功条数 + */ + int updateDeptGoodsCategory(DeptGoodsCategory category); + + /** + * @param category 商品入参 + * @return 商品集合 + */ + List selectDeptGoodsCategoryList(DeptGoodsCategory category); + + + /** + * @param goodsCategoryId 商品id + * @return 商品 + */ + DeptGoodsCategory selectById(Long goodsCategoryId); + + /** + * 批量删除商品信息 + * + * @param goodsCategoryId 需要删除的数据ID + * @return 结果 + */ + int deleteDeptGoodsCategoryByIds(Long[] goodsCategoryId); } diff --git a/ghy-goods/src/main/java/com/ghy/goods/service/GoodsDeptCategoryService.java b/ghy-goods/src/main/java/com/ghy/goods/service/GoodsDeptCategoryService.java new file mode 100644 index 00000000..0749399c --- /dev/null +++ b/ghy-goods/src/main/java/com/ghy/goods/service/GoodsDeptCategoryService.java @@ -0,0 +1,11 @@ +package com.ghy.goods.service; + +import com.ghy.common.core.domain.Ztree; + +import java.util.List; + +public interface GoodsDeptCategoryService { + + + List tree(Long parentId); +} diff --git a/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml b/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml index 81f80654..0f166ef9 100644 --- a/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml +++ b/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml @@ -3,19 +3,83 @@ + + + + + + + - - - - - + + + + + - SELECT create_by, create_time, remark + SELECT dept_goods_category_id, dept_id, dept_goods_category_id, category_sort, + one_rate, two_rate, three_rate, create_by, create_time, remark FROM dept_goods_category + + UPDATE dept_goods_category + + dept_id = #{deptId}, + goods_category_id = #{goodsCategoryId}, + category_sort = #{categorySort}, + one_rate = #{oneRate}, + two_rate = #{twoRate}, + three_rate = #{threeRate}, + update_by = #{updateBy}, + update_time = sysdate() + + WHERE dept_goods_category_id = #{goodsCategoryId} + + + DELETE FROM dept_goods_category WHERE dept_goods_category_id IN + + #{goodsCategoryId} + + - \ No newline at end of file + + insert into dept_goods_category( + dept_id, + goods_category_id, + category_sort, + one_rate, + two_rate, + three_rate, + create_by, + create_time + )values( + #{deptId}, + #{goodsCategoryId}, + #{categorySort}, + #{oneRate}, + #{twoRate}, + #{threeRate}, + #{createBy}, + sysdate() + ) + + + + + +