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

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

@@ -225,9 +225,9 @@ public class ShoppingCartMCoffeeServiceImpl {
                     throw new ServiceException(ResponseResult.SHOPPING_CART_COUPON_USED);
                 }
                 //同样商品券不能使用
-                if (StringUtils.isNotEmpty(couponCode)&& StringUtils.isNotEmpty(cartGoods.getCouponCode()) && goodsId.equals(cartGoods.getGoodsId())) {
+               /* if (StringUtils.isNotEmpty(couponCode)&& StringUtils.isNotEmpty(cartGoods.getCouponCode()) && goodsId.equals(cartGoods.getGoodsId())) {
                     throw new ServiceException(ResponseResult.SHOPPING_CART_GOODS_COUPON_CAN_NOT_USE);
-                }
+                }*/
             }
         }
         //新增商品券