From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java | 320 +++++++++++++++++++++-------------------------------
1 files changed, 131 insertions(+), 189 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 558b6ef..0da8b85 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,11 @@
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;
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;
@@ -22,6 +22,7 @@
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;
@@ -224,6 +225,8 @@
if (!StringUtil.isNullOrEmpty(item.optString("material_lib_type")))
goods.setMaterialLibType(item.optInt("material_lib_type"));
+ else
+ goods.setMaterialLibType(0);
return goods;
}
@@ -337,7 +340,9 @@
goods.setFreeShipment(1);
if ("1".equalsIgnoreCase(item.optString("material_lib_type")))
- ;
+ goods.setMaterialLibType(1);
+ else
+ goods.setMaterialLibType(0);
goodsList.add(goods);
}
@@ -365,6 +370,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());
// 鍒ゆ柇鏄惁鏈変紭鎯犲埜
@@ -384,6 +390,7 @@
g.setCouponStartFee(new BigDecimal(0));
}
g.setCreatetime(new Date());
+ g.setMaterialLibType(goods.getMaterialLibType());
return g;
}
}
@@ -451,6 +458,7 @@
g.setCouponStartFee(new BigDecimal(0));
}
g.setCreatetime(new Date());
+ g.setMaterialLibType(goods.getMaterialLibType());
return g;
}
}
@@ -1095,6 +1103,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,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 鎸夎澶囩寽浣犲枩娆�
*
@@ -1594,6 +1661,7 @@
.optString("relation_id");
} catch (TaoKeApiException e) {
e.printStackTrace();
+ LogHelper.error("娓犻亾ID鐢宠鍑洪敊:" + resultJSON);
}
return null;
@@ -1616,195 +1684,10 @@
.optString("special_id");
} catch (TaoKeApiException e) {
e.printStackTrace();
+ LogHelper.error("浼氬憳杩愯惀ID鐢宠鍑洪敊:" + resultJSON);
}
return null;
- }
-
- /**
- * 鑾峰彇浼氬憳璁㈠崟
- *
- * @param startTime
- * @param appKey
- * @param appSecret
- * @return
- */
- public static List<TaoBaoOrder> getTaoBaoSpecialOrder(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", "3");
- 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;
- }
-
- /**
- * 鑾峰彇娓犻亾璁㈠崟
- *
- * @param startTime
- * @param appKey
- * @param appSecret
- * @return
- */
- public static List<TaoBaoOrder> getTaoBaoRelationOrder(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", "2");
- 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;
- }
-
- /**
- * 鑾峰彇鎵�鏈夌殑璁㈠崟锛堜笉甯︽笭閬撲俊鎭笌浼氬憳淇℃伅锛�
- *
- * @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;
- }
-
- 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);
- 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));
- taoBaoOrder.setTkRate(new BigDecimal(item.optString("commission_rate")));
- taoBaoOrder.setTransactionPlatform(item.optString("terminal_type"));
- taoBaoOrder.setRelationId(item.optString("relation_id"));
- taoBaoOrder.setSpecialId(item.optString("special_id"));
- orderList.add(taoBaoOrder);
- }
-
- return orderList;
}
public static void specialConvertItem(Long auctionId, TaoKeAppInfo app) {
@@ -1839,13 +1722,55 @@
String itemLink = resultJSON.optString("item_url");
TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
goods.setAuctionUrl(itemLink);
- goods.setCouponLink(couponLink);
+ 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");
+ 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();
+ }
+
}
// AA5ISJ
@@ -1938,8 +1863,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