From 1e92eff67b997263ecefa255c63eb6641c47b57f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 14 六月 2019 10:22:33 +0800
Subject: [PATCH] 设备消息BUG解决,品牌

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java |  530 +++++++++++++++++++++++++---------------------------------
 1 files changed, 229 insertions(+), 301 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 ff6aa07..f02503e 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,11 +10,12 @@
 import org.yeshi.utils.taobao.TbImgUtil;
 
 import com.taobao.api.ApiException;
+import com.yeshi.fanli.dto.taobao.TaoBaoShopInfoDTO;
+import com.yeshi.fanli.dto.taobao.TaoLiJinDTO;
 import com.yeshi.fanli.entity.taobao.RelateGoods;
 import com.yeshi.fanli.entity.taobao.SearchFilter;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.entity.taobao.TaoBaoHead;
-import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
 import com.yeshi.fanli.entity.taobao.TaoBaoProvince;
 import com.yeshi.fanli.entity.taobao.TaoBaoSearchNav;
 import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
@@ -25,9 +26,9 @@
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.log.TaoKeLogHelper;
 import com.yeshi.fanli.tag.PageEntity;
-import com.yeshi.fanli.util.Constant;
 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;
@@ -226,6 +227,8 @@
 
 			if (!StringUtil.isNullOrEmpty(item.optString("material_lib_type")))
 				goods.setMaterialLibType(item.optInt("material_lib_type"));
+			else
+				goods.setMaterialLibType(0);
 
 			return goods;
 		}
@@ -339,7 +342,9 @@
 					goods.setFreeShipment(1);
 
 				if ("1".equalsIgnoreCase(item.optString("material_lib_type")))
-					;
+					goods.setMaterialLibType(1);
+				else
+					goods.setMaterialLibType(0);
 
 				goodsList.add(goods);
 			}
@@ -367,6 +372,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());
 					// 鍒ゆ柇鏄惁鏈変紭鎯犲埜
@@ -386,6 +392,7 @@
 						g.setCouponStartFee(new BigDecimal(0));
 					}
 					g.setCreatetime(new Date());
+					g.setMaterialLibType(goods.getMaterialLibType());
 					return g;
 				}
 			}
@@ -453,6 +460,7 @@
 						g.setCouponStartFee(new BigDecimal(0));
 					}
 					g.setCreatetime(new Date());
+					g.setMaterialLibType(goods.getMaterialLibType());
 					return g;
 				}
 			}
@@ -1097,6 +1105,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);
 				}
 		}
@@ -1227,6 +1237,62 @@
 				}
 		}
 		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;
 	}
 
 	/**
@@ -1625,300 +1691,6 @@
 		return null;
 	}
 
-	/**
-	 * 鑾峰彇浼氬憳璁㈠崟
-	 * 
-	 * @param startTime-寮�濮嬫椂闂�
-	 * @param page-椤电爜
-	 * @param appKey
-	 * @param appSecret
-	 * @return
-	 */
-	public static List<TaoBaoOrder> getTaoBaoSpecialOrder(String startTime, int page, String appKey, String appSecret) {
-		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", startTime);
-		map.put("tk_status", "1");
-		map.put("order_query_type", "create_time");
-		map.put("order_scene", "3");
-		map.put("page_no", page + "");
-		map.put("page_size", 100 + "");
-
-		TaoKeAppInfo app = new TaoKeAppInfo();
-		app.setAppKey(appKey);
-		app.setAppSecret(appSecret);
-		try {
-			JSONObject json = TaoKeBaseUtil.baseRequest(map, app);
-			System.out.println(json.toString());
-			return parseTaoBaoOrder(json.toString());
-		} catch (TaoKeApiException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	/**
-	 * 鑾峰彇绗笁鏂逛細鍛樿鍗�
-	 * 
-	 * @param startTime
-	 * @param page
-	 * @param appKey
-	 * @param appSecret
-	 * @return
-	 */
-	public static List<TaoBaoOrder> getTaoBaoSpecialThirdOrder(String startTime, int page, String appKey,
-			String appSecret) {
-		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", startTime);
-		map.put("tk_status", "1");
-		map.put("order_query_type", "create_time");
-		map.put("order_scene", "3");
-		map.put("page_no", page + "");
-		map.put("page_size", 100 + "");
-		map.put("order_count_type", "2");
-
-		TaoKeAppInfo app = new TaoKeAppInfo();
-		app.setAppKey(appKey);
-		app.setAppSecret(appSecret);
-		try {
-			JSONObject json = TaoKeBaseUtil.baseRequest(map, app);
-			System.out.println(json.toString());
-			return parseTaoBaoOrder(json.toString());
-		} catch (TaoKeApiException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	/**
-	 * 鑾峰彇娓犻亾璁㈠崟
-	 * 
-	 * @param startTime
-	 * @param appKey
-	 * @param appSecret
-	 * @return
-	 */
-	public static List<TaoBaoOrder> getTaoBaoRelationOrder(String startTime, int page, String appKey,
-			String appSecret) {
-		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", startTime);
-		map.put("span", "1200");
-		map.put("tk_status", "1");
-		map.put("order_query_type", "create_time");
-		map.put("order_scene", "2");
-		map.put("page_no", page + "");
-		map.put("page_size", 100 + "");
-
-		TaoKeAppInfo app = new TaoKeAppInfo();
-		app.setAppKey(appKey);
-		app.setAppSecret(appSecret);
-		try {
-			JSONObject json = TaoKeBaseUtil.baseRequest(map, app);
-
-			return parseTaoBaoOrder(json.toString());
-		} catch (TaoKeApiException e) {
-			e.printStackTrace();
-		}
-
-		return null;
-	}
-
-	/**
-	 * 绗笁鏂规笭閬撹鍗�
-	 * 
-	 * @param startTime
-	 * @param page
-	 * @param appKey
-	 * @param appSecret
-	 * @return
-	 */
-	public static List<TaoBaoOrder> getTaoBaoRelationThirdOrder(String startTime, int page, String appKey,
-			String appSecret) {
-		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", startTime);
-		map.put("span", "1200");
-		map.put("tk_status", "1");
-		map.put("order_query_type", "create_time");
-		map.put("order_scene", "2");
-		map.put("page_no", page + "");
-		map.put("page_size", 100 + "");
-		map.put("order_count_type", "2");
-
-		TaoKeAppInfo app = new TaoKeAppInfo();
-		app.setAppKey(appKey);
-		app.setAppSecret(appSecret);
-		try {
-			JSONObject json = TaoKeBaseUtil.baseRequest(map, app);
-			return parseTaoBaoOrder(json.toString());
-		} catch (TaoKeApiException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	/**
-	 * 鑾峰彇鎵�鏈夌殑璁㈠崟锛堜笉甯︽笭閬撲俊鎭笌浼氬憳淇℃伅锛�
-	 * 
-	 * @param startTime
-	 * @param appKey
-	 * @param appSecret
-	 * @return
-	 */
-	public static List<TaoBaoOrder> getTaoBaoAllOrder(String startTime, String appKey, String appSecret) {
-		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", startTime);
-		map.put("span", "1200");
-		map.put("tk_status", "1");
-		map.put("order_query_type", "create_time");
-		map.put("order_scene", "1");// 鎵�鏈夎鍗�
-		map.put("page_no", 1 + "");
-		map.put("page_size", 100 + "");
-
-		TaoKeAppInfo app = new TaoKeAppInfo();
-		app.setAppKey(appKey);
-		app.setAppSecret(appSecret);
-		try {
-			JSONObject json = TaoKeBaseUtil.baseRequest(map, app);
-			return parseTaoBaoOrder(json.toString());
-		} catch (TaoKeApiException e) {
-			e.printStackTrace();
-		}
-
-		return null;
-	}
-	
-	
-	public static void punish()
-	{
-		Map<String, String> map = new HashMap<>();
-		map.put("method", "taobao.tbk.dg.punish.order.get");
-		map.put("span", "3600");
-		map.put("page_no", "1");
-		map.put("page_size", "20");
-		map.put("start_time", "2019-01-01 00:00:00");
-//		map.put("start_time", "2019-01-01 00:00:00");
-		TaoKeAppInfo app = new TaoKeAppInfo();
-		app.setAppKey(Constant.TAOBAO_AUTH_APPKEY);
-		app.setAppSecret(Constant.TAOBAO_AUTH_APPSECRET);
-		try {
-			JSONObject json = TaoKeBaseUtil.baseRequest(map, app);
-		} catch (TaoKeApiException e) {
-			e.printStackTrace();
-		}
-	}
-
-	private static List<TaoBaoOrder> parseTaoBaoOrder(String response) {
-
-		List<TaoBaoOrder> orderList = new ArrayList<>();
-
-		JSONObject data = JSONObject.fromObject(response);
-		if (data.optJSONObject("tbk_order_get_response") == null)
-			return orderList;
-		if (data.optJSONObject("tbk_order_get_response").optJSONObject("results") == null)
-			return orderList;
-		if (data.optJSONObject("tbk_order_get_response").optJSONObject("results").optJSONArray("n_tbk_order") == null)
-			return orderList;
-
-		JSONArray array = data.optJSONObject("tbk_order_get_response").optJSONObject("results")
-				.optJSONArray("n_tbk_order");
-		for (int i = 0; i < array.size(); i++) {
-
-			JSONObject item = array.optJSONObject(i);
-			try {
-				TaoBaoOrder taoBaoOrder = new TaoBaoOrder();
-				taoBaoOrder.setAdPositionId(item.optString("adzone_id"));
-				taoBaoOrder.setAdPositionName(item.optString("adzone_name"));
-				taoBaoOrder.setAuctionId(item.optLong("num_iid"));
-				taoBaoOrder.setClassName(item.optString("auction_category"));
-				taoBaoOrder.setClickTime(item.optString("click_time"));
-				taoBaoOrder.setCount(item.optInt("item_num"));
-				taoBaoOrder.setCreateTime(item.optString("create_time"));
-				if (!StringUtil.isNullOrEmpty(item.optString("total_commission_fee")))
-					taoBaoOrder.seteIncome(new BigDecimal(item.optString("total_commission_fee")));
-				else
-					taoBaoOrder.seteIncome(new BigDecimal(0));
-
-				if (!StringUtil.isNullOrEmpty(item.optString("pub_share_pre_fee")))
-					taoBaoOrder.setEstimate(new BigDecimal(item.optString("pub_share_pre_fee")));
-				else
-					taoBaoOrder.setEstimate(new BigDecimal(0));
-				taoBaoOrder.setiRatio(new BigDecimal(item.optString("income_rate")).multiply(new BigDecimal(100)));
-				taoBaoOrder.setLatestUpdateTime(null);
-				taoBaoOrder.setManagerWangWang(null);
-				taoBaoOrder.setOrderBy(null);
-				taoBaoOrder.setOrderId(item.optString("trade_parent_id"));
-				if (item.optInt("tk_status") == 12)
-					taoBaoOrder.setOrderState("璁㈠崟浠樻");
-				else if (item.optInt("tk_status") == 3)
-					taoBaoOrder.setOrderState("璁㈠崟缁撶畻");
-				else if (item.optInt("tk_status") == 13)
-					taoBaoOrder.setOrderState("璁㈠崟澶辨晥");
-				else if (item.optInt("tk_status") == 14)
-					taoBaoOrder.setOrderState("璁㈠崟鎴愬姛");
-
-				taoBaoOrder.setOrderType(item.optString("order_type"));
-				if (!StringUtil.isNullOrEmpty(item.optString("alipay_total_price")))
-					taoBaoOrder.setPayment(new BigDecimal(item.optString("alipay_total_price")));
-				else
-					taoBaoOrder.setPayment(new BigDecimal(0));
-				taoBaoOrder.setPrice(new BigDecimal(item.optString("price")));
-				if (!StringUtil.isNullOrEmpty(item.optString("alipay_total_price")))
-					taoBaoOrder.setSettlement(new BigDecimal(item.optString("alipay_total_price")));
-				else
-					taoBaoOrder.setSettlement(new BigDecimal(0));
-				taoBaoOrder.setSettlementTime(item.optString("earning_time"));
-				taoBaoOrder.setShop(item.optString("seller_shop_title"));
-				taoBaoOrder.setSourceMediaId(item.optString("site_id"));
-				taoBaoOrder.setSourceMediaName(item.optString("site_name"));
-				taoBaoOrder.setsRatio(null);
-				taoBaoOrder.setSubsidy(null);
-				if (!StringUtil.isNullOrEmpty(item.optString("subsidy_rate")))
-					taoBaoOrder.setSubsidyRatio(
-							new BigDecimal(item.optString("subsidy_rate")).multiply(new BigDecimal(100)));
-				taoBaoOrder.setSubsidyType(item.optString("subsidy_type"));
-				taoBaoOrder.setTechnologySupportPercent(null);
-				taoBaoOrder.setThirdService(null);
-				taoBaoOrder.setTitle(item.optString("item_title"));
-				if (!StringUtil.isNullOrEmpty(item.optString("total_commission_fee")))
-					taoBaoOrder.setTkMoney(new BigDecimal(item.optString("total_commission_fee")));
-				else
-					taoBaoOrder.setTkMoney(new BigDecimal(0));
-				if (!StringUtil.isNullOrEmpty(item.optString("commission_rate")))
-					taoBaoOrder
-							.setTkRate(new BigDecimal(item.optString("commission_rate")).multiply(new BigDecimal(100)));
-				else if (!StringUtil.isNullOrEmpty(item.optString("total_commission_rate")))
-					taoBaoOrder.setTkRate(
-							new BigDecimal(item.optString("total_commission_rate")).multiply(new BigDecimal(100)));
-				taoBaoOrder.setTransactionPlatform(item.optString("terminal_type"));
-				taoBaoOrder.setRelationId(item.optString("relation_id"));
-				taoBaoOrder.setSpecialId(item.optString("special_id"));
-				taoBaoOrder.setTradeId(item.optString("trade_id"));
-				orderList.add(taoBaoOrder);
-			} catch (Exception e) {
-				try {
-					LogHelper.errorDetailInfo(e, "璁㈠崟鍙蜂俊鎭�:" + item.toString(), "璁㈠崟瑙f瀽鍑洪敊");
-				} catch (Exception e1) {
-				}
-			}
-		}
-
-		return orderList;
-	}
-
 	public static void specialConvertItem(Long auctionId, TaoKeAppInfo app) {
 		String pid = app.getPid();
 		String[] sts = pid.split("_");
@@ -1951,8 +1723,14 @@
 			String itemLink = resultJSON.optString("item_url");
 			TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
 			goods.setAuctionUrl(itemLink);
-			if (!StringUtil.isNullOrEmpty(resultJSON.optString("coupon_info")))
+			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();
@@ -1965,13 +1743,13 @@
 		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("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);
@@ -1979,6 +1757,45 @@
 			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("count", "100");
+
+		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();
+		}
+	}
+
+	public static void taoKeContentSource(String contentId, String source) {
+		Map<String, String> map = new HashMap<>();
+		map.put("method", "taobao.tbk.dg.optimus.material");
+		map.put("adzone_id", TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT.split("_")[3]);
+		map.put("page_size", "10");
+		map.put("page_no", "1");
+		map.put("content_id", contentId);
+		map.put("content_source", source);
+		map.put("material_id", "1");
+
+		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
@@ -2071,9 +1888,120 @@
 		}
 		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();
+		}
+	}
+
+	public static void getTaoKeContentEffective() {
+		Map<String, String> map = new HashMap<>();
+		map.put("method", "taobao.tbk.dg.optimus.material");
+		map.put("adzone_id", TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID.split("_")[3]);
+		map.put("page_no", "1");
+		map.put("page_size", "20");
+		map.put("content_id", "8872035");
+
+		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();
+		}
+
+	}
+
+	public static void getTaoKeContent() {
+		Map<String, String> map = new HashMap<>();
+		map.put("method", "taobao.tbk.content.get");
+		map.put("adzone_id", TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID.split("_")[3]);
+		map.put("type", "1");
+
+		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();
+		}
+
+	}
+
+	// 娣樼ぜ閲戝垱寤�
+
+	public static TaoLiJinDTO createTaoLiJin(Long auctionId, String name, BigDecimal perface, int totalNum,
+			int useDayLimit, Date sendStartTime, Date sendEndTime, Date useStartTime) {
+		Map<String, String> map = new HashMap<>();
+		map.put("method", "taobao.tbk.dg.vegas.tlj.create");
+		map.put("adzone_id", TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT.split("_")[3]);
+		map.put("item_id", auctionId + "");
+		map.put("total_num", totalNum + "");
+		map.put("name", name);
+		map.put("user_total_win_num_limit", "1");
+		map.put("security_switch", "false");
+		map.put("per_face", perface.toString());
+		map.put("send_start_time", TimeUtil.getGernalTime(sendStartTime.getTime(), "yyyy-MM-dd HH:mm:ss"));
+		map.put("send_end_time", TimeUtil.getGernalTime(sendEndTime.getTime(), "yyyy-MM-dd HH:mm:ss"));
+		map.put("use_end_time", useDayLimit + "");
+		map.put("use_end_time_mode", "1");
+		map.put("use_start_time", TimeUtil.getGernalTime(useStartTime.getTime(), "yyyy-MM-dd HH:mm:ss"));
+
+		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);
+			JSONObject root = json.optJSONObject("tbk_dg_vegas_tlj_create_response");
+			if (root != null && root.optJSONObject("result") != null) {
+				if (root.optJSONObject("result").optBoolean("success")) {
+					JSONObject modelJson = root.optJSONObject("result").optJSONObject("model");
+					TaoLiJinDTO dto = new TaoLiJinDTO();
+					dto.setRightsId(modelJson.optString("rights_id"));
+					dto.setSendUrl(modelJson.optString("send_url"));
+					return dto;
+				}
+			}
+		} catch (TaoKeApiException e) {
+			e.printStackTrace();
+		}
+
+		return null;
+	}
+
+	// lCj1Alo8b9L4Ed6yJLq6iqJ7%2BkHL3AEW
+
+	public static void getTaoLiJinEffective() {
+		Map<String, String> map = new HashMap<>();
+		map.put("method", "taobao.tbk.dg.vegas.tlj.instance.report");
+		map.put("rights_id", "ZrIIvF/nd7SlL5Bg59eTK6J7+kHL3AEW");
+
+		TaoKeAppInfo app = new TaoKeAppInfo();
+		app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);
+		app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+
+		String json = TaoKeBaseUtil.baseRequestForThreeTimes(map, app);
+		System.out.println(json);
+	}
+
 }
 
 class QuanInfo {

--
Gitblit v1.8.0