From 8cb7ec4a35a38ae91d0eed17cde711e81d2b2bbf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:37:49 +0800
Subject: [PATCH] 合并

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java |  184 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 165 insertions(+), 19 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 dcbd60e..666c81e 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
@@ -10,6 +10,7 @@
 import org.yeshi.utils.taobao.TbImgUtil;
 
 import com.taobao.api.ApiException;
+import com.yeshi.fanli.dto.taobao.TaoBaoShopInfoDTO;
 import com.yeshi.fanli.entity.taobao.RelateGoods;
 import com.yeshi.fanli.entity.taobao.SearchFilter;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -21,10 +22,12 @@
 import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
 import com.yeshi.fanli.exception.taobao.TaoKeApiException;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
+import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.log.TaoKeLogHelper;
 import com.yeshi.fanli.tag.PageEntity;
 import com.yeshi.fanli.util.MoneyBigDecimalUtil;
 import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TaoBaoConstant;
 import com.yeshi.fanli.util.TimeUtil;
 
 import net.sf.json.JSONArray;
@@ -223,6 +226,8 @@
 
 			if (!StringUtil.isNullOrEmpty(item.optString("material_lib_type")))
 				goods.setMaterialLibType(item.optInt("material_lib_type"));
+			else
+				goods.setMaterialLibType(0);
 
 			return goods;
 		}
@@ -336,7 +341,9 @@
 					goods.setFreeShipment(1);
 
 				if ("1".equalsIgnoreCase(item.optString("material_lib_type")))
-					;
+					goods.setMaterialLibType(1);
+				else
+					goods.setMaterialLibType(0);
 
 				goodsList.add(goods);
 			}
@@ -364,6 +371,7 @@
 				goods.getUserType());
 		if (result != null && result.getTaoBaoGoodsBriefs() != null)
 			for (TaoBaoGoodsBrief g : result.getTaoBaoGoodsBriefs()) {
+				System.out.println(goods.getAuctionId() + ":" + g.getAuctionId());
 				if (goods.getAuctionId().longValue() == g.getAuctionId()) {
 					g.setId(goods.getAuctionId());
 					// 鍒ゆ柇鏄惁鏈変紭鎯犲埜
@@ -383,6 +391,7 @@
 						g.setCouponStartFee(new BigDecimal(0));
 					}
 					g.setCreatetime(new Date());
+					g.setMaterialLibType(goods.getMaterialLibType());
 					return g;
 				}
 			}
@@ -450,6 +459,7 @@
 						g.setCouponStartFee(new BigDecimal(0));
 					}
 					g.setCreatetime(new Date());
+					g.setMaterialLibType(goods.getMaterialLibType());
 					return g;
 				}
 			}
@@ -1094,6 +1104,8 @@
 					goods.setZkPrice(new BigDecimal(item.optString("zk_final_price")));
 					goods.setAuctionUrl(item.optString("item_url"));
 					goods.setPictUrl(item.optString("pict_url"));
+					goods.setSalesCount(item.optString("volume"));
+					goods.setUserType(item.optInt("user_type"));
 					list.add(goods);
 				}
 		}
@@ -1226,6 +1238,63 @@
 		return list;
 	}
 
+	
+	/**
+	 * 搴楅摵鎼滅储
+	 * 
+	 * @param key
+	 *            -搴楅摵鍚嶇О
+	 * @param page
+	 *            -椤电爜
+	 * @return
+	 */
+	public static TaoBaoShopInfoDTO searchShop(String key, int page, int pageSize) {
+		TaoBaoShopInfoDTO dto = new TaoBaoShopInfoDTO();
+		if (StringUtil.isNullOrEmpty(key))
+			return dto;
+		
+		PageEntity pageEntity = new PageEntity();
+		List<TaoBaoShopInfo> list = new ArrayList<>();
+		Map<String, String> map = new HashMap<>();
+		map.put("method", "taobao.tbk.shop.get");
+		map.put("fields", "user_id,shop_title,shop_type,seller_nick,pict_url,shop_url");
+		map.put("q", key);
+		map.put("page_size", pageSize + "");
+		map.put("page_no", page + "");
+		String resultStr = TaoKeBaseUtil.baseRequestForThreeTimes(map, true);
+		JSONObject resultDate = JSONObject.fromObject(resultStr);
+		if (resultDate.optJSONObject("tbk_shop_get_response") != null
+				&& resultDate.optJSONObject("tbk_shop_get_response").optJSONObject("results") != null) {
+			JSONArray array = resultDate.optJSONObject("tbk_shop_get_response").optJSONObject("results")
+					.optJSONArray("n_tbk_shop");
+			if (array != null) {
+				for (int i = 0; i < array.size(); i++) {
+					JSONObject item = array.optJSONObject(i);
+					TaoBaoShopInfo info = new TaoBaoShopInfo();
+					info.setPictureUrl(item.optString("pict_url"));
+					info.setSellerNick(item.optString("seller_nick"));
+					info.setShopTitle(item.optString("shop_title"));
+					info.setShopType(item.optString("shop_type"));
+					info.setShopUrl(item.optString("shop_url"));
+					info.setUserId(item.optLong("user_id"));
+					list.add(info);
+				}
+			}
+			
+			JSONObject optJSONObject = resultDate.optJSONObject("tbk_shop_get_response");
+			int totalResults = optJSONObject.getInt("total_results");
+			int totalPage = totalResults % pageSize == 0 ? totalResults / pageSize : totalResults / pageSize + 1;
+			pageEntity.setTotalCount(totalResults);
+			pageEntity.setTotalPage(totalPage);
+		}
+		pageEntity.setPageIndex(page);
+		pageEntity.setPageSize(pageSize);
+		
+		dto.setListInfo(list);
+		dto.setPage(pageEntity);
+		return dto;
+	}
+	
 	/**
 	 * TODO 鎸夎澶囩寽浣犲枩娆�
 	 * 
@@ -1593,6 +1662,7 @@
 					.optString("relation_id");
 		} catch (TaoKeApiException e) {
 			e.printStackTrace();
+			LogHelper.error("娓犻亾ID鐢宠鍑洪敊:" + resultJSON);
 		}
 
 		return null;
@@ -1615,37 +1685,96 @@
 					.optString("special_id");
 		} catch (TaoKeApiException e) {
 			e.printStackTrace();
+			LogHelper.error("浼氬憳杩愯惀ID鐢宠鍑洪敊:" + resultJSON);
 		}
 
 		return null;
 	}
 
-	public static void getTaoBaoOrder(String appKey, String appSecret) {
+	public static void specialConvertItem(Long auctionId, TaoKeAppInfo app) {
+		String pid = app.getPid();
+		String[] sts = pid.split("_");
 		Map<String, String> map = new HashMap<>();
-		map.put("method", "taobao.tbk.order.get");
-		map.put("fields",
-				"tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk_status,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,relation_id,tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,special_id,click_time,relation_id,special_id");
-		map.put("start_time", "2019-01-27 21:23:00");
-		map.put("span", "1200");
-		map.put("tk_status", "1");
-		map.put("order_query_type","create_time");
-		map.put("page_no", 1+"");
-		map.put("page_size", 100+"");
-		
-		
-		
-		
-
-		TaoKeAppInfo app = new TaoKeAppInfo();
-		app.setAppKey(appKey);
-		app.setAppSecret(appSecret);
+		map.put("method", "taobao.tbk.item.convert");
+		map.put("num_iids", auctionId + "");
+		map.put("fields", "num_iid,click_url");
+		map.put("adzone_id", sts[3]);
+		map.put("platform", "2");
 		try {
 			JSONObject json = TaoKeBaseUtil.baseRequest(map, app);
 			System.out.println(json.toString());
 		} catch (TaoKeApiException e) {
 			e.printStackTrace();
 		}
+	}
 
+	public static TaoBaoGoodsBrief specialConvertCoupon(Long auctionId, TaoKeAppInfo app) {
+		String pid = app.getPid();
+		String[] sts = pid.split("_");
+		Map<String, String> map = new HashMap<>();
+		map.put("method", "taobao.tbk.coupon.convert");
+		map.put("item_id", auctionId + "");
+		map.put("adzone_id", sts[3]);
+		try {
+			JSONObject json = TaoKeBaseUtil.baseRequest(map, app);
+			JSONObject resultJSON = json.optJSONObject("tbk_coupon_convert_response").optJSONObject("result")
+					.optJSONObject("results");
+			String couponLink = resultJSON.optString("coupon_click_url");
+			String itemLink = resultJSON.optString("item_url");
+			TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
+			goods.setAuctionUrl(itemLink);
+			if (!StringUtil.isNullOrEmpty(resultJSON.optString("coupon_info"))) {
+				goods.setCouponLink(couponLink);
+				goods.setCouponInfo(resultJSON.optString("coupon_info"));
+			}
+			String tkRate = resultJSON.optString("max_commission_rate");
+			if (!StringUtil.isNullOrEmpty(tkRate)) {
+				goods.setTkRate(new BigDecimal(tkRate));
+			}
+			return goods;
+		} catch (TaoKeApiException e) {
+			e.printStackTrace();
+		}
+
+		return null;
+	}
+
+	public static void juHuaSuan() {
+		Map<String, String> map = new HashMap<>();
+		map.put("method", "taobao.ju.items.search");
+		map.put("current_page", 1 + "");
+		map.put("page_size", 100 + "");
+		map.put("pid", "mm_124933865_43788020_381938426");
+
+		TaoKeAppInfo app = new TaoKeAppInfo();
+		app.setAppKey("24838852");
+		app.setAppSecret("bc8265e2bf8d8115329d652f9d3d4cd8");
+
+		try {
+			JSONObject json = TaoKeBaseUtil.baseRequest(map, app);
+			System.out.println(json);
+		} catch (TaoKeApiException e) {
+			e.printStackTrace();
+		}
+
+	}
+	
+	public static void taoKeContent() {
+		Map<String, String> map = new HashMap<>();
+		map.put("method", "taobao.tbk.content.get");
+		map.put("adzone_id",TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT.split("_")[3]);
+		map.put("type", "1");
+		
+//		map.put("method", "taobao.tbk.content.get");
+		TaoKeAppInfo app = new TaoKeAppInfo();
+		app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);
+		app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+		try {
+			JSONObject json = TaoKeBaseUtil.baseRequest(map,app);
+			System.out.println(json);
+		} catch (TaoKeApiException e) {
+			e.printStackTrace();
+		}
 	}
 
 	// AA5ISJ
@@ -1738,8 +1867,25 @@
 		}
 		goods.setReservePrice(new BigDecimal(0));
 		goods.setTotalFee(new BigDecimal("0"));
+		goods.setPictUrlWhite(item.optString("white_image"));
 		return goods;
 	}
+	
+	public static void getShopGoodsList(Long shopId)
+	{
+		Map<String, String> map = new HashMap<>();
+		map.put("method", "tmall.omni.pc.iteminfo.getbyshopid");
+		map.put("shop_id",shopId+"");
+		TaoKeAppInfo app = new TaoKeAppInfo();
+		app.setAppKey("24838852");
+		app.setAppSecret("bc8265e2bf8d8115329d652f9d3d4cd8");
+		try {
+			JSONObject json = TaoKeBaseUtil.baseRequest(map,app);
+			System.out.println(json);
+		} catch (TaoKeApiException e) {
+			e.printStackTrace();
+		}
+	}
 
 }
 

--
Gitblit v1.8.0