From 0662974c07b0536e1eb99a092f3c8d3fbbaf54cb Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Tue, 30 Jan 2024 13:59:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=AB=9E=E6=8A=80=E5=9C=BA?=
 =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E8=AF=BB=E5=8F=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/arena/modelrank.go | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/arena/modelrank.go b/modules/arena/modelrank.go
index 7a250cb52..290a5a6dc 100644
--- a/modules/arena/modelrank.go
+++ b/modules/arena/modelrank.go
@@ -28,6 +28,10 @@ func (this *modelRank) Init(service core.IService, module core.IModule, comp cor
 	return
 }
 
+func (this *modelRank) rankey() string {
+	return fmt.Sprintf("%s-%s", this.DBModel.ServiceId, this.TableName)
+}
+
 // 更新排名
 func (this *modelRank) updateArenaRank(users ...*pb.ArenaPlayer) (err error) {
 	var (
@@ -41,11 +45,11 @@ func (this *modelRank) updateArenaRank(users ...*pb.ArenaPlayer) (err error) {
 	for i, v := range users {
 		menbers[i] = &redis.Z{Score: float64(v.Integral), Member: v.Uinfo.Uid}
 	}
-	if cmd = pipe.ZAdd(this.TableName, menbers...); err != nil {
+	if cmd = pipe.ZAdd(this.rankey(), menbers...); err != nil {
 		this.module.Errorln(err)
 	}
 	for i, v := range users {
-		menbersCmd[i] = pipe.ZRevRank(this.TableName, v.Uinfo.Uid)
+		menbersCmd[i] = pipe.ZRevRank(this.rankey(), v.Uinfo.Uid)
 	}
 	if _, err = pipe.Exec(); err != nil {
 		this.module.Errorln(err)
@@ -67,7 +71,7 @@ func (this *modelRank) updateArenaRank(users ...*pb.ArenaPlayer) (err error) {
 
 //获取指定区间的玩家人数
 func (this *modelRank) queryRankByScoreArea(min, max int32) (count int64, err error) {
-	if count, err = this.DBModel.Redis.ZCount(fmt.Sprintf("%s-%s", this.DBModel.ServiceId, this.TableName), fmt.Sprintln(min), fmt.Sprintln(max)); err != nil {
+	if count, err = this.DBModel.Redis.ZCount(this.rankey(), fmt.Sprintln(min), fmt.Sprintln(max)); err != nil {
 		this.module.Errorln(err)
 		return
 	}
@@ -79,7 +83,7 @@ func (this *modelRank) queryRankUser() (ranks []string, err error) {
 	var (
 		result []string
 	)
-	if result, err = this.DBModel.Redis.ZRevRange(fmt.Sprintf("%s-%s", this.DBModel.ServiceId, this.TableName), 0, 50).Result(); err != nil {
+	if result, err = this.DBModel.Redis.ZRevRange(this.rankey(), 0, 50).Result(); err != nil {
 		this.module.Errorln(err)
 		return
 	}
@@ -93,6 +97,6 @@ func (this *modelRank) queryRankUser() (ranks []string, err error) {
 // 比赛结算
 func (this *modelRank) raceSettlement() {
 	if isopen := this.module.modelArena.isInMaintenance(); isopen {
-		this.DBModel.Del(fmt.Sprintf("%s-%s", this.DBModel.ServiceId, this.TableName), db.SetDBMgoLog(false))
+		this.DBModel.Del(this.rankey(), db.SetDBMgoLog(false))
 	}
 }