From 6a13351bc3d46d634d33a067000236f3b244250a Mon Sep 17 00:00:00 2001 From: lifenlong Date: Tue, 20 Jul 2021 19:27:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=BB=A1=E6=8A=98=E4=BC=98=E6=83=A0=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8+=E6=BB=A1=E6=8A=98=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E8=AE=A1=E7=AE=97=E4=B8=8D=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../promotion/serviceimpl/MemberCouponServiceImpl.java | 2 +- .../promotion/serviceimpl/PromotionPriceServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java index 1dbb454a..8675c1bd 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java @@ -58,7 +58,7 @@ public class MemberCouponServiceImpl extends ServiceImpl= coupon.getPublishNum()) { throw new ServiceException(ResultCode.COUPON_NUM_INSUFFICIENT_ERROR); } - if (haveCoupons >= coupon.getCouponLimitNum()) { + if (!coupon.getCouponLimitNum().equals(0) && haveCoupons >= coupon.getCouponLimitNum()) { throw new ServiceException("此优惠券最多领取" + coupon.getCouponLimitNum() + "张"); } } diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionPriceServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionPriceServiceImpl.java index d3d06fa8..9a894168 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionPriceServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionPriceServiceImpl.java @@ -484,8 +484,8 @@ public class PromotionPriceServiceImpl implements PromotionPriceService { goodsSkuPromotionPrice.setTotalDiscountPrice(distributeDiscountTotalPrice); //单品成交价 double finalPrice = CurrencyUtil.sub(goodsSkuPromotionPrice.getTotalOriginalPrice(), distributeDiscountTotalPrice); - goodsSkuPromotionPrice.setFinalePrice(finalPrice); - goodsSkuPromotionPrice.setTotalFinalePrice(CurrencyUtil.mul(finalPrice, goodsSkuPromotionPrice.getNumber())); + goodsSkuPromotionPrice.setFinalePrice(CurrencyUtil.div(finalPrice, goodsSkuPromotionPrice.getNumber())); + goodsSkuPromotionPrice.setTotalFinalePrice(finalPrice); fullDiscount.setPromotionName(PromotionTypeEnum.FULL_DISCOUNT.name()); goodsSkuPromotionPrice.getJoinPromotion().add(fullDiscount);