From a8e45a802600ca1cde28fe8522a26635328bbd99 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 三月 2019 17:45:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 71 ++++++++++++++++++++++++++++++++++-
1 files changed, 69 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
index 5a77776..a04d0aa 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
@@ -57,6 +57,8 @@
import com.yeshi.fanli.service.inter.goods.TaoBaoLinkService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.tag.PageEntity;
+import com.yeshi.fanli.util.AESUtil;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoHttpUtil;
@@ -691,7 +693,10 @@
tg.setBiz30day(tb.getBiz30day());
tg.setSalesCount(TaoBaoUtil.getSaleCount(tb.getBiz30day()));
tg.setTitle(tb.getTitle());
- tg.setPictUrl(TbImgUtil.getTBSize320Img(tb.getPictUrl()));
+ if (!StringUtil.isNullOrEmpty(tb.getPictUrlWhite()))
+ tg.setPictUrl(TbImgUtil.getTBSize320Img(tb.getPictUrlWhite()));
+ else
+ tg.setPictUrl(TbImgUtil.getTBSize320Img(tb.getPictUrl()));
tg.setZkPrice(tb.getZkPrice());
tg.setAuctionUrl(tb.getAuctionUrl());
tg.setReservePrice(tb.getReservePrice());
@@ -1245,7 +1250,7 @@
}
return parsePhoneTmAndTb(id);
} catch (Exception e) {
- LogHelper.error("鏃犳硶瑙ｆ瀽鍒版窐瀹濆晢鍝両D:"+burl);
+ LogHelper.error("鏃犳硶瑙ｆ瀽鍒版窐瀹濆晢鍝両D:" + burl);
return null;
}
@@ -1704,6 +1709,68 @@
return taoBaoGoods;
}
+ /**
+ * 鑾峰彇娣樺疂鑱旂洘鐨勬巿鏉冮摼鎺�
+ *
+ * @param appKey
+ * -搴旂敤Key
+ * @param callBackUrl
+ * -鍥炶皟閾炬帴
+ * @param uid-鐢ㄦ埛ID
+ * @return
+ */
+ public static String getTaoBaoUnionAuthUrl(String appKey, String callBackUrl, Long uid, String source) {
+ if (uid == null)
+ return null;
+ long timestamp = System.currentTimeMillis();
+ JSONObject json = new JSONObject();
+ json.put("u", uid);
+ json.put("t", timestamp);
+ json.put("s", source);
+ String url = null;
+ try {
+ url = String.format(
+ "https://oauth.taobao.com/authorize?response_type=code&client_id=%s&redirect_uri=%s&state=%s&view=wap",
+ appKey, callBackUrl,
+ URLEncoder.encode(AESUtil.encrypt(json.toString(), Constant.UIDAESKEY), "UTF-8"));
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ return url;
+ }
+
+ public static TaoBaoGoodsBrief getSimpleGoodsBrief(Long actionId) {
+ JSONObject data = new JSONObject();
+ data.put("itemNumId", actionId + "");
+
+ String url = "";
+ try {
+ url = String.format("https://acs.m.taobao.com/h5/mtop.taobao.detail.getdetail/6.0/?data=%s",
+ URLEncoder.encode(data.toString(), "UTF-8"));
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+
+ String result = HttpUtil.get(url);
+ JSONObject resultOBJ = JSONObject.fromObject(result);
+ if (resultOBJ.optJSONObject("data") != null) {
+ data = resultOBJ.optJSONObject("data");
+ JSONObject item = data.optJSONObject("item");
+ JSONObject seller = data.optJSONObject("seller");
+ TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
+ goods.setAuctionId(item.optLong("itemId"));
+ goods.setTitle(item.optString("title"));
+ if (item.optJSONArray("images") != null && item.optJSONArray("images").size() > 0) {
+ String picture = item.optJSONArray("images").optString(0);
+ goods.setPictUrl(picture.startsWith("http") ? picture : "https:" + picture);
+ }
+ goods.setSellerId(seller.optLong("shopId"));
+ goods.setShopTitle(seller.optString("shopName"));
+ return goods;
+ }
+ return null;
+ }
+
public static void main(String[] args) {
String s = channelMap.get("3");
System.out.println(s);
--
Gitblit v1.8.0