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 f1843f03..d74ed7e1 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 @@ -286,23 +286,23 @@ public class GoodsController extends BaseController { goodsStandards.stream().forEach(goodsStandard -> { if (StringUtils.isEmpty(goodsStandard.getGoodsUnit())) { goodsStandard.setGoodsUnit(result.getGoodsUnit()); - BigDecimal finalPrice = BigDecimal.ZERO; - // 获取规格的扣点 - DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(goodsStandard.getDeptGoodsCategoryId()); - if(deptGoodsCategory.getOneRate() != null){ - finalPrice = finalPrice.add(BigDecimal.valueOf(Double.parseDouble(deptGoodsCategory.getOneRate())).multiply(goodsStandard.getGoodsPrice())); - } - if(deptGoodsCategory.getTwoRate() != null){ - finalPrice = finalPrice.add(BigDecimal.valueOf(Double.parseDouble(deptGoodsCategory.getTwoRate())).multiply(goodsStandard.getGoodsPrice())); - } - if(deptGoodsCategory.getThreeRate() != null){ - finalPrice = finalPrice.add(BigDecimal.valueOf(Double.parseDouble(deptGoodsCategory.getThreeRate())).multiply(goodsStandard.getGoodsPrice())); - } - if(goodsStandard.getExtMoney() != null){ - finalPrice = finalPrice.add(goodsStandard.getExtMoney()); - } - goodsStandard.setFinalPrice(finalPrice); } + BigDecimal finalPrice = BigDecimal.ZERO; + // 获取规格的扣点 + DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(goodsStandard.getDeptGoodsCategoryId()); + if(deptGoodsCategory.getOneRate() != null){ + finalPrice = finalPrice.add(BigDecimal.valueOf(Double.parseDouble(deptGoodsCategory.getOneRate())).multiply(goodsStandard.getGoodsPrice())); + } + if(deptGoodsCategory.getTwoRate() != null){ + finalPrice = finalPrice.add(BigDecimal.valueOf(Double.parseDouble(deptGoodsCategory.getTwoRate())).multiply(goodsStandard.getGoodsPrice())); + } + if(deptGoodsCategory.getThreeRate() != null){ + finalPrice = finalPrice.add(BigDecimal.valueOf(Double.parseDouble(deptGoodsCategory.getThreeRate())).multiply(goodsStandard.getGoodsPrice())); + } + if(goodsStandard.getExtMoney() != null){ + finalPrice = finalPrice.add(goodsStandard.getExtMoney()); + } + goodsStandard.setFinalPrice(finalPrice); }); result.setGoodsStandardList(goodsStandards);