Merge branch 'feature_夜间配送ID1040499_zxh20211208' into qa

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

@@ -1701,7 +1701,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             result.setValidCouponMap(validCouponMap);
             result.setSpqIdToCartUuid(spqIdToCartUuid);
             // fisherman 配送费原价 + 夜间配送费逻辑  为了划线价展示
-            result.setDeliveryAmount(distributionFee + nightDistributionFee);
+            result.setDeliveryAmount((Objects.isNull(distributionFee) ? 0L : distributionFee) + nightDistributionFee);
             // fisherman 优惠后配送费,需要加上促销反馈夜间配送费的优惠价格
             Long calculationNightDistributionFee = Objects.isNull(result.getNightDistributionFee()) ? 0L : result.getNightDistributionFee();
             result.setDistributionFee(result.getDistributionFee() + calculationNightDistributionFee);