From b74ae64915b5f9550e283306a191f964079ae51d Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 11 六月 2020 09:28:26 +0800
Subject: [PATCH] 饿了么订单中商品id改为0

---
 fanli/src/main/java/com/yeshi/fanli/util/aitaoker/AitaokerApiUtil.java |   53 ++++++++++++++++++++++++++---------------------------
 1 files changed, 26 insertions(+), 27 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 358cbfc..1440d75 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
@@ -17,6 +17,7 @@
 import com.yeshi.fanli.dto.aitaoker.QrcodeLoginDTO;
 import com.yeshi.fanli.dto.aitaoker.RobotInfoDTO;
 import com.yeshi.fanli.dto.aitaoker.WeiXinGroupDTO;
+import com.yeshi.fanli.dto.suning.SuningGoodsInfo;
 import com.yeshi.fanli.util.StringUtil;
 
 import net.sf.json.JSONArray;
@@ -157,13 +158,16 @@
 		map.put("robot_id", robotId +"");
 		map.put("uuid", wId);
 		// 璇锋眰缁撴灉
-		String result = baseRequest("itaoke.robot.check.maclogin", map);
+		String result = baseRequest("itaoke.robot.async.mlogin", map);
 		JSONObject resultJson = JSONObject.fromObject(result);
-		resultJson = resultJson.optJSONObject("data");
-		if (resultJson != null && !StringUtil.isNullOrEmpty(resultJson.optString("wcId"))) {
-			Type type = new TypeToken<QrcodeLoginDTO>() {}.getType();
-			return new Gson().fromJson(resultJson.toString(), type);
+		if ("0000".equals(resultJson.optString("status"))) {
+			resultJson = resultJson.optJSONObject("data");
+			if (resultJson != null) {
+				Type type = new TypeToken<QrcodeLoginDTO>() {}.getType();
+				return new Gson().fromJson(resultJson.toString(), type);
+			}
 		}
+		
 		return null;
 	}
 	
@@ -179,7 +183,7 @@
 		// 璇锋眰缁撴灉
 		String result = baseRequest("itaoke.robot.check.online", map);
 		JSONObject resultJson = JSONObject.fromObject(result);
-		if ("0000".equals(resultJson.optString("code"))) {
+		if ("0000".equals(resultJson.optString("status"))) {
 			return true;
 		}
 		return false;
@@ -198,7 +202,7 @@
 		// 璇锋眰缁撴灉
 		String result = baseRequest("itaoke.robot.force.offline", map);
 		JSONObject resultJson = JSONObject.fromObject(result);
-		if ("0000".equals(resultJson.optString("code"))) {
+		if ("0000".equals(resultJson.optString("status"))) {
 			return true;
 		}
 		return false;
@@ -319,7 +323,7 @@
 	
 	
 	/**
-	 * 鑾峰彇濂藉弸-缇ゅ垪琛�
+	 * 鑾峰彇缇ゅ垪琛�
 	 * @param robotId
 	 * @return
 	 */
@@ -328,25 +332,18 @@
 		Map<String, String> map = new HashMap<>();
 		map.put("robot_id", robotId +"");
 		// 璇锋眰缁撴灉
-		String result = baseRequest("itaoke.robot.get.contract", map);
+		String result = baseRequest("itaoke.robot.room.list", map);
 		JSONObject resultJson = JSONObject.fromObject(result);
-		if ("0000".equals(resultJson.optString("code"))) {
-			resultJson = resultJson.optJSONObject("data");
-			// 璁㈤槄鍙�
-			//JSONArray publicArray = resultJson.optJSONArray("public");
-			
-			// 濂藉弸鍒楄〃
-			//JSONArray friendArray = resultJson.optJSONArray("friend");
-			
-			// 缇ゅ垪琛�
-			JSONArray groupArray = resultJson.optJSONArray("group");
+		if ("0000".equals(resultJson.optString("status"))) {
+			JSONArray groupArray = resultJson.optJSONArray("data");
 			if (groupArray != null && groupArray.size() > 0) {
 				List<WeiXinGroupDTO> listGroup = new ArrayList<>();
-				Type type = new TypeToken<RobotInfoDTO>() {}.getType();
-				Gson gson = new Gson();
-				for (int i = 0 ;i < groupArray.size(); i ++) {
-					listGroup.add(gson.fromJson(groupArray.get(i).toString(), type));
-				}
+				 
+				Type type = new TypeToken<ArrayList<WeiXinGroupDTO>>() {
+				}.getType();
+				List<WeiXinGroupDTO> goodsList = new Gson().fromJson(groupArray.toString(), type);
+				
+				return goodsList;
 			}
 		}
 		return null;
@@ -369,8 +366,9 @@
 		// 璇锋眰缁撴灉
 		String result = baseRequest("itaoke.robot.macsend.circle", map);
 		JSONObject resultJson = JSONObject.fromObject(result);
-		if ("1000".equals(resultJson.optString("code"))) {
+		if ("0000".equals(resultJson.optString("status"))) {
 			resultJson = resultJson.optJSONObject("data");
+			resultJson = resultJson.optJSONObject("object");
 			return resultJson.optString("id");
 		}
 		return null;
@@ -415,10 +413,11 @@
 		map.put("wx_id", wxId);
 		map.put("msg_id", msgId);
 		map.put("content", content);
+		map.put("comment_id", "0");
 		// 璇锋眰缁撴灉
 		String result = baseRequest("itaoke.robot.macsend.circlecomment", map);
 		JSONObject resultJson = JSONObject.fromObject(result);
-		if ("1000".equals(resultJson.optString("code"))) {
+		if ("0000".equals(resultJson.optString("status"))) {
 			return true;
 		}
 		return false;
@@ -442,7 +441,7 @@
 		// 璇锋眰缁撴灉
 		String result = baseRequest("itaoke.robot.macsend.text", map);
 		JSONObject resultJson = JSONObject.fromObject(result);
-		if (resultJson.optInt("code") == 1000) {
+		if ("0000".equals(resultJson.optString("status"))) {
 			return true;
 		}
 		return false;

--
Gitblit v1.8.0