From 81a9e55a289840f02a5eace1e36df313daf6ffe1 Mon Sep 17 00:00:00 2001
From: 王家文 <wangjiawen@puchigames.com>
Date: Tue, 23 Apr 2024 10:08:00 +0800
Subject: [PATCH] fix🐛:配置错误时给出提示

---
 configs/confbase/external.go |  2 +-
 service/roomrank/handle.go   | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/configs/confbase/external.go b/configs/confbase/external.go
index 54123ac..2362406 100644
--- a/configs/confbase/external.go
+++ b/configs/confbase/external.go
@@ -85,7 +85,7 @@ func GetCurrent[T1 IConfData, T2 IConfRawData](gameId string, obj T1) bool {
 	} else {
 		has = GetConfig[T1, T2](gameId, currentId, obj)
 		if has {
-			if obj.CheckCurrent() {
+			if !obj.CheckCurrent() {
 				hasFind = FindDuringTime[T1, T2](obj, confRaw, gameId)
 			}
 		} else {
diff --git a/service/roomrank/handle.go b/service/roomrank/handle.go
index 49642dd..d1576d6 100644
--- a/service/roomrank/handle.go
+++ b/service/roomrank/handle.go
@@ -6,7 +6,6 @@ import (
 	"apigame/service-common/svmysql"
 	"apigame/service/code-msg"
 	"apigame/util/zredislock"
-	"fmt"
 )
 
 // HandleGetConfig 活动配置
@@ -83,17 +82,15 @@ func HandleInfo(req *models.ReqRoomRankInfo) (code string, rsp models.RspRoomRan
 	// 尝试加入房间
 	room, hasRoom := TryGetRoom(gameId, player, config, playerLevel)
 
-	if hasRoom {
-		TryReSort(room, config)
-
-		SavePlayer(gameId, player)
-		SaveRoom(gameId, room)
+	if !hasRoom {
+		code = code_msg.RECODE_MERGE_CONFIG_ERROR
+		return
 	}
-
+	TryReSort(room, config)
+	SavePlayer(gameId, player)
+	SaveRoom(gameId, room)
 	rsp.RoomRankInfo = GetInfoFromRoom(player, room)
 
-	fmt.Println("dwjw🐸  len(room.Details.Players) 1:", len(room.Details.Players))
-
 	return
 }
 
@@ -138,6 +135,8 @@ func HandleGetSettleAward(req *models.ReqRoomRankGetSettleAward) (code string, r
 	rsp.AwardText = player.SettleAward
 	player.SettleHas = false
 	player.SettleAward = ""
+	player.ActivityId = config.Id
+	player.RoomUid = 0
 	SavePlayer(gameId, player)
 
 	// 记录日志
@@ -202,12 +201,13 @@ func HandleAddScore(req *models.ReqRoomRankAddScore) (code string, rsp models.Rs
 	// 房间排行增加积分
 	oldScore, newScore := ChangePlayerScore(room, player, req.AddScore)
 
-	if hasRoom {
-		TryReSort(room, config)
-
-		SavePlayer(gameId, player)
-		SaveRoom(gameId, room)
+	if !hasRoom {
+		code = code_msg.RECODE_MERGE_CONFIG_ERROR
+		return
 	}
+	TryReSort(room, config)
+	SavePlayer(gameId, player)
+	SaveRoom(gameId, room)
 
 	rsp.RoomRankInfo = GetInfoFromRoom(player, room)
 
--
libgit2 0.21.0