Commit baf93084 by Shadow

移除临时会话类型

parent 99d16939
...@@ -47,7 +47,6 @@ import com.wecloud.im.entity.ImClient; ...@@ -47,7 +47,6 @@ import com.wecloud.im.entity.ImClient;
import com.wecloud.im.entity.ImConversation; import com.wecloud.im.entity.ImConversation;
import com.wecloud.im.entity.ImConversationMembers; import com.wecloud.im.entity.ImConversationMembers;
import com.wecloud.im.entity.ImMessage; import com.wecloud.im.entity.ImMessage;
import com.wecloud.im.friend.entity.ImFriend;
import com.wecloud.im.friend.service.ImFriendService; import com.wecloud.im.friend.service.ImFriendService;
import com.wecloud.im.mapper.ImConversationMapper; import com.wecloud.im.mapper.ImConversationMapper;
import com.wecloud.im.param.ChatRoomMemberPageParam; import com.wecloud.im.param.ChatRoomMemberPageParam;
...@@ -76,7 +75,6 @@ import com.wecloud.im.param.add.ServerImConversationCreate; ...@@ -76,7 +75,6 @@ import com.wecloud.im.param.add.ServerImConversationCreate;
import com.wecloud.im.post.Couriers; import com.wecloud.im.post.Couriers;
import com.wecloud.im.post.MessageBuilder; import com.wecloud.im.post.MessageBuilder;
import com.wecloud.im.sdk.enums.ChatTypeEnum; import com.wecloud.im.sdk.enums.ChatTypeEnum;
import com.wecloud.im.sdk.enums.FriendStateEnum;
import com.wecloud.im.sdk.enums.GroupChatSettingTypeEnum; import com.wecloud.im.sdk.enums.GroupChatSettingTypeEnum;
import com.wecloud.im.sdk.enums.GroupRoleEnum; import com.wecloud.im.sdk.enums.GroupRoleEnum;
import com.wecloud.im.sdk.enums.JoinConversationTypeEnum; import com.wecloud.im.sdk.enums.JoinConversationTypeEnum;
...@@ -1352,12 +1350,6 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -1352,12 +1350,6 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
log.info("成员不存在,不能创建会话 clientId:{}", memberUserId); log.info("成员不存在,不能创建会话 clientId:{}", memberUserId);
throw new BusinessException(ApiCode.CLIENT_NOT_FOUNT); throw new BusinessException(ApiCode.CLIENT_NOT_FOUNT);
} }
// 查看好友关系
ImFriend my = friendService.getByKey(creator.getClientId(), memberUserId);
Boolean isStranger = false;
if (my == null || !(FriendStateEnum.CONFORM.getCode().equals(my.getState()))) {
isStranger = true;
}
// 如果存在重复单聊类型会话,则不会为空 // 如果存在重复单聊类型会话,则不会为空
ImConversation existConversation = imConversationMapper.getRepetitionConversationSingle(creator.getId(), memberClient.getId(), 0); ImConversation existConversation = imConversationMapper.getRepetitionConversationSingle(creator.getId(), memberClient.getId(), 0);
...@@ -1379,13 +1371,6 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -1379,13 +1371,6 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
// 创建成员 // 创建成员
List<ImConversationMembers> conversationMemberList = buildPrivateChatMembers(conversation, creator, List<ImConversationMembers> conversationMemberList = buildPrivateChatMembers(conversation, creator,
memberClient); memberClient);
if (isStranger) {
// 如果是陌生人,刚创建会话的时候 会话类型设置为临时会话 双方都不可见
conversation.setChatType(ChatTypeEnum.TEMP.getCode());
for (ImConversationMembers members : conversationMemberList) {
members.setDisplayStatus(0L);
}
}
this.save(conversation); this.save(conversation);
this.imConversationMembersService.saveBatch(conversationMemberList); this.imConversationMembersService.saveBatch(conversationMemberList);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment