From f617136cba7f851a32f6091d5adc3e80f0e224c2 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期四, 24 一月 2019 09:33:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java | 71 ++++++++++++++++++++++++++++------- 1 files changed, 57 insertions(+), 14 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 c7a6056..7838008 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 @@ -158,7 +158,7 @@ map.put("method", "taobao.tbk.item.info.get"); map.put("num_iids", id + ""); String resultStr = TaoKeBaseUtil.baseRequestForThreeTimes(map, true); -// System.out.println(resultStr); + // System.out.println(resultStr); JSONObject data = JSONObject.fromObject(resultStr); // 鍟嗗搧涓嬫灦 if (data.optJSONObject("error_response") != null && data.optJSONObject("error_response").optInt("code") == 15 @@ -220,7 +220,7 @@ if (item.optBoolean("free_shipment")) goods.setFreeShipment(1); - + System.out.println(item.optString("material_lib_type")); return goods; @@ -324,10 +324,11 @@ goods.setPayRate30(1); if (item.optBoolean("free_shipment")) - goods.setFreeShipment(1); - - //if("1".equalsIgnoreCase(item.optString("material_lib_type"))) - //TaoKeTest.count++; + goods.setFreeShipment(1); + + if ("1".equalsIgnoreCase(item.optString("material_lib_type"))) + ; + goodsList.add(goods); } } @@ -891,10 +892,16 @@ private static TaoBaoGoodsBrief parseWuLiaoItem(JSONObject item) { TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief(); goods.setPictUrl(item.optString("pict_url")); + + if (!StringUtil.isNullOrEmpty(item.optString("white_image"))) { + goods.setPictUrlWhite(item.optString("white_image")); + } + goods.setAuctionId(item.optLong("num_iid")); goods.setAuctionUrl("https:" + item.optString("url")); goods.setBiz30day(item.optInt("volume")); goods.setCouponInfo(item.optString("coupon_info")); + if (goods.getCouponInfo() != null) goods.setCouponInfo(goods.getCouponInfo().replace(".00", "")); @@ -1463,25 +1470,41 @@ } + public static String getAccessToken(String code, String appKey, String appSecret) { + Map<String, String> map = new HashMap<>(); + map.put("method", "taobao.top.auth.token.create"); + map.put("code", code); + TaoKeAppInfo app = new TaoKeAppInfo(); + app.setAppKey(appKey); + app.setAppSecret(appSecret); + try { + JSONObject json = TaoKeBaseUtil.baseRequest(map, app); + if (json != null) + return json.toString(); + } catch (TaoKeApiException e) { + e.printStackTrace(); + } + + return null; + } + /** * 娓犻亾閭�璇风爜 * * @param relationId * @return */ - public static String getInviteCode(Long relationId, String accessToken) { + public static String getInviteCode(Long relationId, String accessToken, String appKey, String appSecret) { Map<String, String> map = new HashMap<>(); map.put("method", "taobao.tbk.sc.invitecode.get"); map.put("session", accessToken); - map.put("relation_id", relationId + ""); - map.put("code_type", "2"); - map.put("relation_app", "杩斿埄鍒�"); + map.put("code_type", "1"); + map.put("relation_app", "common"); JSONObject resultJSON = null; try { - TaoKeAppInfo app=new TaoKeAppInfo(); - app.setAppKey("24567001"); - app.setAppSecret("e26a8d0f8726883d44bf04742829b533"); - app.setAdzoneId("123123"); + TaoKeAppInfo app = new TaoKeAppInfo(); + app.setAppKey(appKey); + app.setAppSecret(appSecret); resultJSON = TaoKeBaseUtil.baseRequest(map, app); } catch (TaoKeApiException e) { e.printStackTrace(); @@ -1490,7 +1513,27 @@ return null; return null; + } + public static String beiAnQuDao(Long relationId, String accessToken, String appKey, String appSecret) { + Map<String, String> map = new HashMap<>(); + map.put("method", "taobao.tbk.sc.publisher.info.save"); + map.put("session", accessToken); + map.put("inviter_code", "A2QnGL"); + map.put("info_type", "1"); + JSONObject resultJSON = null; + try { + TaoKeAppInfo app = new TaoKeAppInfo(); + app.setAppKey(appKey); + app.setAppSecret(appSecret); + resultJSON = TaoKeBaseUtil.baseRequest(map, app); + } catch (TaoKeApiException e) { + e.printStackTrace(); + } + if (resultJSON == null) + return null; + + return null; } private static TaoBaoGoodsBrief parseWuLiaoItemFromMaterialId(JSONObject item) { -- Gitblit v1.8.0