fix[litemall-wx, litemall-wx-api]: 显示物流公司和物流单号

Moicen · Dec 1, 2019 · e56e155 · e56e155
1 parent 3cf1e4a
commit e56e155
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 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
@@ -203,6 +203,7 @@ public Object detail(Integer userId, Integer orderId) {
         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 Object detail(Integer userId, Integer orderId) {
         //"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
@@ -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
@@ -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>