From 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 29 四月 2019 08:59:47 +0800
Subject: [PATCH] Merge branch 'div_develop' into master_develop
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 110 insertions(+), 7 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 c1a4b0f..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;
@@ -25,7 +25,6 @@
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.TimeUtil;
@@ -226,6 +225,8 @@
if (!StringUtil.isNullOrEmpty(item.optString("material_lib_type")))
goods.setMaterialLibType(item.optInt("material_lib_type"));
+ else
+ goods.setMaterialLibType(0);
return goods;
}
@@ -339,7 +340,9 @@
goods.setFreeShipment(1);
if ("1".equalsIgnoreCase(item.optString("material_lib_type")))
- ;
+ goods.setMaterialLibType(1);
+ else
+ goods.setMaterialLibType(0);
goodsList.add(goods);
}
@@ -367,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());
// 鍒ゆ柇鏄惁鏈変紭鎯犲埜
@@ -386,6 +390,7 @@
g.setCouponStartFee(new BigDecimal(0));
}
g.setCreatetime(new Date());
+ g.setMaterialLibType(goods.getMaterialLibType());
return g;
}
}
@@ -453,6 +458,7 @@
g.setCouponStartFee(new BigDecimal(0));
}
g.setCreatetime(new Date());
+ g.setMaterialLibType(goods.getMaterialLibType());
return g;
}
}
@@ -1097,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);
}
}
@@ -1229,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 鎸夎澶囩寽浣犲枩娆�
*
@@ -1657,8 +1722,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();
@@ -1671,15 +1742,30 @@
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);
+ } 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();
@@ -1777,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