Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa

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

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