diff --git a/cweb/src/main/java/com/cweb/controller/CommonController.java b/cweb/src/main/java/com/cweb/controller/CommonController.java index b38e268..b6b7a6d 100644 --- a/cweb/src/main/java/com/cweb/controller/CommonController.java +++ b/cweb/src/main/java/com/cweb/controller/CommonController.java @@ -70,8 +70,14 @@ public class CommonController { public ResponseData getLogisticsMsg(@RequestParam(value = "logisticsNo" , required = true) String logisticsNo) { try { + Map params = new HashMap<>(); + GoodsLogistics logistics = (GoodsLogistics) bsOrderGoodsService.getLogisticsMsg(logisticsNo); - return ResponseMsgUtil.success(logistics); + + params.put("logistics", logistics); + JSONArray object = JSONArray.parseArray(logistics.getLogisticsTraceDetails()); + params.put("logisticsTraceDetails", object); + return ResponseMsgUtil.success(params); } catch (Exception e) { log.error("error!",e);