前端：

1、完善创建群聊逻辑
后端：
1、完善群聊相关接口

backend/IM_API/Services/GroupService.cs

@@ -18,31 +18,25 @@ namespace IM_API.Services
         private readonly IMapper _mapper;
         private readonly ILogger<GroupService> _logger;
         private readonly IPublishEndpoint _endPoint;
-        public GroupService(ImContext context, IMapper mapper, ILogger<GroupService> logger, IPublishEndpoint publishEndpoint)
+        private readonly IUserService _userService;
+        public GroupService(ImContext context, IMapper mapper, ILogger<GroupService> logger, 
+            IPublishEndpoint publishEndpoint, IUserService userService)
         {
             _context = context;
             _mapper = mapper;
             _logger = logger;
             _endPoint = publishEndpoint;
+            _userService = userService;
         }
 
-        private async Task<List<GroupInvite>> GetGroupInvites(int userId, int groupId, List<int> ids)
+        private async Task<List<int>> validFriendshipAsync (int userId, List<int> ids)
         {
-            DateTime dateTime = DateTime.Now;
+            DateTime dateTime = DateTime.UtcNow;
             //验证被邀请用户是否为好友
-            var validFriendIds = await _context.Friends
+            return await _context.Friends
             .Where(f => f.UserId == userId && ids.Contains(f.FriendId))
             .Select(f => f.FriendId)
             .ToListAsync();
-            //创建群成员对象
-            return validFriendIds.Select(fid => new GroupInvite
-            {
-                Created = dateTime,
-                GroupId = groupId,
-                InvitedUser = fid,
-                StateEnum = GroupInviteState.Pending,
-                InviteUser = userId
-            }).ToList();
         }
 
         public async Task<GroupInfoDto> CreateGroupAsync(int userId, GroupCreateDto groupCreateDto)
@@ -57,31 +51,21 @@ namespace IM_API.Services
                 group.GroupMaster = userId;
                 _context.Groups.Add(group);
                 await _context.SaveChangesAsync();
-                var groupInvites = new List<GroupInvite>();
                 if (userIds.Count > 0)
                 {
-                    groupInvites = await GetGroupInvites(userId,group.Id, userIds);
-                    _context.GroupInvites.AddRange(groupInvites);
+                    //邀请好友
+                    await InviteUsersAsync(userId, group.Id ,userIds);
                 }
-                var groupMember = new GroupMember
-                {
-                    UserId = userId,
-                    Created = dateTime,
-                    RoleEnum = GroupMemberRole.Master,
-                    GroupId = group.Id
-                };
-                _context.GroupMembers.Add(groupMember);
-                await _context.SaveChangesAsync();
                 await transaction.CommitAsync();
-                await _endPoint.Publish(new GroupInviteEvent
+                await _endPoint.Publish(new GroupJoinEvent
                 {
+                    EventId = Guid.NewGuid(),
                     AggregateId = userId.ToString(),
                     GroupId = group.Id,
-                    EventId = Guid.NewGuid(),
                     OccurredAt = dateTime,
-                    Ids = groupInvites.Select(x => x.Id).ToList(),
                     OperatorId = userId,
-                    UserId = userId
+                    UserId = userId,
+                    IsCreated = true
                 });
                 return _mapper.Map<GroupInfoDto>(group);
             }
@@ -101,7 +85,43 @@ namespace IM_API.Services
         {
             var group = await _context.Groups.FirstOrDefaultAsync(
                 x => x.Id == groupId) ?? throw new BaseException(CodeDefine.GROUP_NOT_FOUND);
-            
+            //过滤非好友
+            var groupInviteIds = await validFriendshipAsync(userId, userIds);
+            var inviteList = groupInviteIds.Select(id => new GroupInvite
+            {
+                Created = DateTime.UtcNow,
+                GroupId = group.Id,
+                InviteUser = userId,
+                InvitedUser = id,
+                StateEnum = GroupInviteState.Pending
+            }).ToList();
+            _context.GroupInvites.AddRange(inviteList);
+            await _context.SaveChangesAsync();
+            await _endPoint.Publish(new GroupInviteEvent
+            {
+                GroupId = groupId,
+                AggregateId = userId.ToString(),
+                OccurredAt = DateTime.UtcNow,
+                EventId = Guid.NewGuid(),
+                Ids = userIds,
+                OperatorId = userId,
+                UserId = userId
+            });
+        }
+
+        public async Task MakeGroupMemberAsync(int userId, int groupId ,GroupMemberRole? role)
+        {
+            var isExist = await _context.GroupMembers.AnyAsync(x => x.GroupId == groupId && x.UserId == userId);
+            if (isExist) return;
+            var groupMember = new GroupMember
+            {
+                UserId = userId,
+                Created = DateTime.UtcNow,
+                RoleEnum = role ?? GroupMemberRole.Normal,
+                GroupId = groupId
+            };
+            _context.GroupMembers.Add(groupMember);
+            await _context.SaveChangesAsync();
         }
 
         public Task JoinGroupAsync(int userId, int groupId)
@@ -136,5 +156,96 @@ namespace IM_API.Services
             _context.Groups.Update(group);
             await _context.SaveChangesAsync();
         }
+        public async Task HandleGroupInviteAsync(int userid, HandleGroupInviteDto dto)
+        {
+            var user = _userService.GetUserInfoAsync(userid);
+            var inviteInfo = await _context.GroupInvites.FirstOrDefaultAsync(x => x.Id == dto.InviteId)
+                ?? throw new BaseException(CodeDefine.INVALID_ACTION);
+            if (inviteInfo.InvitedUser != userid) throw new BaseException(CodeDefine.AUTH_FAILED);
+            inviteInfo.StateEnum = dto.Action;
+            _context.GroupInvites.Update(inviteInfo);
+            await _context.SaveChangesAsync();
+            await _endPoint.Publish(new GroupInviteActionUpdateEvent
+            {
+                Action = dto.Action,
+                AggregateId = userid.ToString(),
+                OccurredAt = DateTime.UtcNow,
+                EventId = Guid.NewGuid(),
+                GroupId = inviteInfo.GroupId,
+                InviteId = inviteInfo.Id,
+                InviteUserId = inviteInfo.InviteUser.Value,
+                OperatorId = userid,
+                UserId = userid
+
+            });
+        }
+        public async Task HandleGroupRequestAsync(int userid, HandleGroupRequestDto dto)
+        {
+            var user = _userService.GetUserInfoAsync(userid);
+            //判断请求存在
+            var requestInfo = await _context.GroupRequests.FirstOrDefaultAsync(x => x.Id == dto.RequestId)
+                ?? throw new BaseException(CodeDefine.INVALID_ACTION);
+            //判断成员存在
+            var memberInfo = await _context.GroupMembers.FirstOrDefaultAsync(x => x.UserId == userid)
+                 ?? throw new BaseException(CodeDefine.NO_GROUP_PERMISSION);
+            //判断成员权限
+            if (memberInfo.RoleEnum != GroupMemberRole.Master && memberInfo.RoleEnum != GroupMemberRole.Administrator)
+                throw new BaseException(CodeDefine.NO_GROUP_PERMISSION);
+
+            requestInfo.StateEnum = dto.Action;
+            _context.GroupRequests.Update(requestInfo);
+            await _context.SaveChangesAsync();
+
+            await _endPoint.Publish(new GroupRequestUpdateEvent
+            {
+                Action = requestInfo.StateEnum,
+                AdminUserId = userid,
+                AggregateId = userid.ToString(),
+                OccurredAt = DateTime.UtcNow,
+                EventId = Guid.NewGuid(),
+                GroupId = requestInfo.GroupId,
+                OperatorId = userid,
+                UserId = requestInfo.UserId,
+                RequestId = requestInfo.Id
+            });
+        }
+        public async Task MakeGroupRequestAsync(int userId, int? adminUserId, int groupId)
+        {
+            var requestInfo = await _context.GroupRequests
+                .FirstOrDefaultAsync(x => x.UserId == userId && x.GroupId == groupId);
+            if (requestInfo != null) return;
+
+            var member = await _context.GroupMembers.FirstOrDefaultAsync(
+                x => x.UserId == adminUserId && x.GroupId == groupId);
+            var request = new GroupRequest
+            {
+                Created = DateTime.UtcNow,
+                Description = string.Empty,
+                GroupId = groupId,
+                UserId = userId,
+                StateEnum = GroupRequestState.Pending
+            };
+            if(member != null && (
+                member.RoleEnum == GroupMemberRole.Administrator || member.RoleEnum == GroupMemberRole.Master))
+            {
+                request.StateEnum = GroupRequestState.Passed;
+            }
+
+            _context.GroupRequests.Add(request);
+            await _context.SaveChangesAsync();
+
+            await _endPoint.Publish(new GroupRequestEvent
+            {
+                OccurredAt = DateTime.UtcNow,
+                Description = request.Description,
+                GroupId = request.GroupId,
+                Action = request.StateEnum,
+                UserId = userId,
+                AggregateId = userId.ToString(),
+                EventId = Guid.NewGuid(),
+                OperatorId = userId
+            });
+                return;
+        }
     }
 }