新增卡券类型字段fix

301cf147 · huiyang.chen · d2a435ce · 301cf147
Commit 301cf147 authored Oct 21, 2020 by huiyang.chen
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletions

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java
+3 -1

No files found.
--- a/shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java
+++ b/shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java
@@ -172,7 +172,9 @@ public class CouponDiscountCalculation {
                            activityDiscountsDto.setActivityType(couponDiscount.getType());
                            activityDiscountsDto.setDiscountAmount(0 - couponDiscount.getDiscount());
                            activityDiscountsDto.setExtendType(couponDiscount.getExtendType());
-                            activityDiscountsDto.setTenderId(goodsMap.get(cartGoods.getCartGoodsUid()).getArtNo());
+                            if (goodsMap.get(cartGoods.getCartGoodsUid()) == null) {
+                                activityDiscountsDto.setTenderId(goodsMap.get(cartGoods.getCartGoodsUid()).getArtNo());
+                            }
                            productActivityDiscountsDtos.add(activityDiscountsDto);

                            cartGoods.setTotalDiscountAmount(-activityDiscountsDto.getDiscountAmount());