diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java index e424a68f..7a13ef90 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java @@ -119,6 +119,14 @@ public class GoodsController extends BaseController { GoodsCategory category = goodsCategoryService.selectById(deptGoodsCategory.getGoodsCategoryId()); goodsStandard.setGoodsCategoryName(category.getGoodsCategoryName()); goodsStandard.setChecked(true); + goodsStandard.setOneRate(deptGoodsCategory.getOneRate()); + goodsStandard.setTwoRate(deptGoodsCategory.getTwoRate()); + goodsStandard.setThreeRate(deptGoodsCategory.getThreeRate()); + goodsStandard.setDeptRate(deptGoodsCategory.getDeptRate()); + goodsStandard.setDeptMoney(deptGoodsCategory.getDeptMoney()); + goodsStandard.setRetainMoney(deptGoodsCategory.getRetainMoney()); + goodsStandard.setRetainRate(deptGoodsCategory.getRetainRate()); + }); goodsEditReq.setGoodsStandardList(goodsStandards); 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 index 39524824..9aa5725d 100644 --- a/ghy-goods/src/main/java/com/ghy/goods/domain/GoodsStandard.java +++ b/ghy-goods/src/main/java/com/ghy/goods/domain/GoodsStandard.java @@ -47,4 +47,25 @@ public class GoodsStandard extends BaseEntity { private String goodsCategoryName; + @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.STRING) + private String deptRate; + + @Excel(name = "平台固定扣金额", cellType = Excel.ColumnType.STRING) + private BigDecimal deptMoney; + + @Excel(name = "截留扣点", cellType = Excel.ColumnType.STRING) + private String retainRate; + + @Excel(name = "截留金额", cellType = Excel.ColumnType.STRING) + private BigDecimal retainMoney; + }