|
|
|
@ -365,6 +365,14 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite
|
|
|
|
|
var resp pbGroup.InviteUserToGroupResp
|
|
|
|
|
joinReq := pbGroup.JoinGroupReq{}
|
|
|
|
|
for _, v := range req.InvitedUserIDList {
|
|
|
|
|
if imdb.IsExistGroupMember(req.GroupID, v) {
|
|
|
|
|
log.NewError(req.OperationID, "IsExistGroupMember ", req.GroupID, v)
|
|
|
|
|
var resultNode pbGroup.Id2Result
|
|
|
|
|
resultNode.Result = -1
|
|
|
|
|
resultNode.UserID = v
|
|
|
|
|
resp.Id2ResultList = append(resp.Id2ResultList, &resultNode)
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
var groupRequest db.GroupRequest
|
|
|
|
|
groupRequest.UserID = v
|
|
|
|
|
groupRequest.GroupID = req.GroupID
|
|
|
|
@ -452,8 +460,19 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite
|
|
|
|
|
resp.Id2ResultList = append(resp.Id2ResultList, &resultNode)
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
okUserIDList = req.InvitedUserIDList
|
|
|
|
|
if err := db.DB.AddUserToSuperGroup(req.GroupID, req.InvitedUserIDList); err != nil {
|
|
|
|
|
for _, v := range req.InvitedUserIDList {
|
|
|
|
|
if imdb.IsExistGroupMember(req.GroupID, v) {
|
|
|
|
|
log.NewError(req.OperationID, "IsExistGroupMember ", req.GroupID, v)
|
|
|
|
|
var resultNode pbGroup.Id2Result
|
|
|
|
|
resultNode.Result = -1
|
|
|
|
|
resp.Id2ResultList = append(resp.Id2ResultList, &resultNode)
|
|
|
|
|
continue
|
|
|
|
|
} else {
|
|
|
|
|
okUserIDList = append(okUserIDList, v)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//okUserIDList = req.InvitedUserIDList
|
|
|
|
|
if err := db.DB.AddUserToSuperGroup(req.GroupID, okUserIDList); err != nil {
|
|
|
|
|
log.NewError(req.OperationID, "AddUserToSuperGroup failed ", req.GroupID, err)
|
|
|
|
|
return &pbGroup.InviteUserToGroupResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: err.Error()}, nil
|
|
|
|
|
}
|
|
|
|
|