Merge branch '2020/09/24-运费券-huiyang' into develop

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

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

@@ -1047,10 +1047,14 @@ public class ShoppingCartMCoffeeServiceImpl {
 
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = new ArrayList<>();
         if (StringUtils.isNotEmpty(couponCode)) {
-            ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon coupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
-            coupon.setCode(couponCode);
-            coupon.setActivityCode(activityCode);
-            coupons.add(coupon);
+            List<String> codeList = Arrays.asList(couponCode.split(","));
+            for (String code: codeList) {
+
+                ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon coupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
+                coupon.setCode(code);
+                coupon.setActivityCode(activityCode);
+                coupons.add(coupon);
+            }
         }
 
         //购物车商品券