From a101b86d1044dc877de2cb39562bb8dad4f6802e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 28 Sep 2021 14:38:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsCategoryService.java | 6 ++++++
src/main/resources/mapper/modules/MallGoodsCategoryMapper.xml | 5 ++++-
src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsCategoryMapper.java | 2 ++
src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsCategoryController.java | 9 +++++++++
src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html | 8 ++++----
src/main/java/cc/mrbird/febs/mall/service/IAdminMallGoodsCategoryService.java | 2 ++
6 files changed, 27 insertions(+), 5 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 92acc71..80f7b94 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsCategoryController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsCategoryController.java
@@ -54,6 +54,15 @@
}
/**
+ * 商品分类-全部选择
+ */
+ @GetMapping("categorys/allTree")
+ @ControllerEndpoint(exceptionMessage = "获取分类失败")
+ public List<AdminMallGoodsCategoryTreeVo> getAllCategorys(){
+ return goodsCategoryService.getAllCategorys();
+ }
+
+ /**
* 商品分类-新增
*/
@PostMapping("addCategory")
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsCategoryMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsCategoryMapper.java
index 012470b..61646ad 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsCategoryMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsCategoryMapper.java
@@ -30,4 +30,6 @@
List<AdminMallGoodsCategoryTreeVo> getParentCategorys();
List<MallGoodsCategory> selectChildCategaryById(@Param("id")Long id);
+
+ List<AdminMallGoodsCategoryTreeVo> getAllCategorys();
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IAdminMallGoodsCategoryService.java b/src/main/java/cc/mrbird/febs/mall/service/IAdminMallGoodsCategoryService.java
index d6b356f..179a00a 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IAdminMallGoodsCategoryService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IAdminMallGoodsCategoryService.java
@@ -26,4 +26,6 @@
FebsResponse updateCategory(MallGoodsCategory mallGoodsCategory);
FebsResponse delCategary(Long id);
+
+ List<AdminMallGoodsCategoryTreeVo> getAllCategorys();
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsCategoryService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsCategoryService.java
index 32e64a7..27e4cde 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsCategoryService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsCategoryService.java
@@ -155,4 +155,10 @@
return new FebsResponse().success();
}
+ @Override
+ public List<AdminMallGoodsCategoryTreeVo> getAllCategorys() {
+ List<AdminMallGoodsCategoryTreeVo> adminMallGoodsCategoryTreeVos = mallGoodsCategoryMapper.getAllCategorys();
+ return adminMallGoodsCategoryTreeVos;
+ }
+
}
diff --git a/src/main/resources/mapper/modules/MallGoodsCategoryMapper.xml b/src/main/resources/mapper/modules/MallGoodsCategoryMapper.xml
index 7d707cd..2b0dd24 100644
--- a/src/main/resources/mapper/modules/MallGoodsCategoryMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsCategoryMapper.xml
@@ -67,9 +67,12 @@
SELECT m.id parentId,m.name name FROM mall_goods_category m where m.parent_id = 0
</select>
-
<select id="selectChildCategaryById" resultType="cc.mrbird.febs.mall.entity.MallGoodsCategory">
select * from mall_goods_category
where parent_id = #{id}
</select>
+
+ <select id="getAllCategorys" resultType="cc.mrbird.febs.mall.vo.AdminMallGoodsCategoryTreeVo">
+ SELECT m.id parentId,m.name name FROM mall_goods_category m ;
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
index 38b58f6..3f97646 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -23,7 +23,7 @@
<div class="layui-col-lg6">
<label class="layui-form-label febs-form-item-require">所属分类：</label>
<div class="layui-input-block">
- <select name="categoryId" class="categary-update-category" >
+ <select name="categoryId" class="categary-addPeoduct" >
<option value="">请选择</option>
</select>
</div>
@@ -106,7 +106,7 @@
<div class="layui-form-item">
<label class="layui-form-label febs-form-item-require">商品详情：</label>
<div class="layui-input-block">
- <textarea id="lay_edit" name = "goodsDetails" class="layui-textarea"></textarea>
+ <textarea id="lay_edit" lay-verify="goodsDetails" name = "goodsDetails" class="layui-textarea"></textarea>
</div>
</div>
<div class="layui-row layui-col-space10 layui-form-item">
@@ -156,10 +156,10 @@
//(下拉框)
- $.get(ctx + 'admin/goodsCategory/categorys/tree', function (data) {
+ $.get(ctx + 'admin/goodsCategory/categorys/allTree', function (data) {
for (var k in data)
{
- $(".categary-update-category").append("<option value='" + data[k].parentId + "'>" + data[k].name + "</option>");
+ $(".categary-addPeoduct").append("<option value='" + data[k].parentId + "'>" + data[k].name + "</option>");
}
layui.use('form', function () {
var form = layui.form;
--
Gitblit v1.9.1