Skip to content

O
order-group
Commit f817e297 by 周晓航
Options

bug 修复 使用多券 核销 

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent 150ae092
Showing with 2 additions and 1 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/CouponSharingService.java
...@@ -85,7 +85,8 @@ public class CouponSharingService { ...@@ -85,7 +85,8 @@ public class CouponSharingService {
// 当couponCode不为空时，需计算优惠价格 3代金 31折扣 32商品 33换购券 // 当couponCode不为空时，需计算优惠价格 3代金 31折扣 32商品 33换购券
long couponDiscount = 0; long couponDiscount = 0;
if (couponPromotionVO != null && StringUtils.isNotEmpty(couponPromotionVO.getCouponCode())
if (couponPromotionVO != null && (StringUtils.isNotEmpty(couponPromotionVO.getCouponCode()) || CollectionUtils.isNotEmpty(couponPromotionVO.getCouponCodes()))
&& calculationDiscountResult != null && CollectionUtils.isNotEmpty(calculationDiscountResult.getDiscounts())) { && calculationDiscountResult != null && CollectionUtils.isNotEmpty(calculationDiscountResult.getDiscounts())) {
//List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.CouponResults> couponResultsList = calculationDiscountResult.getCouponDiscounts(); //List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.CouponResults> couponResultsList = calculationDiscountResult.getCouponDiscounts();
// 需要加上 配送券的 配送券 type = 34 // 需要加上 配送券的 配送券 type = 34
......
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