From ec60e757d358636dcac1589c44a66f3e276fe58c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 29 六月 2020 14:41:42 +0800
Subject: [PATCH] 拉新

---
 fanli/src/main/java/com/yeshi/fanli/util/aitaoker/AitaokerApiUtil.java |   98 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 95 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/aitaoker/AitaokerApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/aitaoker/AitaokerApiUtil.java
index 5a2dfa6..ca4f9b8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/aitaoker/AitaokerApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/aitaoker/AitaokerApiUtil.java
@@ -270,7 +270,7 @@
 //				"        \"is_new\":1\r\n" + 
 //				"    }\r\n" + 
 //				"}";
-		
+//		
 		JSONObject resultJson = JSONObject.fromObject(result);
 		if ("0000".equals(resultJson.optString("status"))) {
 			resultJson = resultJson.optJSONObject("data");
@@ -305,12 +305,84 @@
 	 * @param robotId
 	 * @return
 	 */
-	public static List<WeiXinGroupDTO> getContract(int robotId) {
+	public static List<String> getContract(int robotId) {
 		// 璇锋眰鍙傛暟
 		Map<String, String> map = new HashMap<>();
 		map.put("robot_id", robotId +"");
 		// 璇锋眰缁撴灉
 		String result = baseRequest("itaoke.robot.room.list", map);
+		JSONObject resultJson = JSONObject.fromObject(result);
+		if ("0000".equals(resultJson.optString("status"))) {
+			JSONArray groupArray = resultJson.optJSONArray("data");
+			if (groupArray != null && groupArray.size() > 0) {
+				Type type = new TypeToken<ArrayList<String>>() {
+				}.getType();
+				List<String> list = new Gson().fromJson(groupArray.toString(), type);
+				return list;
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * 鑾峰彇缇ゅ垪琛�
+	 * @param robotId
+	 * @param roomId
+	 * @return
+	 */
+	public static WeiXinGroupDTO getGroupDetail(int robotId, String roomId) {
+		if (StringUtil.isNullOrEmpty(roomId)) {
+			return null;
+		}
+		
+		// 璇锋眰鍙傛暟
+		Map<String, String> map = new HashMap<>();
+		map.put("robot_id", robotId +"");
+		map.put("room_id", roomId +""); //  缇ょ殑id ,澶氫釜鐢ㄩ�楀彿闅斿紑
+		// 璇锋眰缁撴灉
+		String result = baseRequest("itaoke.robot.room.detail", map);
+		JSONObject resultJson = JSONObject.fromObject(result);
+		if ("0000".equals(resultJson.optString("status"))) {
+			JSONArray groupArray = resultJson.optJSONArray("data");
+			if (groupArray != null && groupArray.size() > 0) {
+				Type type = new TypeToken<ArrayList<WeiXinGroupDTO>>() {
+				}.getType();
+				List<WeiXinGroupDTO> goodsList = new Gson().fromJson(groupArray.toString(), type);
+				if (goodsList == null || goodsList.size() == 0) {
+					return null;
+				} else {
+					return goodsList.get(0);
+				}
+			}
+		}
+		return null;
+	}
+	
+	
+	/**
+	 * 鑾峰彇缇ゅ垪琛�
+	 * @param robotId
+	 * @param roomId
+	 * @return
+	 */
+	public static List<WeiXinGroupDTO> getGroupDetail(int robotId, List<String> listRoomId) {
+		if (listRoomId == null || listRoomId.size() ==0) {
+			return null;
+		}
+		
+		String roomIds = "";
+		for (String roomID: listRoomId) {
+			roomIds += roomID + ",";
+		}
+		if(roomIds.endsWith(","))
+			roomIds = roomIds.substring(0, roomIds.length()-1);
+		
+		// 璇锋眰鍙傛暟
+		Map<String, String> map = new HashMap<>();
+		map.put("robot_id", robotId +"");
+		map.put("room_id", roomIds); //  缇ょ殑id ,澶氫釜鐢ㄩ�楀彿闅斿紑
+		// 璇锋眰缁撴灉
+		String result = baseRequest("itaoke.robot.room.detail", map);
 		JSONObject resultJson = JSONObject.fromObject(result);
 		if ("0000".equals(resultJson.optString("status"))) {
 			JSONArray groupArray = resultJson.optJSONArray("data");
@@ -339,7 +411,7 @@
 		map.put("pic_url", picUrl);
 		map.put("content", content);
 		// 璇锋眰缁撴灉
-		String result = baseRequest("itaoke.robot.macsend.circle", map);
+		String result = baseRequest("itaoke.robot.circle.send", map);
 		JSONObject resultJson = JSONObject.fromObject(result);
 		if ("0000".equals(resultJson.optString("status"))) {
 			resultJson = resultJson.optJSONObject("data");
@@ -353,6 +425,26 @@
 		return null;
 	}
 	
+	/**
+	 * 鍙戞湅鍙嬪湀 
+	 * @param robotId
+	 * @param content
+	 * @param picUrl 鍥剧墖url锛屽涓鐢�;鍒嗛殧
+	 * @return
+	 */
+	public static String macsendUpload(int robotId, String picUrl) {
+		Map<String, String> map = new HashMap<>();
+		map.put("robot_id", robotId +"");
+		map.put("pic_url", picUrl);
+		map.put("type", "2");
+		String result = baseRequest("itaoke.robot.circle.upload", map);
+		JSONObject resultJson = JSONObject.fromObject(result);
+		if ("0000".equals(resultJson.optString("status"))) {
+			return resultJson.optString("data");
+		}
+		return null;
+	}
+	
 	
 	/**
 	 * 鏈嬪弸鍦堝彂閫佽棰�

--
Gitblit v1.8.0