Commit 5d77c46b by 徐康

修复问题

parent bd5ee096
...@@ -194,13 +194,13 @@ public class CouponDiscountCalculation { ...@@ -194,13 +194,13 @@ public class CouponDiscountCalculation {
cartGoods.setAmount(cartGoods.getOriginalAmount()); cartGoods.setAmount(cartGoods.getOriginalAmount());
} }
if (CollectionUtils.isNotEmpty(discountsNew)) { if (CollectionUtils.isNotEmpty(discountsNew)) {
useCoupon = true;
ApiLog.debug("couponDiscountCalculation:{}",discountsNew); ApiLog.debug("couponDiscountCalculation:{}",discountsNew);
//这里过滤掉了 月享卡2.0,因为月享卡2.0商品不用展示划线价,故显示原价 //这里过滤掉了 月享卡2.0,因为月享卡2.0商品不用展示划线价,故显示原价
Optional<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> targetDiscount = discountsNew.stream() Optional<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> targetDiscount = discountsNew.stream()
.filter(t -> ActivityTypeEnum.TYPE_32.getCode().equals(t.getType()) .filter(t -> ActivityTypeEnum.TYPE_32.getCode().equals(t.getType())
|| ActivityTypeEnum.TYPE_37.getCode().equals(t.getType()) || ActivityTypeEnum.TYPE_37.getCode().equals(t.getType())
|| ActivityTypeEnum.TYPE_39.getCode().equals(t.getType())).findFirst(); || ActivityTypeEnum.TYPE_39.getCode().equals(t.getType())).findFirst();
useCoupon = targetDiscount.isPresent();
if (null != targetDiscount && targetDiscount.isPresent()) { if (null != targetDiscount && targetDiscount.isPresent()) {
ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = targetDiscount.get(); ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = targetDiscount.get();
cartGoods.setCouponName(goodsDiscount.getActivityName()); cartGoods.setCouponName(goodsDiscount.getActivityName());
......
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