theluyuan/litemall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Junling Bu
2019-12-01 13:56:13 +08:00
parent 3cf1e4a731
commit e56e155ed5
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java
View File

@@ -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);