diff --git a/modules/gourmet/api_getranduser.go b/modules/gourmet/api_getranduser.go index 92cc4ecb7..741644732 100644 --- a/modules/gourmet/api_getranduser.go +++ b/modules/gourmet/api_getranduser.go @@ -24,9 +24,10 @@ func (this *apiComp) GetRandUserCheck(session comm.IUserSession, req *pb.Gourmet /// 获取一些玩家数据 func (this *apiComp) GetRandUser(session comm.IUserSession, req *pb.GourmetGetRandUserReq) (code pb.ErrorCode, data proto.Message) { var ( - szDbUser []*pb.DBUser - randOnlineUsers []string + szDbUser []*pb.DBUser + mapUser map[string]struct{} ) + mapUser = make(map[string]struct{}, req.People) code = this.GetRandUserCheck(session, req) if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 @@ -43,41 +44,40 @@ func (this *apiComp) GetRandUser(session comm.IUserSession, req *pb.GourmetGetRa if v.Uid == session.GetUserId() || v.Uid == "" { // 过滤自己信息 continue } - + mapUser[v.Uid] = struct{}{} szUid = append(szUid, v.Uid) } // 随机在线玩家信息 - if len(onlineList) > int(req.People) { - randArr := utils.Numbers(0, len(onlineList), int(req.People)) + if len(szUid) > int(req.People) { + randArr := utils.Numbers(0, len(szUid), int(req.People)) for _, v := range randArr { - if onlineList[v].Uid != "" { - randOnlineUsers = append(randOnlineUsers, onlineList[v].Uid) + if szUid[v] != "" { + mapUser[szUid[v]] = struct{}{} } } } else { // 数量不足 则有多少给多少 for _, v := range szUid { - randOnlineUsers = append(randOnlineUsers, v) + mapUser[v] = struct{}{} } - left := int(req.People) - len(randOnlineUsers) + left := int(req.People) - len(mapUser) if left > 0 { // 一个人也没有 那就从db 中随机取 - //tag := session.GetServiecTag() - //if conn, err := db.ServerDBConn(tag); err == nil { - //dbModel := db.NewDBModel(comm.TableUser, time.Hour, conn) - - if _data, err1 := this.module.modelGourmet.DB.Find(core.SqlTable(comm.TableUser), bson.M{}, options.Find().SetSort(bson.M{"lv": -1}).SetLimit(int64(left))); err1 == nil { + if _data, err1 := this.module.modelGourmet.DB.Find(core.SqlTable(comm.TableUser), bson.M{}, options.Find().SetSort(bson.M{"lv": -1}).SetLimit(int64(req.People))); err1 == nil { for _data.Next(context.TODO()) { temp := &pb.DBUser{} if err = _data.Decode(temp); err == nil { - randOnlineUsers = append(randOnlineUsers, temp.Uid) - + if len(mapUser) >= int(req.People) { + break + } + if _, ok := mapUser[temp.Uid]; !ok { + szDbUser = append(szDbUser, temp) + } } } } - //} } } - for _, v := range randOnlineUsers { - user, _ := this.module.ModuleUser.GetCrossUser(v) + for k := range mapUser { + user, _ := this.module.ModuleUser.GetRmoteUser(k) szDbUser = append(szDbUser, user) // 转成user对象 } session.SendMsg(string(this.module.GetType()), GourmetGetRandUserResp, &pb.GourmetGetRandUserResp{User: szDbUser}) diff --git a/modules/smithy/api_getranduser.go b/modules/smithy/api_getranduser.go index ed6b75b3d..066242c1f 100644 --- a/modules/smithy/api_getranduser.go +++ b/modules/smithy/api_getranduser.go @@ -69,7 +69,7 @@ func (this *apiComp) GetRandUser(session comm.IUserSession, req *pb.SmithyGetRan break } if _, ok := mapUser[temp.Uid]; !ok { - mapUser[temp.Uid] = struct{}{} + szDbUser = append(szDbUser, temp) } } } @@ -77,7 +77,7 @@ func (this *apiComp) GetRandUser(session comm.IUserSession, req *pb.SmithyGetRan } } for k := range mapUser { - user, _ := this.module.ModuleUser.GetCrossUser(k) + user, _ := this.module.ModuleUser.GetRmoteUser(k) szDbUser = append(szDbUser, user) // 转成user对象 } session.SendMsg(string(this.module.GetType()), SmithyGetRandUserResp, &pb.SmithyGetRandUserResp{User: szDbUser})