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

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

@@ -988,7 +988,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         /**
          * 满额减配送费
          */
-        if (calculationDiscountResult != null && CollectionUtils.isNotEmpty(calculationDiscountResult.getDiscounts())) {
+       /* if (calculationDiscountResult != null && CollectionUtils.isNotEmpty(calculationDiscountResult.getDiscounts())) {
 
             Optional<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> discount
                     = calculationDiscountResult.getDiscounts().stream()
@@ -1001,7 +1001,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 shoppingCartGoodsResponseVo.setThresholdAmount(discount.get().getThresholdAmount());
                 shoppingCartGoodsResponseVo.setIsDiscountDelivery(true);
             }
-        }
+        }*/
 
     }