From e287059e3f371d36e979910aad0efc8a738a11d3 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 09 七月 2019 17:48:38 +0800
Subject: [PATCH] 大淘客 好店数据结构调整

---
 fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java |   40 ++++++++++++++++++++++++++++++----------
 1 files changed, 30 insertions(+), 10 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 e3175e1..9c9391e 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
@@ -161,7 +161,16 @@
 
 					JSONObject data = JSONObject
 							.fromObject(els.get(i).html().replace("var brandData =", "").trim().split("};")[0] + "}");
-					taoBaoShopDTO = convertTaoBaoShopDTO(data);
+					taoBaoShopDTO = new TaoBaoShopDTO();
+					JSONObject item = data.optJSONObject("act");
+					taoBaoShopDTO.setSellerId(item.optLong("seller_id"));
+					taoBaoShopDTO.setBrandId(item.optString("brand_id"));
+					taoBaoShopDTO.setBrandDes(item.optString("brand_des"));
+					taoBaoShopDTO.setUserType(0);
+					
+					// 鍟嗗搧淇℃伅
+					taoBaoShopDTO = getDynamicShopGoods(brandId, taoBaoShopDTO);
+					
 					break;
 				}
 			}
@@ -408,21 +417,31 @@
 		return StringUtil.Md5(signStr).toUpperCase();
 	}
 
-	public static TaoBaoShopDTO convertTaoBaoShopDTO(JSONObject data) {
-		TaoBaoShopDTO taoBaoShopDTO = new TaoBaoShopDTO();
-		JSONObject item = data.optJSONObject("act");
-		taoBaoShopDTO.setSellerId(item.optLong("seller_id"));
-		taoBaoShopDTO.setBrandId(item.optString("brand_id"));
-		taoBaoShopDTO.setBrandDes(item.optString("brand_des"));
+	
+	/**
+	 * 鑾峰彇搴楅摵涓嬪墠4涓晢鍝併�佸簵閾轰粙缁�
+	 * 
+	 * @param brandId
+	 * @return
+	 */
+	public static TaoBaoShopDTO getDynamicShopGoods(String brandId, TaoBaoShopDTO taoBaoShopDTO) {
+		if (brandId == null) {
+			return taoBaoShopDTO;
+		}
+		
 		int userType = 0;
-
 		List<TaoBaoGoodsBrief> listGoods = new ArrayList<TaoBaoGoodsBrief>();
-		JSONArray arrayGoods = data.optJSONArray("goods");
+		
+		String result = HttpUtil.get("http://www.dataoke.com/brandGoods?id=" + brandId +"&page=1");
+		JSONObject json = JSONObject.fromObject(result);
+		JSONArray arrayGoods = json.optJSONArray("goods");
+		
 		for (int i = 0; i < arrayGoods.size(); i++) {
 			if (i >= 2) {
 				break;
 			}
 			JSONObject itemGoods = arrayGoods.optJSONObject(i);
+			
 			TaoBaoGoodsBrief taoBaoGoods = new TaoBaoGoodsBrief();
 			taoBaoGoods.setAuctionId(itemGoods.optLong("goodsid"));
 			taoBaoGoods.setBiz30day(itemGoods.optInt("xiaoliang"));
@@ -447,10 +466,11 @@
 
 			userType = itemGoods.optInt("istmall");
 		}
-		taoBaoShopDTO.setListGoods(listGoods);
 		taoBaoShopDTO.setUserType(userType);
+		taoBaoShopDTO.setListGoods(listGoods);
 		return taoBaoShopDTO;
 	}
+	
 
 	class DaTaoKeResult {
 		Date updateTime;

--
Gitblit v1.8.0