From 739627ca2a0b970d955fc12371407a5af929e99e Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Wed, 15 Nov 2023 18:38:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=B8=B8=E6=88=8F=E9=82=80?=
 =?UTF-8?q?=E8=AF=B7=20=E5=89=8D=E5=90=8E=E9=A1=BA=E5=BA=8F=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/caninerabbit/module.go   |  4 ++--
 modules/gameinvite/api_accept.go | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/modules/caninerabbit/module.go b/modules/caninerabbit/module.go
index bccd02680..552885756 100644
--- a/modules/caninerabbit/module.go
+++ b/modules/caninerabbit/module.go
@@ -94,8 +94,8 @@ func (this *CanineRabbit) CreateRoom(sessions []comm.IUserSession, rulesStr stri
 		this.Error("未找到红方信息", log.Field{Key: "uid", Value: sessions[0].GetUserId()})
 		return
 	}
-	if blueinfo, err = this.model.getModel(sessions[0].GetUserId()); err != nil {
-		this.Error("未找到蓝方信息", log.Field{Key: "uid", Value: sessions[0].GetUserId()})
+	if blueinfo, err = this.model.getModel(sessions[1].GetUserId()); err != nil {
+		this.Error("未找到蓝方信息", log.Field{Key: "uid", Value: sessions[1].GetUserId()})
 		return
 	}
 
diff --git a/modules/gameinvite/api_accept.go b/modules/gameinvite/api_accept.go
index 0e03507b7..1d47a0aba 100644
--- a/modules/gameinvite/api_accept.go
+++ b/modules/gameinvite/api_accept.go
@@ -23,6 +23,7 @@ func (this *apiComp) AcceptCheck(session comm.IUserSession, req *pb.GameInviteAc
 func (this *apiComp) Accept(session comm.IUserSession, req *pb.GameInviteAcceptReq) (errdata *pb.ErrorData) {
 	var (
 		err        error
+		user       *pb.DBUser
 		redRecord  *pb.GameInviteQiecuoRecord
 		blueRecord *pb.GameInviteQiecuoRecord
 		sessions   []comm.IUserSession
@@ -36,7 +37,7 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.GameInviteAcceptR
 	if errdata = this.AcceptCheck(session, req); errdata != nil {
 		return
 	}
-	sessions = append(sessions, session.Clone())
+
 	//校验切磋请求是否超时
 	if redRecord, err = this.module.model.queryQiecuo(req.Uid); err != nil {
 		errdata = &pb.ErrorData{
@@ -96,6 +97,18 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.GameInviteAcceptR
 	} else {
 		sessions = append(sessions, redsession)
 	}
+	sessions = append(sessions, session.Clone())
+	if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Title:   pb.ErrorCode_DBError.ToString(),
+			Message: err.Error(),
+		}
+		return
+	}
+	this.module.SendMsgToUser(string(this.module.GetType()), "qiecuonotify",
+		&pb.GameInviteQiecuonotifyPush{User: comm.GetUserBaseInfo(user), NotifyType: 2, Gtype: req.Gtype}, req.Uid)
+
 	switch req.Gtype {
 	case 2:
 		if roomid, err = this.module.caninerabbit.CreateRoom(sessions, rules); err != nil {