From 712531131dfb4604eec63beef0332cf80e37e3a5 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 12 Oct 2022 18:49:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=85=B6=E4=BB=96=E7=8E=A9?= =?UTF-8?q?=E5=AE=B6=E6=88=98=E6=96=97=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/pagoda/api_queryrecord.go | 2 +- modules/pagoda/model_pagoda.go | 14 -------------- modules/pagoda/model_rank.go | 14 ++++++++++++++ modules/pagoda/module.go | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/pagoda/api_queryrecord.go b/modules/pagoda/api_queryrecord.go index 43512ef31..19b21ba81 100644 --- a/modules/pagoda/api_queryrecord.go +++ b/modules/pagoda/api_queryrecord.go @@ -30,7 +30,7 @@ func (this *apiComp) QueryRecord(session comm.IUserSession, req *pb.PagodaQueryR list.Type = comm.PagodaType this.module.modelPagoda.addNewPagoda(session.GetUserId(), list) } else { - record = this.module.modelPagoda.getPagodaRankList(session.GetUserId(), list.PagodaId) + record = this.module.modulerank.getPagodaRankListByFloorid(session.GetUserId(), list.PagodaId) } session.SendMsg(string(this.module.GetType()), PagodaQueryRecordResp, &pb.PagodaQueryRecordResp{Data: record}) return diff --git a/modules/pagoda/model_pagoda.go b/modules/pagoda/model_pagoda.go index eac492eca..1b3f1591f 100644 --- a/modules/pagoda/model_pagoda.go +++ b/modules/pagoda/model_pagoda.go @@ -53,17 +53,3 @@ func (this *ModelPagoda) addNewPagoda(uId string, data *pb.DBPagoda) (err error) } return nil } - -func (this *ModelPagoda) getPagodaRankList(uid string, floorid int32) *pb.DBPagodaRecord { - pagodaRank := make([]*pb.DBPagodaRecord, 0) - err := this.GetList(uid, &pagodaRank) - if err != nil { - return nil - } - for _, v := range pagodaRank { - if v.PagodaId == floorid { - return v - } - } - return nil -} diff --git a/modules/pagoda/model_rank.go b/modules/pagoda/model_rank.go index 80b97a24b..83a82eee8 100644 --- a/modules/pagoda/model_rank.go +++ b/modules/pagoda/model_rank.go @@ -177,3 +177,17 @@ func (this *ModelRank) ChangeFloorRankList(session comm.IUserSession, floor int3 } return } + +func (this *ModelRank) getPagodaRankListByFloorid(uid string, floorid int32) *pb.DBPagodaRecord { + pagodaRank := make([]*pb.DBPagodaRecord, 0) + err := this.GetList(uid, &pagodaRank) + if err != nil { + return nil + } + for _, v := range pagodaRank { + if v.PagodaId == floorid { + return v + } + } + return nil +} diff --git a/modules/pagoda/module.go b/modules/pagoda/module.go index a2be244c9..630bebf14 100644 --- a/modules/pagoda/module.go +++ b/modules/pagoda/module.go @@ -88,7 +88,7 @@ func (this *Pagoda) CheckUserBasePagodaInfo(uid string) (data *pb.DBPagodaRecord list, _ := this.modelPagoda.getPagodaList(uid) if list != nil { // redis没有数据 - data = this.modelPagoda.getPagodaRankList(uid, list.PagodaId) + data = this.modulerank.getPagodaRankListByFloorid(uid, list.PagodaId) } return }