From 5d3eacee0a69fb0008bfdf607e865e278431cc7c Mon Sep 17 00:00:00 2001 From: clunt Date: Fri, 6 May 2022 14:32:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=85=AC=E5=8F=B8=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=B1=BB=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goods/GoodsStandardController.java | 17 ------- .../ghy/goods/domain/DeptGoodsCategory.java | 34 ++++++++++++++ .../com/ghy/goods/domain/GoodsStandard.java | 47 ------------------- .../goods/mapper/DeptGoodsCategoryMapper.java | 11 +++++ .../service/DeptGoodsCategoryService.java | 11 +++++ .../impl/DeptGoodsCategoryServiceImpl.java | 17 +++++++ .../mapper/goods/DeptGoodsCategoryMapper.xml | 21 +++++++++ 7 files changed, 94 insertions(+), 64 deletions(-) delete mode 100644 ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsStandardController.java create mode 100644 ghy-goods/src/main/java/com/ghy/goods/domain/DeptGoodsCategory.java delete mode 100644 ghy-goods/src/main/java/com/ghy/goods/domain/GoodsStandard.java create mode 100644 ghy-goods/src/main/java/com/ghy/goods/mapper/DeptGoodsCategoryMapper.java create mode 100644 ghy-goods/src/main/java/com/ghy/goods/service/DeptGoodsCategoryService.java create mode 100644 ghy-goods/src/main/java/com/ghy/goods/service/impl/DeptGoodsCategoryServiceImpl.java create mode 100644 ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsStandardController.java b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsStandardController.java deleted file mode 100644 index 35563dfd..00000000 --- a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsStandardController.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.ghy.web.controller.goods; - -import com.ghy.common.core.controller.BaseController; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * @author clunt - * 商品规格 - */ -@Controller -@RequestMapping("/goods/standard") -public class GoodsStandardController extends BaseController { - - - -} 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 new file mode 100644 index 00000000..9ef33db4 --- /dev/null +++ b/ghy-goods/src/main/java/com/ghy/goods/domain/DeptGoodsCategory.java @@ -0,0 +1,34 @@ +package com.ghy.goods.domain; + +import com.ghy.common.annotation.Excel; +import com.ghy.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author clunt + * 分公司使用类目 + */ +@Data +public class DeptGoodsCategory extends BaseEntity { + + @Excel(name = "序列", cellType = Excel.ColumnType.NUMERIC) + private Long deptGoodsCategoryId; + + @Excel(name = "分公司id", cellType = Excel.ColumnType.NUMERIC) + private Long deptId; + + @Excel(name = "类别id", cellType = Excel.ColumnType.NUMERIC) + private Long goodsCategoryId; + + @Excel(name = "排序", cellType = Excel.ColumnType.STRING) + private String categorySort; + + @Excel(name = "一级分销扣点比例", cellType = Excel.ColumnType.STRING) + private String oneRate; + + @Excel(name = "二级分销扣点比例", cellType = Excel.ColumnType.STRING) + private String twoRate; + + @Excel(name = "三级分销扣点比例", cellType = Excel.ColumnType.STRING) + private String threeRate; +} diff --git a/ghy-goods/src/main/java/com/ghy/goods/domain/GoodsStandard.java b/ghy-goods/src/main/java/com/ghy/goods/domain/GoodsStandard.java deleted file mode 100644 index c6a79097..00000000 --- a/ghy-goods/src/main/java/com/ghy/goods/domain/GoodsStandard.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.ghy.goods.domain; - -import com.ghy.common.annotation.Excel; -import com.ghy.common.core.domain.BaseEntity; -import lombok.Data; - -import java.math.BigDecimal; - -@Data -public class GoodsStandard extends BaseEntity { - - @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC) - private Long goodsStandardId; - - @Excel(name = "商品id", cellType = Excel.ColumnType.NUMERIC) - private Long goodsId; - - @Excel(name = "规格名称", cellType = Excel.ColumnType.STRING) - private String goodsStandardName; - - @Excel(name = "一级分销扣点比例", cellType = Excel.ColumnType.STRING) - private String oneRate; - - @Excel(name = "二级分销扣点比例", cellType = Excel.ColumnType.STRING) - private String twoRate; - - @Excel(name = "三级分销扣点比例", cellType = Excel.ColumnType.STRING) - private String threeRate; - - @Excel(name = "规格状态", cellType = Excel.ColumnType.NUMERIC) - private Integer status; - - @Excel(name = "价格") - private BigDecimal goodsPrice; - - @Excel(name = "优惠价") - private BigDecimal discountsPrice; - - @Excel(name = "团购价") - private BigDecimal groupPrice; - - /** 岗位排序 */ - @Excel(name = "商品排序", cellType = Excel.ColumnType.NUMERIC) - private String goodsSort; - - -} 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 new file mode 100644 index 00000000..2dc0d633 --- /dev/null +++ b/ghy-goods/src/main/java/com/ghy/goods/mapper/DeptGoodsCategoryMapper.java @@ -0,0 +1,11 @@ +package com.ghy.goods.mapper; + +/** + * 分公司使用类目mapper + * @author clunt + */ +public interface DeptGoodsCategoryMapper { + + + +} diff --git a/ghy-goods/src/main/java/com/ghy/goods/service/DeptGoodsCategoryService.java b/ghy-goods/src/main/java/com/ghy/goods/service/DeptGoodsCategoryService.java new file mode 100644 index 00000000..bc8f271f --- /dev/null +++ b/ghy-goods/src/main/java/com/ghy/goods/service/DeptGoodsCategoryService.java @@ -0,0 +1,11 @@ +package com.ghy.goods.service; + +/** + * 分公司使用类目 + * @author clunt + */ +public interface DeptGoodsCategoryService { + + // 选择使用指定的公司类别 + +} diff --git a/ghy-goods/src/main/java/com/ghy/goods/service/impl/DeptGoodsCategoryServiceImpl.java b/ghy-goods/src/main/java/com/ghy/goods/service/impl/DeptGoodsCategoryServiceImpl.java new file mode 100644 index 00000000..73fd4d56 --- /dev/null +++ b/ghy-goods/src/main/java/com/ghy/goods/service/impl/DeptGoodsCategoryServiceImpl.java @@ -0,0 +1,17 @@ +package com.ghy.goods.service.impl; + +import com.ghy.goods.service.DeptGoodsCategoryService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @author clunt + * 分公司使用类目 + */ +@Slf4j +@Service +public class DeptGoodsCategoryServiceImpl implements DeptGoodsCategoryService { + + + +} diff --git a/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml b/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml new file mode 100644 index 00000000..81f80654 --- /dev/null +++ b/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + SELECT create_by, create_time, remark + FROM dept_goods_category + + + + + \ No newline at end of file