Merge branch 'dev' of http://gitea.dctpay.com/hurui/puhui-go into dev

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