From a55587c773d8877430b49477cd4b4961c6a2ba92 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 19 六月 2020 15:06:52 +0800
Subject: [PATCH] 云发单群匹配

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java
index 4b15830..19cdcb3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java
@@ -357,18 +357,21 @@
 		if (robotId == null)
 			throw new UserCloudException(1, "浜戝彂鍗曟満鍣ㄤ汉涓嶅瓨鍦�");
 
-		List<WeiXinGroupDTO> list = AitaokerApiUtil.getContract(robotId);
+		List<String> list = AitaokerApiUtil.getContract(12793);
 		if (list == null || list.size() == 0)
 			throw new UserCloudException(1, "鏈绱㈠埌瀵瑰簲缇�");
 		
 		String wxId = userCloud.getWxId();
-		for (WeiXinGroupDTO dto : list) {
-			String groupId = dto.getGroupId();
-			// 妫�娴嬫槸鍚﹀尮閰嶇兢
-			String key =  RedisKeyEnum.cloudMatchGroup.getKey() + StringUtil.Md5(wxId + "_" + groupId);
+		for (String roomId : list) {
+			String key = RedisKeyEnum.cloudMatchGroup.getKey() + StringUtil.Md5(wxId + "_" + roomId);
 			String result = redisManager.getCommonString(key);
-			 if (!StringUtil.isNullOrEmpty(result)) {
-				userCloudGroupService.addGroup(uid, dto.getGroupId(), dto.getGroupName(), userCloud.getGroupNum());
+			if (!StringUtil.isNullOrEmpty(result)) {
+				String groupName = null;
+				WeiXinGroupDTO groupDetail = AitaokerApiUtil.getGroupDetail(12793, roomId);
+				if (groupDetail != null) {
+					groupName = groupDetail.getGroupName();
+				}
+				userCloudGroupService.addGroup(uid, roomId, groupName, userCloud.getGroupNum());
 			}
 		}
 	}

--
Gitblit v1.8.0