From 6a712e5b192336e23b0899f067c6f123d049e8af Mon Sep 17 00:00:00 2001
From: by <123456@qq.com>
Date: Tue, 7 Jan 2025 00:24:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E5=85=BD=E6=8E=92=E8=A1=8C=E6=A6=9C?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dbproxy/svc/l_ranknian.go | 4 ++--
 worldsrv/rankmatch.go     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dbproxy/svc/l_ranknian.go b/dbproxy/svc/l_ranknian.go
index 018811c..868dc0f 100644
--- a/dbproxy/svc/l_ranknian.go
+++ b/dbproxy/svc/l_ranknian.go
@@ -80,7 +80,7 @@ func (svc *RankNianSvc) LuckFind(args *model.FindNianListArgs, ret *model.FindNi
 		return RankNianColError
 	}
 
-	err := fc.Find(bson.M{}).Sort("-luck").Limit(40).All(&ret.List)
+	err := fc.Find(bson.M{"luck": bson.M{"$gt": 0}}).Sort("-luck").Limit(40).All(&ret.List)
 	if err != nil && !errors.Is(err, mgo.ErrNotFound) {
 		logger.Logger.Error("QueryMatchSeason is err: ", err)
 		return err
@@ -95,7 +95,7 @@ func (svc *RankNianSvc) DamageFind(args *model.FindNianListArgs, ret *model.Find
 		return RankNianColError
 	}
 
-	err := fc.Find(bson.M{}).Sort("-damage").Limit(40).All(&ret.List)
+	err := fc.Find(bson.M{"damage": bson.M{"$gt": 0}}).Sort("-damage").Limit(40).All(&ret.List)
 	if err != nil && !errors.Is(err, mgo.ErrNotFound) {
 		logger.Logger.Error("QueryMatchSeason is err: ", err)
 		return err
diff --git a/worldsrv/rankmatch.go b/worldsrv/rankmatch.go
index e2a7da1..7357426 100644
--- a/worldsrv/rankmatch.go
+++ b/worldsrv/rankmatch.go
@@ -1034,6 +1034,7 @@ func (r *RankMatchMgr) NianRankAward() {
 						log.RankData = append(log.RankData, rankData)
 						rankId += 1
 					}
+					mq.Write(log)
 					//清除幸运榜数值
 					err := model.ClearNianRank(&model.FindNianListArgs{
 						Platform: platform,
@@ -1041,7 +1042,6 @@ func (r *RankMatchMgr) NianRankAward() {
 					if err != nil {
 						logger.Logger.Errorf("清除幸运榜数值失败 err:%v", err)
 					}
-					mq.Write(log)
 
 				})).StartByExecutor("NianLuck_Award")
 			} else if info.TypeId == 2 {
@@ -1117,6 +1117,7 @@ func (r *RankMatchMgr) NianRankAward() {
 						log.RankData = append(log.RankData, rankData)
 						rankId += 1
 					}
+					mq.Write(log)
 					//删除数据库数据
 					err := model.DelNianRank(&model.FindNianListArgs{
 						Platform: platform,
@@ -1124,7 +1125,6 @@ func (r *RankMatchMgr) NianRankAward() {
 					if err != nil {
 						logger.Logger.Errorf("删除年兽排行榜数据库数据 err:%v", err)
 					}
-					mq.Write(log)
 				})).StartByExecutor("NianDamage_Award")
 			}
 		}