Merge branch 'feature/20201112_优惠为0的券也要核销_xukang'

order-application-service/src/main/java/cn/freemud/service/mccafe/impl/CouponClientServiceImpl.java

@@ -146,7 +146,7 @@ public class CouponClientServiceImpl implements CouponClientService {
                 account -> (OldOrderAccountType.PRODUCT_COUPON.equals(OldOrderAccountType.getByCode(account.getType()))
                         || OldOrderAccountType.COUPON.equals(OldOrderAccountType.getByCode(account.getType()))
                         || OldOrderAccountType.DISCOUNT_COUPON.equals(OldOrderAccountType.getByCode(account.getType()))
-                        ) && account.getPrice() != 0l).collect(Collectors.toList());
+                        )).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(accountList)) {
             return null;
         }

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

@@ -205,7 +205,7 @@ public class CalculationServiceImpl {
         for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount discount : discounts) {
             int discountAmount = (discount.getDiscount() == null) ? 0 : discount.getDiscount();
             Integer discountType = discount.getType();
-            if (discountType != null && discountAmount > 0) {
+            if (discountType != null && discountAmount >= 0) {
                 ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
                 activityDiscountsDto.setActivityCode(discount.getActivityCode());
                 activityDiscountsDto.setActivityName(discount.getActivityName());