Commit 7aaec3c9 by weijiguang

.

parent fd318436
...@@ -268,6 +268,8 @@ public class CouponUserServiceImpl implements ICouponUserService { ...@@ -268,6 +268,8 @@ public class CouponUserServiceImpl implements ICouponUserService {
if (couponVo.getType().equals(CouponCategoryType.DISCOUNT.getType())) { // 折扣 if (couponVo.getType().equals(CouponCategoryType.DISCOUNT.getType())) { // 折扣
discountAmount = orderDetail.getOrigDiscount(); // 折扣使用折扣价(非特惠价格) discountAmount = orderDetail.getOrigDiscount(); // 折扣使用折扣价(非特惠价格)
discountAmount = this.getDiscountAmount(discountAmount, couponVo.getPriceDiscount()).min(BigDecimal.valueOf(50)); discountAmount = this.getDiscountAmount(discountAmount, couponVo.getPriceDiscount()).min(BigDecimal.valueOf(50));
} else if (couponVo.getType().equals(CouponCategoryType.FREE.getType())) {
discountAmount = orderDetail.getOrigDiscount(); // 免单使用折扣价(非特惠价格)
} }
couponVo.setCouponAmount(discountAmount); couponVo.setCouponAmount(discountAmount);
couponAmountMap.put(orderDetail.getSkuId(), couponVo.getCouponAmount()); couponAmountMap.put(orderDetail.getSkuId(), couponVo.getCouponAmount());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment