Merge remote-tracking branch 'origin/qa' into qa

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

@@ -99,7 +99,7 @@ public class DefaultPromotionService implements IPromotionService {
         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());