From b6449621674069409bfd2341e417f27575f50d8c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 16 Sep 2021 19:34:58 +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 | 11 +++++++++--
src/main/resources/mapper/modules/MallGoodsCategoryMapper.xml | 8 ++++----
src/main/java/cc/mrbird/febs/mall/entity/MallGoodsCategory.java | 2 ++
src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsCategoryMapper.java | 2 +-
src/main/resources/templates/febs/views/modules/product/categoryAdd.html | 7 +++++++
5 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallGoodsCategory.java b/src/main/java/cc/mrbird/febs/mall/entity/MallGoodsCategory.java
index be57563..3b81273 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallGoodsCategory.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallGoodsCategory.java
@@ -18,4 +18,6 @@
@TableField(exist = false)
private String parentName;
+ private Integer isComand;
+
}
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 85d069f..f735576 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsCategoryMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsCategoryMapper.java
@@ -11,7 +11,7 @@
public interface MallGoodsCategoryMapper extends BaseMapper<MallGoodsCategory> {
- IPage<MallGoodsCategory> selectCategoryList(Page<MallGoodsCategory> page, @Param("record")MallGoodsCategory mallGoodsCategory);
+ IPage<MallGoodsCategory> selectCategoryListInPage(Page<MallGoodsCategory> page, @Param("record")MallGoodsCategory mallGoodsCategory);
List<MallGoodsCategory> selectCategoryByName(@Param("name")String name);
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 ab7bf88..71a159f 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
@@ -27,7 +27,7 @@
@Override
public IPage<MallGoodsCategory> getCategoryList(MallGoodsCategory mallGoodsCategory, QueryRequest request) {
Page<MallGoodsCategory> page = new Page<>(request.getPageNum(), request.getPageSize());
- IPage<MallGoodsCategory> mallGoodsCategorys = this.baseMapper.selectCategoryList(page, mallGoodsCategory);
+ IPage<MallGoodsCategory> mallGoodsCategorys = this.baseMapper.selectCategoryListInPage(page, mallGoodsCategory);
return mallGoodsCategorys;
}
@@ -44,11 +44,18 @@
MallGoodsCategory goodsCategory = new MallGoodsCategory();
goodsCategory.setName(name);
+ goodsCategory.setIsComand(mallGoodsCategory.getIsComand());
if(ObjectUtil.isNotEmpty(mallGoodsCategory.getParentId())){
Long parentId = mallGoodsCategory.getParentId();
MallGoodsCategory mallGoodsCategoryParent = mallGoodsCategoryMapper.selectById(parentId);
goodsCategory.setParentId(mallGoodsCategory.getParentId());
-// goodsCategory.setParentIds(mallGoodsCategoryParent.getParentIds()+mallGoodsCategory.getParentId()+",");
+ if(StrUtil.isNotEmpty(mallGoodsCategoryParent.getParentIds())){
+ goodsCategory.setParentIds(mallGoodsCategoryParent.getParentIds()+","+mallGoodsCategory.getParentId()+",");
+ }else{
+ goodsCategory.setParentIds(mallGoodsCategory.getParentId()+",");
+ }
+ }else{
+ goodsCategory.setParentId(0L);
}
mallGoodsCategoryMapper.insert(goodsCategory);
return new FebsResponse().success();
diff --git a/src/main/resources/mapper/modules/MallGoodsCategoryMapper.xml b/src/main/resources/mapper/modules/MallGoodsCategoryMapper.xml
index 6d2332d..a4e66bd 100644
--- a/src/main/resources/mapper/modules/MallGoodsCategoryMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsCategoryMapper.xml
@@ -2,8 +2,8 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cc.mrbird.febs.mall.mapper.MallGoodsCategoryMapper">
- <select id="selectCategoryList" resultType="cc.mrbird.febs.mall.entity.MallGoodsCategory">
- SELECT m.name,b.name
+ <select id="selectCategoryListInPage" resultType="cc.mrbird.febs.mall.entity.MallGoodsCategory">
+ SELECT m.name,b.name parentName
FROM mall_goods_category m
left join mall_goods_category b on m.parent_id = b.id
<where>
@@ -13,7 +13,7 @@
</if>
</if>
</where>
- order by m.CREATED_TIME desc
+ order by m.parent_id asc
</select>
<select id="selectCategoryByName" resultType="cc.mrbird.febs.mall.entity.MallGoodsCategory">
@@ -21,7 +21,7 @@
</select>
<select id="getCategorys" resultType="cc.mrbird.febs.mall.entity.MallGoodsCategory">
- SELECT * FROM mall_goods_category m where m.parent_id is null
+ SELECT * FROM mall_goods_category m where m.parent_id = 0
</select>
<resultMap id="mallGoodsCategoryVoMap" type="cc.mrbird.febs.mall.vo.MallGoodsCategoryVo">
diff --git a/src/main/resources/templates/febs/views/modules/product/categoryAdd.html b/src/main/resources/templates/febs/views/modules/product/categoryAdd.html
index 45f16d5..d630b20 100644
--- a/src/main/resources/templates/febs/views/modules/product/categoryAdd.html
+++ b/src/main/resources/templates/febs/views/modules/product/categoryAdd.html
@@ -36,6 +36,13 @@
</select>
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">是否推荐：</label>
+ <div class="layui-input-block">
+ <input type="radio" name="isComand" value="1" title="是" >
+ <input type="radio" name="isComand" value="2" title="否" checked="">
+ </div>
+ </div>
<div class="layui-form-item febs-hide">
<button class="layui-btn" lay-submit="" lay-filter="categary-add-form-submit" id="submit"></button>
</div>
--
Gitblit v1.9.1