Commit f23bb513 by 周晓航

解决NPE

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent 86790ff5
...@@ -1689,7 +1689,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -1689,7 +1689,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
result.setValidCouponMap(validCouponMap); result.setValidCouponMap(validCouponMap);
result.setSpqIdToCartUuid(spqIdToCartUuid); result.setSpqIdToCartUuid(spqIdToCartUuid);
// fisherman 配送费原价 + 夜间配送费逻辑 为了划线价展示 // fisherman 配送费原价 + 夜间配送费逻辑 为了划线价展示
result.setDeliveryAmount(distributionFee + nightDistributionFee); result.setDeliveryAmount((Objects.isNull(distributionFee) ? 0L : distributionFee) + nightDistributionFee);
// fisherman 优惠后配送费,需要加上促销反馈夜间配送费的优惠价格 // fisherman 优惠后配送费,需要加上促销反馈夜间配送费的优惠价格
Long calculationNightDistributionFee = Objects.isNull(result.getNightDistributionFee()) ? 0L : result.getNightDistributionFee(); Long calculationNightDistributionFee = Objects.isNull(result.getNightDistributionFee()) ? 0L : result.getNightDistributionFee();
result.setDistributionFee(result.getDistributionFee() + calculationNightDistributionFee); result.setDistributionFee(result.getDistributionFee() + calculationNightDistributionFee);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment