Merge branch 'master' of https://gitea.nxsir.cn/nanxun/IM_NEW

GroupService.WebApi/Application/EventHandler/GroupInvitationEventHandler.cs

@@ -1,5 +1,5 @@
 using GroupService.Domain.Events;
-using GroupService.WebApi.Application.GroupRequest;
+using GroupService.WebApi.Application.GroupMember;
 using IM.Commons;
 using IM.Commons.IntegrationEvents;
 using MassTransit;
@@ -12,20 +12,19 @@ namespace GroupService.WebApi.Application.EventHandler
         , INotificationHandler<GroupInvitationCreateDomainEvent>
     {
         private readonly IPublishEndpoint endpoint;
-        private readonly GroupRequestService requestService;
+        private readonly GroupMemberService memberService;
 
-        public GroupInvitationEventHandler(IPublishEndpoint endpoint, GroupRequestService requestService)
+        public GroupInvitationEventHandler(IPublishEndpoint endpoint, GroupMemberService memberService)
         {
             this.endpoint = endpoint;
-            this.requestService = requestService;
+            this.memberService = memberService;
         }
 
         public async Task Handle(GroupInvitationAcceptDomainEvent notification, CancellationToken cancellationToken)
         {
             var invitation = notification.Invitation;
-            var res = await requestService.CreateAsync(invitation.GroupId, invitation.UserId,
-                $"邀请入群"
-                );
+            // 邀请接受 → 直接加入群聊，不走入群申请审批流程
+            var res = await memberService.CreateAsync(invitation.GroupId, invitation.UserId);
 
             await endpoint.Publish(new GroupInvitationAcceptEvent(invitation.Id, invitation.UserId, invitation.UserProfile.NickName, invitation.UserProfile.Avatar
                 , invitation.GroupId, invitation.GroupProfile.GroupName, invitation.GroupProfile.Avatar, invitation.OperatorId
@@ -34,7 +33,6 @@ namespace GroupService.WebApi.Application.EventHandler
 
             if (!res.Succeeded)
             {
-
                 throw new EventHandlerException(res.Message);
             }
         }