diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java index a4b551ba..4019a882 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java @@ -203,6 +203,7 @@ public class WxOrderService { orderVo.put("orderStatusText", OrderUtil.orderStatusText(order)); orderVo.put("handleOption", OrderUtil.build(order)); orderVo.put("expCode", order.getShipChannel()); + orderVo.put("expName", expressService.getVendorName(order.getShipChannel())); orderVo.put("expNo", order.getShipSn()); List orderGoodsList = orderGoodsService.queryByOid(order.getId()); @@ -215,7 +216,15 @@ public class WxOrderService { //"YTO", "800669400640887922" if (order.getOrderStatus().equals(OrderUtil.STATUS_SHIP)) { ExpressInfo ei = expressService.getExpressInfo(order.getShipChannel(), order.getShipSn()); - result.put("expressInfo", ei); + if(ei == null){ + result.put("expressInfo", new ArrayList<>()); + } + else { + result.put("expressInfo", ei); + } + } + else{ + result.put("expressInfo", new ArrayList<>()); } return ResponseUtil.ok(result); diff --git a/litemall-wx/pages/ucenter/orderDetail/orderDetail.wxml b/litemall-wx/pages/ucenter/orderDetail/orderDetail.wxml index 00e3ebdb..e6f2371e 100644 --- a/litemall-wx/pages/ucenter/orderDetail/orderDetail.wxml +++ b/litemall-wx/pages/ucenter/orderDetail/orderDetail.wxml @@ -73,12 +73,11 @@ - - + - 快递公司:{{expressInfo.shipperName}} - 物流单号:{{expressInfo.logisticCode}} + 快递公司:{{orderInfo.expName}} + 物流单号:{{orderInfo.expNo}} diff --git a/renard-wx/pages/ucenter/orderDetail/orderDetail.wxml b/renard-wx/pages/ucenter/orderDetail/orderDetail.wxml index fe430330..8abe65dc 100644 --- a/renard-wx/pages/ucenter/orderDetail/orderDetail.wxml +++ b/renard-wx/pages/ucenter/orderDetail/orderDetail.wxml @@ -73,12 +73,11 @@ - - + - 快递公司:{{expressInfo.shipperName}} - 物流单号:{{expressInfo.logisticCode}} + 快递公司:{{orderInfo.expName}} + 物流单号:{{orderInfo.expNo}}