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/calculation/CouponDiscountCalculation.java

@@ -341,11 +341,11 @@ public class CouponDiscountCalculation {
                 continue;
             }
             // 过滤0得代金券
-            if (Objects.equals(couponStateVo.getType(), CouponTypeEnum.TYPE_1.getCode())
-                    && (couponStateVo.getOriginalPrice() == null
-                    || couponStateVo.getOriginalPrice() == 0)) {
-                continue;
-            }
+//            if (Objects.equals(couponStateVo.getType(), CouponTypeEnum.TYPE_1.getCode())
+//                    && (couponStateVo.getOriginalPrice() == null
+//                    || couponStateVo.getOriginalPrice() == 0)) {
+//                continue;
+//            }
 
             // 过滤折扣券为0折得
             if (Objects.equals(couponStateVo.getType(), CouponTypeEnum.TYPE_3.getCode())