From 8d84ca36593e33de7e0b604824c471db3587fdb4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 17 一月 2020 16:53:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 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 fa9a191..6440da2 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
@@ -22,6 +22,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoShopInfo;
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
import com.yeshi.fanli.exception.taobao.TaoBaoAuthException;
+import com.yeshi.fanli.exception.taobao.TaoBaoTokenParseException;
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.tlj.TaoLiJinCreateException;
@@ -914,6 +915,9 @@
if (!StringUtil.isNullOrEmpty(item.optString("reserve_price")))
goods.setReservePrice(new BigDecimal(item.optString("reserve_price")));
goods.setTotalFee(new BigDecimal("0"));
+ // 鎺ㄨ崘璇�
+ goods.setDescription(item.optString("item_description"));
+
goods = loadYuShouInfo(goods, item);
return goods;
}
@@ -1343,23 +1347,27 @@
* @param idfa
* @return
*/
- public static TaoBaoSearchResult guessDeviceLike(int page, int pageSize, String imei, String idfa) {
+ public static TaoBaoSearchResult guessDeviceLike(int page, int pageSize, String imei, String idfa, String utdid) {
List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
Map<String, String> map = new HashMap<>();
map.put("method", "taobao.tbk.dg.optimus.material");
map.put("page_no", page + "");
map.put("page_size", pageSize + "");
map.put("material_id", "6708");
- if (StringUtil.isNullOrEmpty(imei) && StringUtil.isNullOrEmpty(idfa))
+ if (StringUtil.isNullOrEmpty(imei) && StringUtil.isNullOrEmpty(idfa) && StringUtil.isNullOrEmpty(utdid))
return null;
- map.put("device_encrypt", "MD5");
if (!StringUtil.isNullOrEmpty(imei)) {
+ map.put("device_encrypt", "MD5");
map.put("device_value", StringUtil.Md5(imei));
map.put("device_type", "IMEI");
- } else {
+ } else if (!StringUtil.isNullOrEmpty(idfa)) {
+ map.put("device_encrypt", "MD5");
map.put("device_value", StringUtil.Md5(idfa));
map.put("device_type", "IDFA");
+ } else if (!StringUtil.isNullOrEmpty(utdid)) {
+ map.put("device_value", utdid);
+ map.put("device_type", "UTDID");
}
JSONObject resultJSON = null;
@@ -1851,7 +1859,7 @@
* @param token
* @return
*/
- public static Long tokenConvertAuctionId(String token) {
+ public static Long tokenConvertAuctionId(String token) throws TaoBaoTokenParseException {
Map<String, String> map = new HashMap<>();
map.put("method", "taobao.tbk.tpwd.convert");
map.put("password_content", token);
@@ -1861,14 +1869,24 @@
app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
try {
JSONObject json = TaoKeBaseUtil.baseRequest(map, app);
+
try {
return json.optJSONObject("tbk_tpwd_convert_response").optJSONObject("data").optLong("num_iid");
} catch (Exception e) {
+
return null;
}
} catch (TaoKeApiException e) {
- e.printStackTrace();
+ JSONObject msg = null;
+ try {
+ msg = JSONObject.fromObject(e.getMsg());
+ } catch (Exception e2) {
+ }
+ if (msg != null && msg.optJSONObject("error_response") != null) {
+ throw new TaoBaoTokenParseException(msg.optJSONObject("error_response").optInt("sub_code"),
+ msg.optJSONObject("error_response").optString("sub_msg"));
+ }
}
return null;
}
@@ -2051,7 +2069,7 @@
return null;
}
- public static List<TaoBaoGoodsBrief> guessLikeByAuctionId(Long auctionId,int count) {
+ public static List<TaoBaoGoodsBrief> guessLikeByAuctionId(Long auctionId, int count) {
Map<String, String> map = new HashMap<>();
map.put("method", "taobao.tbk.dg.optimus.material");
map.put("item_id", auctionId + "");
--
Gitblit v1.8.0