From de10879ac00f9c94dc02cada9a8a6117a8d81caf Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 19 七月 2019 15:40:01 +0800
Subject: [PATCH] 拼多多 京东分享模板兼容

---
 fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java
index 768f339..ecd64cc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java
@@ -22,9 +22,11 @@
 import com.yeshi.fanli.dto.jd.JDFilter;
 import com.yeshi.fanli.dto.jd.JDOrderResult;
 import com.yeshi.fanli.dto.jd.JDPingouInfo;
+import com.yeshi.fanli.dto.jd.JDSearchResult;
 import com.yeshi.fanli.dto.jd.JDShopInfo;
 import com.yeshi.fanli.entity.jd.JDGoods;
 import com.yeshi.fanli.entity.jd.JDOrder;
+import com.yeshi.fanli.tag.PageEntity;
 import com.yeshi.fanli.util.MoneyBigDecimalUtil;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TimeUtil;
@@ -176,9 +178,12 @@
 		filter.setPageIndex(1);
 		filter.setPageSize(20);
 		filter.setListId(skuIdList);
-		List<JDGoods> list = queryByKey(filter);
-		if (list != null && list.size() > 0)
-			return list.get(0);
+		JDSearchResult searchResult = queryByKey(filter);
+		if (searchResult != null) {
+			List<JDGoods> list = searchResult.getGoodsList();
+			if (list != null && list.size() > 0)
+				return list.get(0);
+		}
 		return null;
 	}
 	
@@ -187,7 +192,9 @@
 	 * @param skuIdList
 	 * @return
 	 */
-	public static List<JDGoods> queryByKey(JDFilter filter) {
+	public static JDSearchResult queryByKey(JDFilter filter) {
+		JDSearchResult searchResult = new JDSearchResult();
+		
 		List<JDGoods> list = new ArrayList<>();
 		JSONObject json = new JSONObject();
 		json.put("pageIndex", filter.getPageIndex());
@@ -273,8 +280,15 @@
 					}
 				}
 			}
+			
+			long totalCount = resultJson.optLong("totalCount");
+			PageEntity pageEntity = new PageEntity();
+			pageEntity.setTotalCount(totalCount);
+			
+			searchResult.setPageEntity(pageEntity);
 		}
-		return list;
+		searchResult.setGoodsList(list);
+		return searchResult;
 	}
 	
 	

--
Gitblit v1.8.0