ufo / ufo-platform · Commits

Go to a project

Authored by mali
Commit 2e8a12b1f6dcd55e8e8138fac78ebd5eafa39d49 1 parent 3d4377b1

求购订单 没有卖家的时候代码兼容

Inline Side-by-side
Showing 1 changed file with 1 additions and 1 deletions
@@ -2867,7 +2867,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon @@ -2867,7 +2867,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
2867 resp.setTariffAmount(buyerOrderGoodsService.getTariffAmount(goods)); 2867 resp.setTariffAmount(buyerOrderGoodsService.getTariffAmount(goods));
2868 resp.setCutPromotionAmount(buyerOrderGoodsService.getCutPromotionAmountStr(goods)); 2868 resp.setCutPromotionAmount(buyerOrderGoodsService.getCutPromotionAmountStr(goods));
2869 SellerOrder sellerOrder = sellerOrderMapper.selectBySkup(skup); 2869 SellerOrder sellerOrder = sellerOrderMapper.selectBySkup(skup);
2870 - resp.setSellerCouponCutAmount(sellerOrder.getCouponCutAmount() == null ? "0.00" : String.format("%.2f", sellerOrder.getCouponCutAmount().doubleValue())); 2870 + resp.setSellerCouponCutAmount(null == sellerOrder || sellerOrder.getCouponCutAmount() == null ? "0.00" : String.format("%.2f", sellerOrder.getCouponCutAmount().doubleValue()));
2871 SellerOrderMeta sellerMeta = sellerOrderMetaMapper.selectBySkupAndKey(skup, SELLER_ORDER_META_KEY_BACK_DELIVERY_ADDRESS); 2871 SellerOrderMeta sellerMeta = sellerOrderMetaMapper.selectBySkupAndKey(skup, SELLER_ORDER_META_KEY_BACK_DELIVERY_ADDRESS);
2872 if(sellerMeta!=null){ 2872 if(sellerMeta!=null){
2873 JSONObject sellerMetaValue = JSONObject.parseObject(sellerMeta.getMetaValue()); 2873 JSONObject sellerMetaValue = JSONObject.parseObject(sellerMeta.getMetaValue());