Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of…

Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

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

@@ -944,7 +944,7 @@ public class ShoppingCartMCoffeeServiceImpl {
                 //购物车已存在商品券
                 if (StringUtils.isNotBlank(cartGoods.getCouponCode())) {
                     ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon calculationDiscountCoupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
-                    calculationDiscountCoupon.setCode(couponCode);
+                    calculationDiscountCoupon.setCode(cartGoods.getCouponCode());
                     coupons.add(calculationDiscountCoupon);
                 }
             }