diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Specification.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Specification.java index 446fc63a..e82defda 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Specification.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Specification.java @@ -32,7 +32,8 @@ public class Specification extends BaseIdEntity { /** * 所属卖家 0属于平台 *
- * 店铺自定义规格暂时废弃 2021-06-23 后续推出新配置方式 + * 店铺自定义规格暂时废弃 2021-06-23 + * 后续推出新配置方式 */ @ApiModelProperty(hidden = true) private String storeId; diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CouponRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CouponRender.java index 5a5de88b..19a55383 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CouponRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CouponRender.java @@ -245,13 +245,17 @@ public class CouponRender implements CartRenderStep { if (item.getGoodsSku().getId().equals(skuId)) { PriceDetailDTO priceDetailDTO = item.getPriceDetailDTO(); + + // 打折金额=商品金额*折扣/10 + Double discountCouponPrice = CurrencyUtil.mul(priceDetailDTO.getGoodsPrice(), + CurrencyUtil.div(coupon.getDiscount(), 10, 3)); + //平台券则写入店铺承担优惠券比例 if (coupon.getIsPlatform()) { - priceDetailDTO.setSiteCouponPrice(CurrencyUtil.mul(priceDetailDTO.getGoodsPrice(), coupon.getDiscount())); + priceDetailDTO.setSiteCouponPrice(discountCouponPrice); priceDetailDTO.setSiteCouponPoint(coupon.getStoreCommission()); } - priceDetailDTO.setCouponPrice(CurrencyUtil.add(priceDetailDTO.getCouponPrice(), - CurrencyUtil.mul(priceDetailDTO.getGoodsPrice(), coupon.getDiscount()))); + priceDetailDTO.setCouponPrice(CurrencyUtil.add(priceDetailDTO.getCouponPrice(), discountCouponPrice)); } }