Merge branch 'coco20201223-bug-zhw' of…

Merge branch 'coco20201223-bug-zhw' of gitlab.freemud.com:order-group-application/order-group into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
#	order-application-service/src/main/java/cn/freemud/service/Orderservice.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -406,4 +406,5 @@ public class OrderController {
         return orderservice.timeOutOrderRefund(timeOutOrderVo);
     }
 
+
 }

order-application-service/src/main/java/cn/freemud/service/Orderservice.java

@@ -146,4 +146,5 @@ public interface Orderservice {
     BaseResponse queryOrderRider(OrderRiderRequestVo requestVo);
 
     BaseResponse timeOutOrderRefund(TimeOutOrderVo timeOutOrderVo);
+
 }

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());