From 824d003d330a25b1f5b1e9ed30e4ad868868c2ab Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 01 六月 2020 16:49:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopApiUtil.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopApiUtil.java
index 098bf5e..d66c031 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopApiUtil.java
@@ -19,6 +19,7 @@
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+import com.yeshi.fanli.dto.vip.VIPConvertResultDTO;
 import com.yeshi.fanli.dto.vip.VIPSearchFilter;
 import com.yeshi.fanli.dto.vip.VIPSearchResult;
 import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo;
@@ -170,7 +171,7 @@
 	 * 
 	 * @param goodsId
 	 */
-	public static String convertLink(String goodsId, String tag) {
+	public static VIPConvertResultDTO convertLink(String goodsId, String tag) {
 		JSONObject taskParams = new JSONObject();
 		JSONArray goodsIdArray = new JSONArray();
 		goodsIdArray.add(goodsId);
@@ -182,7 +183,8 @@
 		System.out.println(result);
 		JSONObject resultJSON = JSONObject.fromObject(result);
 		if (resultJSON.optInt("returnCode") == 0) {
-			return resultJSON.optJSONObject("result").optJSONArray("urlInfoList").optJSONObject(0).optString("url");
+			String re = resultJSON.optJSONObject("result").optJSONArray("urlInfoList").optJSONObject(0).toString();
+			return new Gson().fromJson(re, VIPConvertResultDTO.class);
 		}
 		return null;
 	}

--
Gitblit v1.8.0