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 {