From eb19b8f21879564eee6bf7b33dea5ccba5d69714 Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 31 Aug 2021 14:55:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E6=8A=98=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lili/modules/goods/entity/dos/Specification.java | 3 ++- .../modules/order/cart/render/impl/CouponRender.java | 10 +++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) 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)); } }