From 744594ef1a2f530fc3e86ea9dc48b62247f79420 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 五月 2020 17:13:23 +0800
Subject: [PATCH] 饿了么绘图,添加口碑

---
 fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java |   88 +++++++++++++++++++++++++++----------------
 1 files changed, 55 insertions(+), 33 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 540be68..84c79cb 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
@@ -26,6 +26,7 @@
 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.bus.clazz.GoodsClass;
 import com.yeshi.fanli.entity.jd.JDGoods;
 import com.yeshi.fanli.entity.jd.JDOrder;
 import com.yeshi.fanli.entity.jd.JDOrderItem;
@@ -144,35 +145,42 @@
 
 	public static String convertLinkWithSubUnionId(String materialId, String couponUrl, String positionId,
 			String subUnionId) {
-		JSONObject json = new JSONObject();
-		json.put("materialId", materialId);
-		json.put("siteId", APP_ID);
-		json.put("positionId", positionId);
+		String log = "浜笢杞摼鍑洪敊:";
+		try {
+			JSONObject json = new JSONObject();
+			json.put("materialId", materialId);
+			json.put("siteId", APP_ID);
+			json.put("positionId", positionId);
 
-		if (!StringUtil.isNullOrEmpty(couponUrl))
-			json.put("couponUrl", couponUrl);
+			if (!StringUtil.isNullOrEmpty(couponUrl))
+				json.put("couponUrl", couponUrl);
 
-		if (!StringUtil.isNullOrEmpty(subUnionId))
-			json.put("subUnionId", subUnionId);
-		
-		//1锛氶暱閾撅紝 2 锛氱煭閾� 锛�3锛� 闀块摼+鐭摼
-		json.put("chainType", 3);
-		JSONObject root = new JSONObject();
-		root.put("promotionCodeReq", json);
+			if (!StringUtil.isNullOrEmpty(subUnionId))
+				json.put("subUnionId", subUnionId);
 
-		String result = baseRequest2("jd.union.open.promotion.bysubunionid.get", null, root);
+			// 1锛氶暱閾撅紝 2 锛氱煭閾� 锛�3锛� 闀块摼+鐭摼
+			json.put("chainType", 3);
+			JSONObject root = new JSONObject();
+			root.put("promotionCodeReq", json);
 
-		JSONObject resultJson = JSONObject.fromObject(result);
-		result = resultJson.optJSONObject("jd_union_open_promotion_bysubunionid_get_response").optString("result");
-		System.out.println(result);
-		if (result == null) {
-			return null;
+			String result = baseRequest2("jd.union.open.promotion.bysubunionid.get", null, root);
+
+			log += json.toString() + "####" + result;
+			JSONObject resultJson = JSONObject.fromObject(result);
+			result = resultJson.optJSONObject("jd_union_open_promotion_bysubunionid_get_response").optString("result");
+			System.out.println(result);
+			if (result == null) {
+				return null;
+			}
+
+			resultJson = JSONObject.fromObject(result);
+			return resultJson.optJSONObject("data").optString("shortURL");
+		} catch (Exception e) {
+			LogHelper.error(log);
 		}
 
-		resultJson = JSONObject.fromObject(result);
-		return resultJson.optJSONObject("data").optString("shortURL");
+		return null;
 	}
-
 
 	public static JDGoods queryGoodsDetail(Long skuId) {
 		List<Long> skuIdList = new ArrayList<>();
@@ -186,6 +194,20 @@
 			List<JDGoods> list = searchResult.getGoodsList();
 			if (list != null && list.size() > 0)
 				return list.get(0);
+		}
+		return null;
+	}
+
+	public static List<JDGoods> queryGoodsDetail(List<Long> skuIdList) {
+		JDFilter filter = new JDFilter();
+		filter.setPageIndex(1);
+		filter.setPageSize(20);
+		filter.setListId(skuIdList);
+		JDSearchResult searchResult = queryByKey(filter);
+		if (searchResult != null) {
+			List<JDGoods> list = searchResult.getGoodsList();
+			if (list != null && list.size() > 0)
+				return list;
 		}
 		return null;
 	}
@@ -580,12 +602,12 @@
 		return searchResult;
 	}
 
-	public static JDSearchResult getGoodsClass() {
+	public static List<GoodsClass> getGoodsClass(int parentId, int grade) {
 		JDSearchResult searchResult = new JDSearchResult();
-		List<JDGoods> list = new ArrayList<>();
+		List<GoodsClass> list = new ArrayList<>();
 		JSONObject json = new JSONObject();
-		json.put("parentId", 0);
-		json.put("grade", 0);
+		json.put("parentId", parentId);
+		json.put("grade", grade);
 
 		JSONObject jsonDTO = new JSONObject();
 		jsonDTO.put("req", json);
@@ -593,7 +615,7 @@
 		String result = baseRequest2("jd.union.open.category.goods.get", null, jsonDTO);
 		System.out.println(result);
 		JSONObject resultJson = JSONObject.fromObject(result);
-		resultJson = resultJson.optJSONObject("jd_union_open_goods_jingfen_query_response");
+		resultJson = resultJson.optJSONObject("jd_union_open_category_goods_get_response");
 		if (resultJson.optInt("code") == 0) {
 			result = resultJson.optString("result");
 			resultJson = JSONObject.fromObject(result);
@@ -602,9 +624,11 @@
 				JSONArray array = resultJson.optJSONArray("data");
 				if (array != null) {
 					for (int i = 0; i < array.size(); i++) {
-						JDGoods goods = parseJDGoods(array.optJSONObject(i));
-						if (goods != null)
-							list.add(goods);
+						GoodsClass gc = new GoodsClass();
+						JSONObject item = array.optJSONObject(i);
+						gc.setName(item.optString("name"));
+						gc.setId(item.optLong("id"));
+						list.add(gc);
 					}
 				}
 			}
@@ -612,11 +636,9 @@
 			long totalCount = resultJson.optLong("totalCount");
 			PageEntity pageEntity = new PageEntity();
 			pageEntity.setTotalCount(totalCount);
-
 			searchResult.setPageEntity(pageEntity);
 		}
-		searchResult.setGoodsList(list);
-		return searchResult;
+		return list;
 	}
 
 	public static JDGoods getGoodsDetail(Long skuId) {

--
Gitblit v1.8.0