From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java |   51 +++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 45 insertions(+), 6 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 af3e1aa..5455308 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
@@ -7,10 +7,12 @@
 import java.util.List;
 import java.util.Map;
 
+import org.yeshi.utils.JsonUtil;
 import org.yeshi.utils.taobao.TbImgUtil;
 
 import com.yeshi.fanli.dto.taobao.TaoBaoShopInfoDTO;
 import com.yeshi.fanli.dto.taobao.TaoLiJinDTO;
+import com.yeshi.fanli.dto.taobao.api.TaoKeOfficialActivityConvertResultDTO;
 import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinReport;
 import com.yeshi.fanli.entity.taobao.SearchFilter;
 import com.yeshi.fanli.entity.taobao.SearchShopFilter;
@@ -2076,11 +2078,12 @@
 	 *            -娓犻亾ID
 	 * @return
 	 */
-	public static String officialActivityConvert(String adZoneId, String promotionSceneId, String relationId) {
+	public static TaoKeOfficialActivityConvertResultDTO officialActivityConvert(String adZoneId,
+			String promotionSceneId, String relationId) {
 		Map<String, String> map = new HashMap<>();
-		map.put("method", "taobao.tbk.activitylink.get");
+		map.put("method", "taobao.tbk.activity.info.get");
 		map.put("adzone_id", adZoneId);
-		map.put("promotion_scene_id", promotionSceneId);
+		map.put("activity_material_id", promotionSceneId);
 		if (relationId != null)
 			map.put("relation_id", relationId);
 		TaoKeAppInfo app = new TaoKeAppInfo();
@@ -2088,11 +2091,13 @@
 		app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
 		try {
 			String result = TaoKeBaseUtil.baseRequestForThreeTimes(map, app);
+			System.out.println(result);
 			JSONObject json = JSONObject.fromObject(result);
 			if (json != null) {
-				json = json.optJSONObject("tbk_activitylink_get_response");
-				if (json.optInt("result_code") == 200) {
-					return json.optString("data");
+				json = json.optJSONObject("tbk_activity_info_get_response");
+				if (json.optJSONObject("data") != null) {
+					return JsonUtil.getSimpleGson().fromJson(json.optJSONObject("data").toString(),
+							TaoKeOfficialActivityConvertResultDTO.class);
 				}
 			}
 		} catch (Exception e) {
@@ -2166,6 +2171,40 @@
 
 		return goodsList;
 	}
+
+	/**
+	 * 娣樺疂瀹�-鎺ㄥ箍鑰�-瀹樻柟娲诲姩淇℃伅鑾峰彇
+	 * @Title: getActivityInfo
+	 * @Description: 
+	 * @param activityMaterialId
+	 * @param pid
+	 * @param relationId
+	 * @return 
+	 * String 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public static String getActivityInfo(String activityMaterialId, String pid, String relationId) {
+		Map<String, String> map = new HashMap<>();
+		map.put("method", "taobao.tbk.activity.info.get");
+		map.put("activity_material_id", activityMaterialId);
+		map.put("adzone_id", pid.split("_")[3] + "");
+		map.put("relation_id", relationId);
+
+		JSONObject resultJSON = null;
+		try {
+			resultJSON = TaoKeBaseUtil.baseRequest(map,
+					new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET, pid));
+			JSONObject response = resultJSON.optJSONObject("tbk_activity_info_get_response");
+			if (response != null && response.optJSONObject("data") != null) {
+				return response.optJSONObject("data").optString("click_url");
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		return null;
+	}
+
 }
 
 class QuanInfo {

--
Gitblit v1.8.0