From e56e155ed5defbd180d56c183811ca788785cd1e Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Sun, 1 Dec 2019 13:56:13 +0800
Subject: [PATCH] =?UTF-8?q?fix[litemall-wx,=20litemall-wx-api]:=20?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=89=A9=E6=B5=81=E5=85=AC=E5=8F=B8=E5=92=8C?=
 =?UTF-8?q?=E7=89=A9=E6=B5=81=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../litemall/wx/service/WxOrderService.java           | 11 ++++++++++-
 .../pages/ucenter/orderDetail/orderDetail.wxml        |  7 +++----
 renard-wx/pages/ucenter/orderDetail/orderDetail.wxml  |  7 +++----
 3 files changed, 16 insertions(+), 9 deletions(-)

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<LitemallOrderGoods> 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 @@
     </view>
   </view>
 
-  <!-- 物流信息,仅收货状态下可见 -->
-  <view class="order-express" bindtap="expandDetail" wx:if="{{ handleOption.confirm }}">
+  <view class="order-express" bindtap="expandDetail" wx:if="{{ orderInfo.expNo }}">
     <view class="order-express">
       <view class="title">
-        <view class="t">快递公司：{{expressInfo.shipperName}}</view>
-        <view class="b">物流单号：{{expressInfo.logisticCode}}</view>
+        <view class="t">快递公司：{{orderInfo.expName}}</view>
+        <view class="b">物流单号：{{orderInfo.expNo}}</view>
       </view>
       <image class="ti" src="/static/images/address_right.png" background-size="cover"></image>
     </view>
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 @@
     </view>
   </view>
 
-  <!-- 物流信息,仅收货状态下可见 -->
-  <view class="order-express" bindtap="expandDetail" wx:if="{{ handleOption.confirm }}">
+  <view class="order-express" bindtap="expandDetail" wx:if="{{ orderInfo.expNo}}">
     <view class="expand">
       <view class="title">
-        <view class="t">快递公司：{{expressInfo.shipperName}}</view>
-        <view class="b">物流单号：{{expressInfo.logisticCode}}</view>
+        <view class="t">快递公司：{{orderInfo.expName}}</view>
+        <view class="b">物流单号：{{orderInfo.expNo}}</view>
       </view>
       <image class="ti" src="/static/images/address_right.png" background-size="cover"></image>
     </view>