From 418a4850924d105b778b97e41488d1306553a678 Mon Sep 17 00:00:00 2001
From: yuanye <418471657@qq.com>
Date: Mon, 27 May 2024 10:23:15 +0800
Subject: [PATCH] Changes

---
 .../main/java/com/cweb/controller/CommonController.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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<String, Object> 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);