From af424bbf74743aa48d1b99a4922b6fc65c81fa6c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 25 Mar 2021 20:41:25 +0800
Subject: [PATCH] 包裹详细接口修改

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java
index 1d40de1..f1b2906 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java
@@ -44,6 +44,9 @@
 	@Value("${PARCEL_KIND_URL}")
 	private String PARCEL_KIND_URL;
 
+	@Value("${PARCEL_PRE_URL}")
+	private String PARCEL_PRE_URL;
+
 
 
 	/**
@@ -325,9 +328,30 @@
 	 */
 	@Override
 	public Object getParcelDetailPage(ConditionVo conditionVo) {
-		String result = getParcelDataPageList(conditionVo, PARCEL_DETAIL_RUL, PARCEL_KEY, PARCEL_SECRET).get("result").toString();
+		Map<String,Object> result =(Map<String,Object>) getParcelDataPageList(conditionVo, PARCEL_DETAIL_RUL, PARCEL_KEY, PARCEL_SECRET).get("result");
 		if (null!=result) {
-			return JSONObject.parse(result);
+//			List<Object> dataList = JSONArray.parseArray(result.get("data").toString());
+//			System.out.println("dataList = " + dataList);
+//			//遍历集合
+//			for (Object data:dataList) {
+//				Map<String,Object> parcelData =(Map<String,Object>)data;
+//				String imgUrl = parcelData.get("imgUrl").toString();
+//				//查询图片  PARCEL_PRE_URL
+//				//截取图片imgKey信息
+//				String[] imgKeys = imgUrl.split("=", imgUrl.length());
+//				String imgKey = imgKeys[1];
+//				//封装成map对象
+//				HashMap<String, String> map = new HashMap<>();
+//				map.put("imgKey",imgKey);
+//				//执行http远程调用
+//				String s = HttpClientUtils.doGetHeaderPictureBase64(PARCEL_PICTURE_URL, PARCEL_KEY, PARCEL_SECRET, map);
+//				//封装数据
+//				if (null!=s && s!="") {
+//					parcelData.put("imgUrl", s);
+//				}
+//			}
+			return JSONObject.parse(result.toString());
+
 		}
 		return null;
 	}

--
Gitblit v1.9.3