From e40d1c22c7202aac843c66f9ee9cc000744f9e10 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 六月 2020 15:52:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java |  121 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 118 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java
index bc57941..fee6e27 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java
@@ -113,8 +113,6 @@
 		return result;
 	}
 
-	
-
 	/**
 	 * 鑾峰彇澶ф窐瀹㈠搧鐗屼紭閫� 鍝佺墝id
 	 * 
@@ -503,7 +501,7 @@
 			for (int cid : cidList)
 				cids += cid + ",";
 			cids = cids.endsWith(",") ? cids.substring(0, cids.length() - 1) : cids;
-			
+
 			params.put("cids", cids + "");
 		}
 
@@ -691,4 +689,121 @@
 		}
 		return hotWords;
 	}
+
+	/**
+	 * 楂樻晥杞摼
+	 * @Title: convertLink
+	 * @Description: 
+	 * @param auctionId
+	 * @param pid 
+	 * void 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public static String convertLink(Long auctionId, String pid) {
+		TaoKeAppInfo app = APP_KEYS[0];
+		Map<String, String> params = new TreeMap<>();
+		params.put("version", "v1.1.1");
+		params.put("goodsId", auctionId + "");
+		params.put("pid", pid);
+		params.put("appKey", app.getAppKey());
+		params.put("sign", getSign(params, app.getAppSecret()));
+
+		String result = null;
+		try {
+			result = HttpUtil.get("https://openapi.dataoke.com/api/tb-service/get-privilege-link", params,
+					new HashMap<>());
+		} catch (Exception e) {
+			result = HttpUtil.get("https://openapi.dataoke.com/api/tb-service/get-privilege-link", params,
+					new HashMap<>());
+		}
+		
+		System.out.println(result);
+
+		JSONObject json = JSONObject.fromObject(result);
+		if (json != null) {
+			json = json.getJSONObject("data");
+			if (json != null) {
+				return json.optString("couponClickUrl");
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * 鏈嬪弸鍦�
+	 * @param pageId
+	 * @return
+	 */
+	public static DaTaoKeGoodsResult getFriendsFircleList(String pageId, int pageSize) {
+		DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
+		
+		TaoKeAppInfo app = getRandomApp();
+		Map<String, String> params = new TreeMap<>();
+		params.put("version", "v1.2.2");
+		params.put("appKey", app.getAppKey());
+		params.put("pageSize", pageSize + "");
+		if (!StringUtil.isNullOrEmpty(pageId))
+			params.put("pageId", pageId);
+		params.put("sign", getSign(params, app.getAppSecret()));
+
+		String result = null;
+		try {
+			result = HttpUtil.get("https://openapi.dataoke.com/api/goods/friends-circle-list", params, new HashMap<>());
+		} catch (Exception e) {
+			result = HttpUtil.get("https://openapi.dataoke.com/api/goods/friends-circle-list", params, new HashMap<>());
+		}
+		JSONObject json = JSONObject.fromObject(result);
+		JSONObject dataJson = json.optJSONObject("data");
+		if (dataJson != null) {
+			JSONArray array = dataJson.optJSONArray("list");
+			if (array != null) {
+				List<DaTaoKeDetailV2> list = parseDaTaoKeDetailV2List(array);
+				daTaoKeGoodsResult.setGoodsList(list);
+			}
+			daTaoKeGoodsResult.setPageId(dataJson.optString("pageId"));
+			daTaoKeGoodsResult.setTotalCount(dataJson.optLong("totalNum"));
+		}
+		return daTaoKeGoodsResult;
+	}
+	
+	
+
+	/**
+	 * 9.9鍖呴偖绮鹃��
+	 * @param pageId
+	 * @return
+	 */
+	public static DaTaoKeGoodsResult getNineGoodsList(Integer pageId, int pageSize) {
+		DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
+		
+		TaoKeAppInfo app = getRandomApp();
+		Map<String, String> params = new TreeMap<>();
+		params.put("version", "v1.2.2");
+		params.put("appKey", app.getAppKey());
+		params.put("pageSize", pageSize + "");
+		params.put("nineCid", "-1");
+		
+		if (pageId != null)
+			params.put("pageId", pageId + "");
+		params.put("sign", getSign(params, app.getAppSecret()));
+
+		String result = null;
+		try {
+			result = HttpUtil.get("https://openapi.dataoke.com/api/goods/nine/op-goods-list", params, new HashMap<>());
+		} catch (Exception e) {
+			result = HttpUtil.get("https://openapi.dataoke.com/api/goods/nine/op-goods-list", params, new HashMap<>());
+		}
+		JSONObject json = JSONObject.fromObject(result);
+		JSONObject dataJson = json.optJSONObject("data");
+		if (dataJson != null) {
+			JSONArray array = dataJson.optJSONArray("list");
+			if (array != null) {
+				List<DaTaoKeDetailV2> list = parseDaTaoKeDetailV2List(array);
+				daTaoKeGoodsResult.setGoodsList(list);
+			}
+			daTaoKeGoodsResult.setPageId(dataJson.optString("pageId"));
+			daTaoKeGoodsResult.setTotalCount(dataJson.optLong("totalNum"));
+		}
+		return daTaoKeGoodsResult;
+	}
 }

--
Gitblit v1.8.0