Merge branch 'feature/20210128_combo券优惠价为0键位错误bugfix_yu.sun'

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

@@ -128,10 +128,6 @@ public class CouponDiscountCalculation {
                 if (CollectionUtils.isNotEmpty(discountsNew)) {
                     ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = discountsNew.stream().filter(t -> ActivityTypeEnum.TYPE_32.getCode().equals(t.getType())).findFirst().get();
                     cartGoods.setCouponName(goodsDiscount.getActivityName());
-                }else{
-                    //若没有商品优惠，清空当前商品的券缓存信息
-                    cartGoods.setCouponCode("");
-                    cartGoods.setCouponName("");
                 }
             }
         }