创建群组或者添加群组成员时,群组成员按照请求顺序排序
This commit is contained in:
@@ -787,6 +787,21 @@ public class MemoryMessagesStore implements IMessagesStore {
|
|||||||
} else {
|
} else {
|
||||||
groupId = groupInfo.getTargetId();
|
groupId = groupInfo.getTargetId();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
|
||||||
|
|
||||||
|
List<WFCMessage.GroupMember> updatedMemberList = new ArrayList<>();
|
||||||
|
for (WFCMessage.GroupMember member : memberList) {
|
||||||
|
if (member.getMemberId().equals(groupInfo.getOwner())) {
|
||||||
|
member = member.toBuilder().setUpdateDt(dt).setCreateDt(dt).setType(ProtoConstants.GroupMemberType.GroupMemberType_Owner).build();
|
||||||
|
} else {
|
||||||
|
member = member.toBuilder().setUpdateDt(dt).setCreateDt(dt).build();
|
||||||
|
}
|
||||||
|
groupMembers.put(groupId, member);
|
||||||
|
updatedMemberList.add(member);
|
||||||
|
dt++;
|
||||||
|
}
|
||||||
|
|
||||||
groupInfo = groupInfo.toBuilder()
|
groupInfo = groupInfo.toBuilder()
|
||||||
.setTargetId(groupId)
|
.setTargetId(groupId)
|
||||||
.setName(groupInfo.getName())
|
.setName(groupInfo.getName())
|
||||||
@@ -799,20 +814,7 @@ public class MemoryMessagesStore implements IMessagesStore {
|
|||||||
.setOwner(StringUtil.isNullOrEmpty(groupInfo.getOwner()) ? fromUser : groupInfo.getOwner())
|
.setOwner(StringUtil.isNullOrEmpty(groupInfo.getOwner()) ? fromUser : groupInfo.getOwner())
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
mIMap.put(groupId, groupInfo);
|
mIMap.set(groupId, groupInfo);
|
||||||
MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
|
|
||||||
|
|
||||||
List<WFCMessage.GroupMember> updatedMemberList = new ArrayList<>();
|
|
||||||
for (WFCMessage.GroupMember member : memberList) {
|
|
||||||
if (member.getMemberId().equals(groupInfo.getOwner())) {
|
|
||||||
member = member.toBuilder().setUpdateDt(dt).setCreateDt(dt).setType(ProtoConstants.GroupMemberType.GroupMemberType_Owner).build();
|
|
||||||
} else {
|
|
||||||
member = member.toBuilder().setUpdateDt(dt).setCreateDt(dt).build();
|
|
||||||
}
|
|
||||||
groupMembers.put(groupId, member);
|
|
||||||
updatedMemberList.add(member);
|
|
||||||
}
|
|
||||||
|
|
||||||
databaseStore.persistGroupMember(groupId, updatedMemberList);
|
databaseStore.persistGroupMember(groupId, updatedMemberList);
|
||||||
|
|
||||||
return groupInfo;
|
return groupInfo;
|
||||||
@@ -891,6 +893,7 @@ public class MemoryMessagesStore implements IMessagesStore {
|
|||||||
}
|
}
|
||||||
tmp.add(member);
|
tmp.add(member);
|
||||||
newInviteUsers.add(member.getMemberId());
|
newInviteUsers.add(member.getMemberId());
|
||||||
|
updateDt++;
|
||||||
}
|
}
|
||||||
memberList = tmp;
|
memberList = tmp;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user