From fc0cc7e808f9228b39b1e6b9d29c5417f41dbcc4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 24 五月 2019 16:52:02 +0800
Subject: [PATCH] 删除 老版动态查询商品 关联yeshi_ec_taobao_goods 的sql

---
 fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java |   70 +++++++++-------------------------
 1 files changed, 19 insertions(+), 51 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 856bbcc..915fd06 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
@@ -8,6 +8,7 @@
 
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 import org.yeshi.utils.HttpUtil;
 
@@ -37,72 +38,39 @@
 		for (int i = 0; i < array.size(); i++) {
 			list.add(gson.fromJson(array.optJSONObject(i).toString(), DaTaoKeDetail.class));
 		}
+
+		for (DaTaoKeDetail dt : list)
+			if (!dt.getPic().startsWith("http"))
+				dt.setPic("https:" + dt.getPic());
+
 		return new DaTaoKeApiResult(resultJson.optJSONObject("data").optInt("total_num"),
 				resultJson.optJSONObject("data").optString("update_time"), list);
 	}
 
-	
 	/**
 	 * 鑾峰彇澶ф窐瀹㈠搧鐗屼紭閫� 鍝佺墝id
+	 * 
 	 * @return
 	 */
 	public static List<String> getBrandIdList() {
-		List<String> listId = null;
+		List<String> listId = new ArrayList<>();
 		try {
-			Document doc = Jsoup.connect("http://www.dataoke.com/brandFeature").get();
-			Elements els = doc.getElementsByTag("script");
-			for (int i = 0; i < els.size(); i++) {
-				if (els.get(i).html().contains("var brandData")) {
-
-					JSONObject data = JSONObject
-							.fromObject(els.get(i).html().replace("var brandData =", "").trim().split("};")[0] + "}");
-					listId = convertList(data);
-					break;
-				}
+			Document doc = Jsoup.connect("http://www.dataoke.com/brandFilter?cid=0&sort=1&main=0").get();
+			Element root = doc.getElementsByClass("brand-list").get(0);
+			Elements items = root.getElementsByTag("a");
+			for (int i = 0; i < items.size(); i++) {
+				String id = items.get(i).attr("href").split("\\?")[1].replace("id=", "").trim();
+				listId.add(id);
 			}
-
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
 		return listId;
 	}
 
-	
-	public static List<String> convertList(JSONObject data) {
-		List<String> listId = new ArrayList<String>();
-
-		// 钀岃叮鏂扮敓鍔� 澶忔棩濂介鍏夋爮鐩�
-		JSONArray arrayActs = data.optJSONObject("acts").optJSONArray("list");
-		for (int i = 0; i < arrayActs.size(); i++) {
-			JSONObject item = arrayActs.optJSONObject(i);
-			listId.add(item.optString("brand_id"));
-		}
-
-		// 鐑帹鐖嗘
-		JSONArray arrayPushs = data.optJSONObject("pushs").optJSONArray("list");
-		for (int i = 0; i < arrayPushs.size(); i++) {
-			JSONObject item = arrayPushs.optJSONObject(i);
-			listId.add(item.optString("brand_id"));
-		}
-
-		// 鐑攢鍝佺墝姒�
-		JSONArray arrayRanks = data.optJSONObject("ranks").optJSONArray("list");
-		for (int i = 0; i < arrayRanks.size(); i++) {
-			JSONObject item = arrayRanks.optJSONObject(i);
-			// long id = item.optLong("id");
-			// String title =item.optString("title");
-			JSONArray goods = item.optJSONArray("goods");
-			for (int j = 0; j < goods.size(); j++) {
-				JSONObject good = goods.optJSONObject(j);
-				listId.add(good.optString("brand_id"));
-			}
-		}
-		return listId;
-	}
-
-	
 	/**
 	 * 鑾峰彇搴楅摵涓嬪墠4涓晢鍝併�佸簵閾轰粙缁�
+	 * 
 	 * @param brandId
 	 * @return
 	 */
@@ -143,7 +111,7 @@
 		List<TaoBaoGoodsBrief> listGoods = new ArrayList<TaoBaoGoodsBrief>();
 		JSONArray arrayGoods = data.optJSONArray("goods");
 		for (int i = 0; i < arrayGoods.size(); i++) {
-			if (i > 3) {
+			if (i >= 2) {
 				break;
 			}
 			JSONObject itemGoods = arrayGoods.optJSONObject(i);
@@ -166,16 +134,16 @@
 			taoBaoGoods.setTkRate(new BigDecimal(itemGoods.optString("yongjin")));
 			taoBaoGoods.setTkCommFee(new BigDecimal("0"));
 			taoBaoGoods.setState(0);
-			
+
 			listGoods.add(taoBaoGoods);
-			
+
 			userType = itemGoods.optInt("istmall");
 		}
 		taoBaoShopDTO.setListGoods(listGoods);
 		taoBaoShopDTO.setUserType(userType);
 		return taoBaoShopDTO;
 	}
-	
+
 	class DaTaoKeResult {
 		Date updateTime;
 		List<DaTaoKeDetail> dataList;

--
Gitblit v1.8.0