Merge branch 'feature-2020/2/10-1.9.15-免配送费二期-海波' into qa

# Conflicts:
#	order-management/pom.xml

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

@@ -991,15 +991,15 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
          */
         if (calculationDiscountResult != null && CollectionUtils.isNotEmpty(calculationDiscountResult.getDiscounts())) {
 
-            ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount discount
+            Optional<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> discount
                     = calculationDiscountResult.getDiscounts().stream()
                     .filter(discount1 -> { return discount1.getType().equals(ActivityTypeEnum.TYPE_14.getCode());})
-                    .findFirst().get();
+                    .findFirst();
 
-            if (discount != null) {
+            if (discount.isPresent()) {
                 shoppingCartGoodsResponseVo.setDeliveryAmount(calculationDiscountResult.getDeliveryAmount());
                 shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(calculationDiscountResult.getDistributionFee());
-                shoppingCartGoodsResponseVo.setThresholdAmount(discount.getThresholdAmount());
+                shoppingCartGoodsResponseVo.setThresholdAmount(discount.get().getThresholdAmount());
                 shoppingCartGoodsResponseVo.setIsDiscountDelivery(true);
             }
         }