From 5981b2cae7c20ec9021c8ccbe1a926f35f640210 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 03 一月 2019 17:43:18 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java |   55 ++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
index 7faf1ba..c846f21 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
@@ -24,6 +24,7 @@
 import com.yeshi.fanli.util.MoneyBigDecimalUtil;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TimeUtil;
+
 import org.yeshi.utils.taobao.TbImgUtil;
 
 import net.sf.json.JSONArray;
@@ -192,6 +193,7 @@
 			goods.setProvcity(item.optString("provcity"));
 			goods.setPictUrl(item.optString("pict_url"));
 			goods.setShopTitle(item.optString("nick"));
+			goods.setSellerId(item.optLong("seller_id"));
 
 			String optString = item.optString("shop_dsr");
 			if (!StringUtil.isNullOrEmpty(optString)) {
@@ -222,6 +224,25 @@
 		}
 		return null;
 	}
+	
+	
+	public static List<TaoBaoGoodsBrief> getBatchGoodsInfo(List<Long> listId) throws TaoKeApiException,TaobaoGoodsDownException {
+		if (listId == null || listId.size() == 0) {
+			throw new TaobaoGoodsDownException(1,"娣樺疂鍟嗗搧ID涓嶈兘涓虹┖");
+		}
+		
+		if ( listId.size() > 40) {
+			throw new TaobaoGoodsDownException(1,"娣樺疂鍟嗗搧ID涓嶈兘瓒呰繃40涓�");
+		}
+		
+		StringBuffer ids = new StringBuffer();
+		for (Long id: listId) {
+			ids.append(id + ",");
+		}
+		
+		return getBatchGoodsInfos(ids.substring(0, ids.length() -1));
+	}
+	
 
 	/**
 	 * 鑾峰彇鍟嗗搧璇︽儏锛岀畝鐗�
@@ -627,6 +648,12 @@
 		if (filter.getEndTkRate() > 0)
 			map.put("end_tk_rate", filter.getEndTkRate() + "");
 
+		if (filter.getStartKaTkRate() > 0)
+			map.put("start_ka_tk_rate", filter.getStartKaTkRate() + "");
+
+		if (filter.getEndKaTkRate() > 0)
+			map.put("end_ka_tk_rate", filter.getEndKaTkRate() + "");
+
 		if (filter.isTmall())
 			map.put("is_tmall", filter.isTmall() + "");
 
@@ -729,7 +756,7 @@
 
 		// 璁剧疆鍙戣揣鍦板潃
 		TaoBaoSearchNav nav = new TaoBaoSearchNav();
-		nav.setName("鍙戣揣鍦�");
+		nav.setName("鍙戣揣鍦伴�夋嫨");
 		nav.setFlag("address");
 		nav.setId(11110);
 		nav.setType("fahuodi");
@@ -953,6 +980,11 @@
 	 * @return
 	 */
 	public static String getTKToken(String logo, String text, String url) {
+		if (text == null)
+			return null;
+		if (text.length() < 5)
+			text = "濂借揣锛�" + text;
+
 		Map<String, String> map = new HashMap<>();
 		map.put("method", "taobao.tbk.tpwd.create");
 		map.put("url", url);
@@ -1033,16 +1065,17 @@
 				return list;
 			JSONArray array = data.optJSONObject("tbk_item_recommend_get_response").optJSONObject("results")
 					.optJSONArray("n_tbk_item");
-			for (int i = 0; i < array.size(); i++) {
-				JSONObject item = array.optJSONObject(i);
-				TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
-				goods.setAuctionId(item.optLong("num_iid"));
-				goods.setTitle(item.optString("title"));
-				goods.setZkPrice(new BigDecimal(item.optString("zk_final_price")));
-				goods.setAuctionUrl(item.optString("item_url"));
-				goods.setPictUrl(item.optString("pict_url"));
-				list.add(goods);
-			}
+			if (array != null)
+				for (int i = 0; i < array.size(); i++) {
+					JSONObject item = array.optJSONObject(i);
+					TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
+					goods.setAuctionId(item.optLong("num_iid"));
+					goods.setTitle(item.optString("title"));
+					goods.setZkPrice(new BigDecimal(item.optString("zk_final_price")));
+					goods.setAuctionUrl(item.optString("item_url"));
+					goods.setPictUrl(item.optString("pict_url"));
+					list.add(goods);
+				}
 		}
 		return list;
 	}

--
Gitblit v1.8.0