增加非空判断

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

@@ -1367,7 +1367,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             throw new ServiceException(ResponseResult.USER_SVC_CARD_ERROR);
         }
         //获取实际配送费
-        if (StringUtils.isNotBlank(receiveId)) {
+        if (StringUtils.isNotBlank(receiveId) && shoppingCartGoodsResponseVo.getDiscountDeliveryAmount() != null) {
 //            Integer deliveryAmount = getDeliveryAmount(receiveId, partnerId, storeId);
             Integer deliveryAmount = shoppingCartGoodsResponseVo.getDiscountDeliveryAmount().intValue();
             orderAmount += deliveryAmount;