From be67478cae6bf9308f15949a21e7d0a57a3f0ecb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 七月 2020 15:37:31 +0800
Subject: [PATCH] dubbo集成修改

---
 facade-goods/src/main/java/com/yeshi/goods/facade/utils/taobao/DaTaoKeApiUtil.java | 1609 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 800 insertions(+), 809 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java b/facade-goods/src/main/java/com/yeshi/goods/facade/utils/taobao/DaTaoKeApiUtil.java
similarity index 97%
rename from fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java
rename to facade-goods/src/main/java/com/yeshi/goods/facade/utils/taobao/DaTaoKeApiUtil.java
index 806e57c..a131b87 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java
+++ b/facade-goods/src/main/java/com/yeshi/goods/facade/utils/taobao/DaTaoKeApiUtil.java
@@ -1,809 +1,800 @@
-package com.yeshi.fanli.util.dataoke;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpException;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.jsoup.select.Elements;
-import org.yeshi.utils.HttpUtil;
-
-import com.google.gson.ExclusionStrategy;
-import com.google.gson.FieldAttributes;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.yeshi.fanli.dto.dataoke.DaTaoKeGoodsResult;
-import com.yeshi.fanli.dto.taobao.TaoBaoShopDTO;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
-import com.yeshi.goods.facade.entity.taobao.DaTaoKeDetailV2;
-import com.yeshi.fanli.util.MoneyBigDecimalUtil;
-import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TimeUtil;
-
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
-public class DaTaoKeApiUtil {
-	final static String API_KEY = "a083abb893";
-	final static String API_KEY_2 = "b7a5ea2cd9";
-
-	final static String APP_KEY = "5cf764636d373";
-	final static String APP_KEY_SECRET = "5ea3c24900743f3aa531fb264f9824f2";
-
-	final static String APP_KEY_2 = "5cf75b0f2c0e4";
-	final static String APP_KEY_SECRET_2 = "b14f1fa115129a447937ca998b311d1e";
-
-	// 鎺掑簭鍊�
-
-	final public static int SORT_DEFAULT = 0;
-	final public static int SORT_CREATETIME = 1;
-	final public static int SORT_SALES = 2;
-	final public static int SORT_COUPON_NUM = 3;
-	final public static int SORT_COMMISSION = 4;
-	final public static int SORT_PRICE_HIGH_TO_LOW = 5;
-	final public static int SORT_PRICE_LOW_TO_HIGH = 6;
-
-	final static TaoKeAppInfo[] APP_KEYS = new TaoKeAppInfo[] { new TaoKeAppInfo(APP_KEY, APP_KEY_SECRET),
-			new TaoKeAppInfo(APP_KEY_2, APP_KEY_SECRET_2) };
-
-	final static String[] APP_SECRETS = new String[] { APP_KEY_SECRET, APP_KEY_SECRET_2 };
-
-	static Gson gson = null;
-	static {
-		gson = new GsonBuilder().setExclusionStrategies(new ExclusionStrategy() {
-			@Override
-			public boolean shouldSkipField(FieldAttributes f) {
-				return f.getName().equals("createTime");// 蹇界暐createTime鐨勮В鏋�
-			}
-
-			@Override
-			public boolean shouldSkipClass(Class<?> clazz) {
-				return false;
-			}
-		}).create();
-	}
-
-	private static String get(String url) {
-		HttpClient client = new HttpClient();
-		try {
-			client.getHttpConnectionManager().getParams().setConnectionTimeout(5000);
-			client.getHttpConnectionManager().getParams().setSoTimeout(5000);
-			GetMethod method = new GetMethod(url);
-			client.executeMethod(method);
-			return method.getResponseBodyAsString();
-		} catch (HttpException e) {
-			e.printStackTrace();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return "";
-	}
-
-	private static String request(String url) {
-		String result = null;
-
-		while (result == null) {
-			try {
-				result = get(url);
-				if ((result != null && result.startsWith("<html>")) || StringUtil.isNullOrEmpty(result))
-					result = null;
-			} catch (Exception e) {
-				try {
-					Thread.sleep(400);
-				} catch (InterruptedException e1) {
-				}
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * 鑾峰彇澶ф窐瀹㈠搧鐗屼紭閫� 鍝佺墝id
-	 * 
-	 * @return
-	 */
-	public static List<String> getBrandIdList() {
-		List<String> listId = new ArrayList<>();
-		try {
-			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;
-	}
-
-	/**
-	 * 鑾峰彇搴楅摵涓嬪墠4涓晢鍝併�佸簵閾轰粙缁�
-	 * 
-	 * @param brandId
-	 * @return
-	 */
-	public static TaoBaoShopDTO getDynamicShopInfo(String brandId) {
-		if (brandId == null) {
-			return null;
-		}
-		TaoBaoShopDTO taoBaoShopDTO = null;
-
-		Document doc;
-		try {
-			doc = Jsoup.connect("http://www.dataoke.com/brandSingle?id=" + brandId).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] + "}");
-					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.setShopIcon(item.optString("brand_logo"));
-					taoBaoShopDTO.setUserType(0);
-
-					// 鍟嗗搧淇℃伅
-					taoBaoShopDTO = getDynamicShopGoods(brandId, taoBaoShopDTO);
-
-					break;
-				}
-			}
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return taoBaoShopDTO;
-	}
-
-	private static TaoKeAppInfo getRandomApp() {
-		int pos = (int) (Math.random() * APP_KEYS.length);
-		return APP_KEYS[pos];
-	}
-
-	public static DaTaoKeGoodsResult listAll(String pageId) {
-		TaoKeAppInfo app = getRandomApp();
-		DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
-		Map<String, String> params = new TreeMap<>();
-		params.put("version", "v1.1.0");
-		params.put("appKey", app.getAppKey());
-		params.put("pageSize", 200 + "");
-		// params.put("sort", "1");
-		if (!StringUtil.isNullOrEmpty(pageId)) {
-			params.put("pageId", pageId);
-		}
-		params.put("sign", getSign(params, app.getAppSecret()));
-		String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-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;
-	}
-
-	/**
-	 * 澶辨晥鍟嗗搧
-	 * 
-	 * @param pageId
-	 * @return
-	 */
-	public static DaTaoKeGoodsResult getInvalidGoodsList(String pageId, String startTime, String endTime) {
-		TaoKeAppInfo app = getRandomApp();
-		DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
-		Map<String, String> params = new TreeMap<>();
-		params.put("version", "v1.0.1");
-		params.put("appKey", app.getAppKey());
-		params.put("pageSize", 200 + "");
-		if (!StringUtil.isNullOrEmpty(startTime))
-			params.put("startTime", startTime);
-
-		if (!StringUtil.isNullOrEmpty(endTime))
-			params.put("endTime", endTime);
-
-		if (!StringUtil.isNullOrEmpty(pageId))
-			params.put("pageId", pageId);
-
-		params.put("sign", getSign(params, app.getAppSecret()));
-		String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-stale-goods-by-time", params,
-				new HashMap<>());
-		System.out.println(result);
-		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;
-	}
-
-	public static DaTaoKeGoodsResult getNewGoodsList(String pageId, String startTime, String endTime) {
-		TaoKeAppInfo app = getRandomApp();
-		DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
-		Map<String, String> params = new TreeMap<>();
-		params.put("version", "v1.1.0");
-		params.put("appKey", app.getAppKey());
-		params.put("pageSize", 200 + "");
-		if (!StringUtil.isNullOrEmpty(startTime))
-			params.put("startTime", startTime);
-
-		if (!StringUtil.isNullOrEmpty(endTime))
-			params.put("endTime", endTime);
-
-		if (!StringUtil.isNullOrEmpty(pageId))
-			params.put("pageId", pageId);
-
-		params.put("sign", getSign(params, app.getAppSecret()));
-		String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/pull-goods-by-time", 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;
-	}
-
-	public static DaTaoKeGoodsResult getUpdateGoodsList(String pageId, String startTime, String endTime) {
-		TaoKeAppInfo app = getRandomApp();
-		DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
-		Map<String, String> params = new TreeMap<>();
-		params.put("version", "v1.1.0");
-		params.put("appKey", app.getAppKey());
-		params.put("pageSize", 200 + "");
-		if (!StringUtil.isNullOrEmpty(startTime))
-			params.put("startTime", startTime);
-
-		if (!StringUtil.isNullOrEmpty(endTime))
-			params.put("endTime", endTime);
-
-		if (!StringUtil.isNullOrEmpty(pageId))
-			params.put("pageId", pageId);
-
-		params.put("sign", getSign(params, app.getAppSecret()));
-		String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-newest-goods", 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;
-	}
-
-	public static DaTaoKeDetailV2 getGoodsDetail(Long id) {
-		TaoKeAppInfo app = getRandomApp();
-		Map<String, String> params = new TreeMap<>();
-		params.put("version", "v1.1.0");
-		params.put("appKey", app.getAppKey());
-		params.put("id", id + "");
-		params.put("sign", getSign(params, app.getAppSecret()));
-		String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-goods-details", params,
-				new HashMap<>());
-		JSONObject json = JSONObject.fromObject(result);
-		JSONObject dataJson = json.optJSONObject("data");
-		if (dataJson != null) {
-			return parseDaTaoKeDetailV2(dataJson);
-		}
-		return null;
-	}
-
-	public static DaTaoKeDetailV2 getGoodsDetailByGoodsId(Long goodsId) {
-		TaoKeAppInfo app = getRandomApp();
-		Map<String, String> params = new TreeMap<>();
-		params.put("version", "v1.1.1");
-		params.put("appKey", app.getAppKey());
-		params.put("goodsId", goodsId + "");
-		params.put("sign", getSign(params, app.getAppSecret()));
-		String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-goods-details", params,
-				new HashMap<>());
-		System.out.println(result);
-		JSONObject json = JSONObject.fromObject(result);
-		JSONObject dataJson = json.optJSONObject("data");
-		if (dataJson != null) {
-			return parseDaTaoKeDetailV2(dataJson);
-		}
-		return null;
-	}
-
-	private static String requestGet(String url, Map<String, String> params) {
-		Iterator<String> keys = params.keySet().iterator();
-		url += "?";
-		while (keys.hasNext()) {
-			String key = keys.next();
-			try {
-				url += String.format("%s=%s&", key, URLEncoder.encode(params.get(key), "UTF-8"));
-			} catch (UnsupportedEncodingException e) {
-				e.printStackTrace();
-			}
-		}
-		return HttpUtil.get(url, 10000);
-	}
-
-	public static DaTaoKeGoodsResult search(String key, List<Integer> cidList, BigDecimal priceLowerLimit,
-			BigDecimal priceUpperLimit, int page, int pageSize, Integer sort) {
-
-		TaoKeAppInfo app = getRandomApp();
-		DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
-		Map<String, String> params = new TreeMap<>();
-		params.put("version", "v2.1.0");
-		params.put("appKey", app.getAppKey());
-		params.put("pageSize", pageSize + "");
-		params.put("pageId", page + "");
-		if (priceLowerLimit != null)
-			params.put("priceLowerLimit", priceLowerLimit + "");
-		if (priceUpperLimit != null)
-			params.put("priceUpperLimit", priceUpperLimit + "");
-		String cids = "";
-		if (cidList != null && cidList.size() > 0)
-			for (Integer cid : cidList) {
-				cids += cid + ",";
-			}
-
-		if (cids.endsWith(","))
-			cids = cids.substring(0, cids.length() - 1);
-		if (!StringUtil.isNullOrEmpty(cids))
-			params.put("cids", cids);
-
-		if (StringUtil.isNullOrEmpty(key))
-			key = "";
-		params.put("keyWords", key);
-
-		if (sort != null)
-			params.put("sort", sort + "");
-		params.put("sign", getSign(params, app.getAppSecret()));
-		String result = requestGet("https://openapi.dataoke.com/api/goods/get-dtk-search-goods", params);
-
-		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;
-	}
-
-	public static DaTaoKeGoodsResult search(String key, List<Integer> cidList, BigDecimal priceLowerLimit,
-			BigDecimal priceUpperLimit, Integer couponPriceLowerLimit, int page, int pageSize, Integer sort) {
-
-		TaoKeAppInfo app = getRandomApp();
-		DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
-		Map<String, String> params = new TreeMap<>();
-		params.put("version", "v2.1.0");
-		params.put("appKey", app.getAppKey());
-		params.put("pageSize", pageSize + "");
-		params.put("pageId", page + "");
-		if (priceLowerLimit != null)
-			params.put("priceLowerLimit", priceLowerLimit + "");
-		if (priceUpperLimit != null)
-			params.put("priceUpperLimit", priceUpperLimit + "");
-
-		if (couponPriceLowerLimit != null)
-			params.put("couponPriceLowerLimit", couponPriceLowerLimit + "");
-
-		String cids = "";
-		if (cidList != null && cidList.size() > 0)
-			for (Integer cid : cidList) {
-				cids += cid + ",";
-			}
-
-		if (cids.endsWith(","))
-			cids = cids.substring(0, cids.length() - 1);
-		if (!StringUtil.isNullOrEmpty(cids))
-			params.put("cids", cids);
-
-		if (StringUtil.isNullOrEmpty(key))
-			key = "%";
-		params.put("keyWords", key);
-
-		if (sort != null)
-			params.put("sort", sort + "");
-		params.put("sign", getSign(params, app.getAppSecret()));
-		String result = requestGet("https://openapi.dataoke.com/api/goods/get-dtk-search-goods", params);
-
-		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;
-	}
-
-	/**
-	 * 鍟嗗搧鍒楄〃
-	 * 
-	 * @param key
-	 * @param cidList
-	 * @param priceLowerLimit
-	 * @param priceUpperLimit
-	 * @param couponPriceLowerLimit
-	 * @param pageId
-	 * @param pageSize
-	 * @param sort
-	 * @return
-	 */
-	public static DaTaoKeGoodsResult getGoodsList(String key, List<Integer> cidList, BigDecimal priceLowerLimit,
-			BigDecimal priceUpperLimit, Integer couponPriceLowerLimit, int pageId, int pageSize, Integer sort) {
-		TaoKeAppInfo app = getRandomApp();
-		DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
-		Map<String, String> params = new TreeMap<>();
-		params.put("version", "v1.1.0");
-		params.put("appKey", app.getAppKey());
-		params.put("pageSize", pageSize + "");
-		params.put("pageId", pageId + "");
-
-		if (priceLowerLimit != null)
-			params.put("priceLowerLimit", priceLowerLimit + "");
-		if (priceUpperLimit != null)
-			params.put("priceUpperLimit", priceUpperLimit + "");
-
-		if (couponPriceLowerLimit != null)
-			params.put("couponPriceLowerLimit", couponPriceLowerLimit + "");
-
-		if (sort != null)
-			params.put("sort", sort + "");
-
-		if (cidList != null && cidList.size() > 0) {
-			String cids = "";
-			for (int cid : cidList)
-				cids += cid + ",";
-			cids = cids.endsWith(",") ? cids.substring(0, cids.length() - 1) : cids;
-
-			params.put("cids", cids + "");
-		}
-
-		params.put("sign", getSign(params, app.getAppSecret()));
-		String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-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;
-	}
-
-	private static String getSign(Map<String, String> map, String secretKey) {
-		if (map.size() == 0) {
-			return "";
-		}
-		StringBuffer sb = new StringBuffer("");
-		Set<String> keySet = map.keySet();
-		Iterator<String> iter = keySet.iterator();
-		while (iter.hasNext()) {
-			String key = iter.next();
-			sb.append("&" + key + "=" + map.get(key));
-		}
-		sb.deleteCharAt(0);
-		String signStr = "";
-		signStr = sb.toString() + "&key=" + secretKey;
-		return StringUtil.Md5(signStr).toUpperCase();
-	}
-
-	/**
-	 * 鑾峰彇搴楅摵涓嬪墠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>();
-
-		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"));
-			taoBaoGoods.setCouponAmount(new BigDecimal(itemGoods.optString("quan_jine")));
-			taoBaoGoods.setCouponInfo(String.format("婊�%s鍏冨噺%s鍏�", itemGoods.optString("quan_tiaojian"),
-					MoneyBigDecimalUtil.getWithNoZera(new BigDecimal(itemGoods.optString("quan_jine")))));
-			taoBaoGoods.setCouponLeftCount(itemGoods.optInt("quan_num"));
-			taoBaoGoods.setCouponStartFee(new BigDecimal(itemGoods.optString("quan_tiaojian")));
-			taoBaoGoods.setCouponTotalCount(itemGoods.optInt("quan_num"));
-			taoBaoGoods.setPictUrl(itemGoods.optString("pic"));
-			taoBaoGoods.setPictUrlWhite(itemGoods.optString("pic"));
-			taoBaoGoods.setSellerId(itemGoods.optLong("seller_id"));
-			taoBaoGoods.setShopTitle("");
-			taoBaoGoods.setTitle(itemGoods.optString("title"));
-			taoBaoGoods.setUserType(itemGoods.optInt("istmall"));
-			taoBaoGoods.setZkPrice(new BigDecimal(itemGoods.optString("yuanjia")));
-			taoBaoGoods.setTkRate(new BigDecimal(itemGoods.optString("yongjin")));
-			taoBaoGoods.setTkCommFee(new BigDecimal("0"));
-			taoBaoGoods.setState(0);
-
-			listGoods.add(taoBaoGoods);
-
-			userType = itemGoods.optInt("istmall");
-		}
-		taoBaoShopDTO.setUserType(userType);
-		taoBaoShopDTO.setListGoods(listGoods);
-		return taoBaoShopDTO;
-	}
-
-	public static int RANK_TYPE_TIME = 1;// 瀹炴椂
-	public static int RANK_TYPE_DAY = 2;// 鍏ㄥぉ姒�
-	public static int RANK_TYPE_HOT = 3;// 鐑帹姒�
-	public static int RANK_TYPE_REBUY = 4;// 澶嶈喘姒�
-
-	/**
-	 * 鍚勫ぇ姒滃崟
-	 * 
-	 * @param type
-	 * @return
-	 */
-	public static DaTaoKeGoodsResult getRankingList(int type, Integer cid) {
-		TaoKeAppInfo app = getRandomApp();
-		DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
-		Map<String, String> params = new TreeMap<>();
-		params.put("version", "v1.1.0");
-		params.put("appKey", app.getAppKey());
-		params.put("rankType", type + "");
-		if (cid != null)
-			params.put("cid", cid + "");
-		params.put("sign", getSign(params, app.getAppSecret()));
-		// 鍋�2娆¤姹�
-		String result = null;
-		try {
-			result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-ranking-list", params, new HashMap<>());
-		} catch (Exception e) {
-			result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-ranking-list", params, new HashMap<>());
-		}
-		JSONObject json = JSONObject.fromObject(result);
-		if (json != null) {
-			JSONArray array = json.optJSONArray("data");
-
-			List<DaTaoKeDetailV2> list = new ArrayList<>();
-			for (int i = 0; i < array.size(); i++) {
-				JSONObject itemData = array.optJSONObject(i);
-				DaTaoKeDetailV2 item = parseDaTaoKeDetailV2(itemData);
-				item.setCouponConditions(itemData.optString("couponConditions"));
-				item.setShopType(itemData.optInt("shopType"));
-				item.setOriginalPrice(new BigDecimal(itemData.optString("originalPrice")));
-				item.setMainPic(itemData.optString("mainPic"));
-				list.add(item);
-			}
-			daTaoKeGoodsResult.setGoodsList(list);
-		}
-		return daTaoKeGoodsResult;
-	}
-
-	private static List<DaTaoKeDetailV2> parseDaTaoKeDetailV2List(JSONArray array) {
-		List<DaTaoKeDetailV2> detailList = new ArrayList<>();
-		for (int i = 0; i < array.size(); i++) {
-			DaTaoKeDetailV2 detail = parseDaTaoKeDetailV2(array.optJSONObject(i));
-			detailList.add(detail);
-		}
-		return detailList;
-	}
-
-	private static DaTaoKeDetailV2 parseDaTaoKeDetailV2(JSONObject json) {
-		DaTaoKeDetailV2 detail = gson.fromJson(json.toString(), DaTaoKeDetailV2.class);
-		if (StringUtil.isNullOrEmpty(json.optString("createTime"))) {
-			detail.setCreateTime(
-					new Date(TimeUtil.convertToTimeTemp(json.optString("onSaleTime"), "yyyy-MM-dd HH:mm:ss")));
-		} else {
-			detail.setCreateTime(
-					new Date(TimeUtil.convertToTimeTemp(json.optString("createTime"), "yyyy-MM-dd HH:mm:ss")));
-		}
-		return detail;
-	}
-
-	/**
-	 * 鍚勫ぇ姒滃崟
-	 * 
-	 * @param type
-	 * @return
-	 */
-	public static String getHotWords() {
-		TaoKeAppInfo app = getRandomApp();
-		Map<String, String> params = new TreeMap<>();
-		params.put("version", "v1.0.1");
-		params.put("appKey", app.getAppKey());
-		params.put("sign", getSign(params, app.getAppSecret()));
-
-		String result = null;
-		try {
-			result = HttpUtil.get("https://openapi.dataoke.com/api/category/get-top100", params, new HashMap<>());
-		} catch (Exception e) {
-			result = HttpUtil.get("https://openapi.dataoke.com/api/category/get-top100", params, new HashMap<>());
-		}
-
-		String hotWords = null;
-		JSONObject json = JSONObject.fromObject(result);
-		if (json != null) {
-			json = json.getJSONObject("data");
-			if (json != null) {
-				hotWords = json.optString("hotWords");
-			}
-		}
-		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;
-	}
-}
+package com.yeshi.goods.facade.utils.taobao;
+
+import com.google.gson.ExclusionStrategy;
+import com.google.gson.FieldAttributes;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.yeshi.common.entity.taobao.TaoKeAppInfo;
+import com.yeshi.goods.facade.dto.taobao.TaoBaoShopDTO;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.goods.facade.entity.taobao.dataoke.DaTaoKeDetailV2;
+import com.yeshi.goods.facade.dto.taobao.dataoke.DaTaoKeGoodsResult;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
+import org.yeshi.utils.HttpUtil;
+import org.yeshi.utils.MoneyBigDecimalUtil;
+import org.yeshi.utils.StringUtil;
+import org.yeshi.utils.TimeUtil;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.net.URLEncoder;
+import java.util.*;
+
+public class DaTaoKeApiUtil {
+	final static String API_KEY = "a083abb893";
+	final static String API_KEY_2 = "b7a5ea2cd9";
+
+	final static String APP_KEY = "5cf764636d373";
+	final static String APP_KEY_SECRET = "5ea3c24900743f3aa531fb264f9824f2";
+
+	final static String APP_KEY_2 = "5cf75b0f2c0e4";
+	final static String APP_KEY_SECRET_2 = "b14f1fa115129a447937ca998b311d1e";
+
+	// 鎺掑簭鍊�
+
+	final public static int SORT_DEFAULT = 0;
+	final public static int SORT_CREATETIME = 1;
+	final public static int SORT_SALES = 2;
+	final public static int SORT_COUPON_NUM = 3;
+	final public static int SORT_COMMISSION = 4;
+	final public static int SORT_PRICE_HIGH_TO_LOW = 5;
+	final public static int SORT_PRICE_LOW_TO_HIGH = 6;
+
+	final static TaoKeAppInfo[] APP_KEYS = new TaoKeAppInfo[] { new TaoKeAppInfo(APP_KEY, APP_KEY_SECRET),
+			new TaoKeAppInfo(APP_KEY_2, APP_KEY_SECRET_2) };
+
+	final static String[] APP_SECRETS = new String[] { APP_KEY_SECRET, APP_KEY_SECRET_2 };
+
+	static Gson gson = null;
+	static {
+		gson = new GsonBuilder().setExclusionStrategies(new ExclusionStrategy() {
+			@Override
+			public boolean shouldSkipField(FieldAttributes f) {
+				return f.getName().equals("createTime");// 蹇界暐createTime鐨勮В鏋�
+			}
+
+			@Override
+			public boolean shouldSkipClass(Class<?> clazz) {
+				return false;
+			}
+		}).create();
+	}
+
+	private static String get(String url) {
+		HttpClient client = new HttpClient();
+		try {
+			client.getHttpConnectionManager().getParams().setConnectionTimeout(5000);
+			client.getHttpConnectionManager().getParams().setSoTimeout(5000);
+			GetMethod method = new GetMethod(url);
+			client.executeMethod(method);
+			return method.getResponseBodyAsString();
+		} catch (HttpException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return "";
+	}
+
+	private static String request(String url) {
+		String result = null;
+
+		while (result == null) {
+			try {
+				result = get(url);
+				if ((result != null && result.startsWith("<html>")) || StringUtil.isNullOrEmpty(result))
+					result = null;
+			} catch (Exception e) {
+				try {
+					Thread.sleep(400);
+				} catch (InterruptedException e1) {
+				}
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * 鑾峰彇澶ф窐瀹㈠搧鐗屼紭閫� 鍝佺墝id
+	 * 
+	 * @return
+	 */
+	public static List<String> getBrandIdList() {
+		List<String> listId = new ArrayList<>();
+		try {
+			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;
+	}
+
+	/**
+	 * 鑾峰彇搴楅摵涓嬪墠4涓晢鍝併�佸簵閾轰粙缁�
+	 * 
+	 * @param brandId
+	 * @return
+	 */
+	public static TaoBaoShopDTO getDynamicShopInfo(String brandId) {
+		if (brandId == null) {
+			return null;
+		}
+		TaoBaoShopDTO taoBaoShopDTO = null;
+
+		Document doc;
+		try {
+			doc = Jsoup.connect("http://www.dataoke.com/brandSingle?id=" + brandId).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] + "}");
+					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.setShopIcon(item.optString("brand_logo"));
+					taoBaoShopDTO.setUserType(0);
+
+					// 鍟嗗搧淇℃伅
+					taoBaoShopDTO = getDynamicShopGoods(brandId, taoBaoShopDTO);
+
+					break;
+				}
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return taoBaoShopDTO;
+	}
+
+	private static TaoKeAppInfo getRandomApp() {
+		int pos = (int) (Math.random() * APP_KEYS.length);
+		return APP_KEYS[pos];
+	}
+
+	public static DaTaoKeGoodsResult listAll(String pageId) {
+		TaoKeAppInfo app = getRandomApp();
+		DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
+		Map<String, String> params = new TreeMap<>();
+		params.put("version", "v1.1.0");
+		params.put("appKey", app.getAppKey());
+		params.put("pageSize", 200 + "");
+		// params.put("sort", "1");
+		if (!StringUtil.isNullOrEmpty(pageId)) {
+			params.put("pageId", pageId);
+		}
+		params.put("sign", getSign(params, app.getAppSecret()));
+		String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-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;
+	}
+
+	/**
+	 * 澶辨晥鍟嗗搧
+	 * 
+	 * @param pageId
+	 * @return
+	 */
+	public static DaTaoKeGoodsResult getInvalidGoodsList(String pageId, String startTime, String endTime) {
+		TaoKeAppInfo app = getRandomApp();
+		DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
+		Map<String, String> params = new TreeMap<>();
+		params.put("version", "v1.0.1");
+		params.put("appKey", app.getAppKey());
+		params.put("pageSize", 200 + "");
+		if (!StringUtil.isNullOrEmpty(startTime))
+			params.put("startTime", startTime);
+
+		if (!StringUtil.isNullOrEmpty(endTime))
+			params.put("endTime", endTime);
+
+		if (!StringUtil.isNullOrEmpty(pageId))
+			params.put("pageId", pageId);
+
+		params.put("sign", getSign(params, app.getAppSecret()));
+		String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-stale-goods-by-time", params,
+				new HashMap<>());
+		System.out.println(result);
+		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;
+	}
+
+	public static DaTaoKeGoodsResult getNewGoodsList(String pageId, String startTime, String endTime) {
+		TaoKeAppInfo app = getRandomApp();
+		DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
+		Map<String, String> params = new TreeMap<>();
+		params.put("version", "v1.1.0");
+		params.put("appKey", app.getAppKey());
+		params.put("pageSize", 200 + "");
+		if (!StringUtil.isNullOrEmpty(startTime))
+			params.put("startTime", startTime);
+
+		if (!StringUtil.isNullOrEmpty(endTime))
+			params.put("endTime", endTime);
+
+		if (!StringUtil.isNullOrEmpty(pageId))
+			params.put("pageId", pageId);
+
+		params.put("sign", getSign(params, app.getAppSecret()));
+		String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/pull-goods-by-time", 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;
+	}
+
+	public static DaTaoKeGoodsResult getUpdateGoodsList(String pageId, String startTime, String endTime) {
+		TaoKeAppInfo app = getRandomApp();
+		DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
+		Map<String, String> params = new TreeMap<>();
+		params.put("version", "v1.1.0");
+		params.put("appKey", app.getAppKey());
+		params.put("pageSize", 200 + "");
+		if (!StringUtil.isNullOrEmpty(startTime))
+			params.put("startTime", startTime);
+
+		if (!StringUtil.isNullOrEmpty(endTime))
+			params.put("endTime", endTime);
+
+		if (!StringUtil.isNullOrEmpty(pageId))
+			params.put("pageId", pageId);
+
+		params.put("sign", getSign(params, app.getAppSecret()));
+		String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-newest-goods", 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;
+	}
+
+	public static DaTaoKeDetailV2 getGoodsDetail(Long id) {
+		TaoKeAppInfo app = getRandomApp();
+		Map<String, String> params = new TreeMap<>();
+		params.put("version", "v1.1.0");
+		params.put("appKey", app.getAppKey());
+		params.put("id", id + "");
+		params.put("sign", getSign(params, app.getAppSecret()));
+		String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-goods-details", params,
+				new HashMap<>());
+		JSONObject json = JSONObject.fromObject(result);
+		JSONObject dataJson = json.optJSONObject("data");
+		if (dataJson != null) {
+			return parseDaTaoKeDetailV2(dataJson);
+		}
+		return null;
+	}
+
+	public static DaTaoKeDetailV2 getGoodsDetailByGoodsId(Long goodsId) {
+		TaoKeAppInfo app = getRandomApp();
+		Map<String, String> params = new TreeMap<>();
+		params.put("version", "v1.1.1");
+		params.put("appKey", app.getAppKey());
+		params.put("goodsId", goodsId + "");
+		params.put("sign", getSign(params, app.getAppSecret()));
+		String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-goods-details", params,
+				new HashMap<>());
+		System.out.println(result);
+		JSONObject json = JSONObject.fromObject(result);
+		JSONObject dataJson = json.optJSONObject("data");
+		if (dataJson != null) {
+			return parseDaTaoKeDetailV2(dataJson);
+		}
+		return null;
+	}
+
+	private static String requestGet(String url, Map<String, String> params) {
+		Iterator<String> keys = params.keySet().iterator();
+		url += "?";
+		while (keys.hasNext()) {
+			String key = keys.next();
+			try {
+				url += String.format("%s=%s&", key, URLEncoder.encode(params.get(key), "UTF-8"));
+			} catch (UnsupportedEncodingException e) {
+				e.printStackTrace();
+			}
+		}
+		return HttpUtil.get(url, 10000);
+	}
+
+	public static DaTaoKeGoodsResult search(String key, List<Integer> cidList, BigDecimal priceLowerLimit,
+			BigDecimal priceUpperLimit, int page, int pageSize, Integer sort) {
+
+		TaoKeAppInfo app = getRandomApp();
+		DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
+		Map<String, String> params = new TreeMap<>();
+		params.put("version", "v2.1.0");
+		params.put("appKey", app.getAppKey());
+		params.put("pageSize", pageSize + "");
+		params.put("pageId", page + "");
+		if (priceLowerLimit != null)
+			params.put("priceLowerLimit", priceLowerLimit + "");
+		if (priceUpperLimit != null)
+			params.put("priceUpperLimit", priceUpperLimit + "");
+		String cids = "";
+		if (cidList != null && cidList.size() > 0)
+			for (Integer cid : cidList) {
+				cids += cid + ",";
+			}
+
+		if (cids.endsWith(","))
+			cids = cids.substring(0, cids.length() - 1);
+		if (!StringUtil.isNullOrEmpty(cids))
+			params.put("cids", cids);
+
+		if (StringUtil.isNullOrEmpty(key))
+			key = "";
+		params.put("keyWords", key);
+
+		if (sort != null)
+			params.put("sort", sort + "");
+		params.put("sign", getSign(params, app.getAppSecret()));
+		String result = requestGet("https://openapi.dataoke.com/api/goods/get-dtk-search-goods", params);
+
+		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;
+	}
+
+	public static DaTaoKeGoodsResult search(String key, List<Integer> cidList, BigDecimal priceLowerLimit,
+			BigDecimal priceUpperLimit, Integer couponPriceLowerLimit, int page, int pageSize, Integer sort) {
+
+		TaoKeAppInfo app = getRandomApp();
+		DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
+		Map<String, String> params = new TreeMap<>();
+		params.put("version", "v2.1.0");
+		params.put("appKey", app.getAppKey());
+		params.put("pageSize", pageSize + "");
+		params.put("pageId", page + "");
+		if (priceLowerLimit != null)
+			params.put("priceLowerLimit", priceLowerLimit + "");
+		if (priceUpperLimit != null)
+			params.put("priceUpperLimit", priceUpperLimit + "");
+
+		if (couponPriceLowerLimit != null)
+			params.put("couponPriceLowerLimit", couponPriceLowerLimit + "");
+
+		String cids = "";
+		if (cidList != null && cidList.size() > 0)
+			for (Integer cid : cidList) {
+				cids += cid + ",";
+			}
+
+		if (cids.endsWith(","))
+			cids = cids.substring(0, cids.length() - 1);
+		if (!StringUtil.isNullOrEmpty(cids))
+			params.put("cids", cids);
+
+		if (StringUtil.isNullOrEmpty(key))
+			key = "%";
+		params.put("keyWords", key);
+
+		if (sort != null)
+			params.put("sort", sort + "");
+		params.put("sign", getSign(params, app.getAppSecret()));
+		String result = requestGet("https://openapi.dataoke.com/api/goods/get-dtk-search-goods", params);
+
+		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;
+	}
+
+	/**
+	 * 鍟嗗搧鍒楄〃
+	 * 
+	 * @param key
+	 * @param cidList
+	 * @param priceLowerLimit
+	 * @param priceUpperLimit
+	 * @param couponPriceLowerLimit
+	 * @param pageId
+	 * @param pageSize
+	 * @param sort
+	 * @return
+	 */
+	public static DaTaoKeGoodsResult getGoodsList(String key, List<Integer> cidList, BigDecimal priceLowerLimit,
+			BigDecimal priceUpperLimit, Integer couponPriceLowerLimit, int pageId, int pageSize, Integer sort) {
+		TaoKeAppInfo app = getRandomApp();
+		DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
+		Map<String, String> params = new TreeMap<>();
+		params.put("version", "v1.1.0");
+		params.put("appKey", app.getAppKey());
+		params.put("pageSize", pageSize + "");
+		params.put("pageId", pageId + "");
+
+		if (priceLowerLimit != null)
+			params.put("priceLowerLimit", priceLowerLimit + "");
+		if (priceUpperLimit != null)
+			params.put("priceUpperLimit", priceUpperLimit + "");
+
+		if (couponPriceLowerLimit != null)
+			params.put("couponPriceLowerLimit", couponPriceLowerLimit + "");
+
+		if (sort != null)
+			params.put("sort", sort + "");
+
+		if (cidList != null && cidList.size() > 0) {
+			String cids = "";
+			for (int cid : cidList)
+				cids += cid + ",";
+			cids = cids.endsWith(",") ? cids.substring(0, cids.length() - 1) : cids;
+
+			params.put("cids", cids + "");
+		}
+
+		params.put("sign", getSign(params, app.getAppSecret()));
+		String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-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;
+	}
+
+	private static String getSign(Map<String, String> map, String secretKey) {
+		if (map.size() == 0) {
+			return "";
+		}
+		StringBuffer sb = new StringBuffer("");
+		Set<String> keySet = map.keySet();
+		Iterator<String> iter = keySet.iterator();
+		while (iter.hasNext()) {
+			String key = iter.next();
+			sb.append("&" + key + "=" + map.get(key));
+		}
+		sb.deleteCharAt(0);
+		String signStr = "";
+		signStr = sb.toString() + "&key=" + secretKey;
+		return StringUtil.Md5(signStr).toUpperCase();
+	}
+
+	/**
+	 * 鑾峰彇搴楅摵涓嬪墠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>();
+
+		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"));
+			taoBaoGoods.setCouponAmount(new BigDecimal(itemGoods.optString("quan_jine")));
+			taoBaoGoods.setCouponInfo(String.format("婊�%s鍏冨噺%s鍏�", itemGoods.optString("quan_tiaojian"),
+					MoneyBigDecimalUtil.getWithNoZera(new BigDecimal(itemGoods.optString("quan_jine")))));
+			taoBaoGoods.setCouponLeftCount(itemGoods.optInt("quan_num"));
+			taoBaoGoods.setCouponStartFee(new BigDecimal(itemGoods.optString("quan_tiaojian")));
+			taoBaoGoods.setCouponTotalCount(itemGoods.optInt("quan_num"));
+			taoBaoGoods.setPictUrl(itemGoods.optString("pic"));
+			taoBaoGoods.setPictUrlWhite(itemGoods.optString("pic"));
+			taoBaoGoods.setSellerId(itemGoods.optLong("seller_id"));
+			taoBaoGoods.setShopTitle("");
+			taoBaoGoods.setTitle(itemGoods.optString("title"));
+			taoBaoGoods.setUserType(itemGoods.optInt("istmall"));
+			taoBaoGoods.setZkPrice(new BigDecimal(itemGoods.optString("yuanjia")));
+			taoBaoGoods.setTkRate(new BigDecimal(itemGoods.optString("yongjin")));
+			taoBaoGoods.setTkCommFee(new BigDecimal("0"));
+			taoBaoGoods.setState(0);
+
+			listGoods.add(taoBaoGoods);
+
+			userType = itemGoods.optInt("istmall");
+		}
+		taoBaoShopDTO.setUserType(userType);
+		taoBaoShopDTO.setListGoods(listGoods);
+		return taoBaoShopDTO;
+	}
+
+	public static int RANK_TYPE_TIME = 1;// 瀹炴椂
+	public static int RANK_TYPE_DAY = 2;// 鍏ㄥぉ姒�
+	public static int RANK_TYPE_HOT = 3;// 鐑帹姒�
+	public static int RANK_TYPE_REBUY = 4;// 澶嶈喘姒�
+
+	/**
+	 * 鍚勫ぇ姒滃崟
+	 * 
+	 * @param type
+	 * @return
+	 */
+	public static DaTaoKeGoodsResult getRankingList(int type, Integer cid) {
+		TaoKeAppInfo app = getRandomApp();
+		DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
+		Map<String, String> params = new TreeMap<>();
+		params.put("version", "v1.1.0");
+		params.put("appKey", app.getAppKey());
+		params.put("rankType", type + "");
+		if (cid != null)
+			params.put("cid", cid + "");
+		params.put("sign", getSign(params, app.getAppSecret()));
+		// 鍋�2娆¤姹�
+		String result = null;
+		try {
+			result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-ranking-list", params, new HashMap<>());
+		} catch (Exception e) {
+			result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-ranking-list", params, new HashMap<>());
+		}
+		JSONObject json = JSONObject.fromObject(result);
+		if (json != null) {
+			JSONArray array = json.optJSONArray("data");
+
+			List<DaTaoKeDetailV2> list = new ArrayList<>();
+			for (int i = 0; i < array.size(); i++) {
+				JSONObject itemData = array.optJSONObject(i);
+				DaTaoKeDetailV2 item = parseDaTaoKeDetailV2(itemData);
+				item.setCouponConditions(itemData.optString("couponConditions"));
+				item.setShopType(itemData.optInt("shopType"));
+				item.setOriginalPrice(new BigDecimal(itemData.optString("originalPrice")));
+				item.setMainPic(itemData.optString("mainPic"));
+				list.add(item);
+			}
+			daTaoKeGoodsResult.setGoodsList(list);
+		}
+		return daTaoKeGoodsResult;
+	}
+
+	private static List<DaTaoKeDetailV2> parseDaTaoKeDetailV2List(JSONArray array) {
+		List<DaTaoKeDetailV2> detailList = new ArrayList<>();
+		for (int i = 0; i < array.size(); i++) {
+			DaTaoKeDetailV2 detail = parseDaTaoKeDetailV2(array.optJSONObject(i));
+			detailList.add(detail);
+		}
+		return detailList;
+	}
+
+	private static DaTaoKeDetailV2 parseDaTaoKeDetailV2(JSONObject json) {
+		DaTaoKeDetailV2 detail = gson.fromJson(json.toString(), DaTaoKeDetailV2.class);
+		if (StringUtil.isNullOrEmpty(json.optString("createTime"))) {
+			detail.setCreateTime(
+					new Date(TimeUtil.convertToTimeTemp(json.optString("onSaleTime"), "yyyy-MM-dd HH:mm:ss")));
+		} else {
+			detail.setCreateTime(
+					new Date(TimeUtil.convertToTimeTemp(json.optString("createTime"), "yyyy-MM-dd HH:mm:ss")));
+		}
+		return detail;
+	}
+
+	/**
+	 * 鍚勫ぇ姒滃崟
+	 * 
+	 * @param type
+	 * @return
+	 */
+	public static String getHotWords() {
+		TaoKeAppInfo app = getRandomApp();
+		Map<String, String> params = new TreeMap<>();
+		params.put("version", "v1.0.1");
+		params.put("appKey", app.getAppKey());
+		params.put("sign", getSign(params, app.getAppSecret()));
+
+		String result = null;
+		try {
+			result = HttpUtil.get("https://openapi.dataoke.com/api/category/get-top100", params, new HashMap<>());
+		} catch (Exception e) {
+			result = HttpUtil.get("https://openapi.dataoke.com/api/category/get-top100", params, new HashMap<>());
+		}
+
+		String hotWords = null;
+		JSONObject json = JSONObject.fromObject(result);
+		if (json != null) {
+			json = json.getJSONObject("data");
+			if (json != null) {
+				hotWords = json.optString("hotWords");
+			}
+		}
+		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