From 505b0f01efcb9dc74770304d2be1adddca6d748a Mon Sep 17 00:00:00 2001
From: sk <123456@qq.com>
Date: Wed, 30 Oct 2024 16:16:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dbproxy/mq/c_lotterycode.go |  2 --
 dbproxy/svc/l_lotterylog.go |  3 ++-
 worldsrv/lotterymgr.go      | 23 +++++++++++++++--------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/dbproxy/mq/c_lotterycode.go b/dbproxy/mq/c_lotterycode.go
index b703f53..a43dfe6 100644
--- a/dbproxy/mq/c_lotterycode.go
+++ b/dbproxy/mq/c_lotterycode.go
@@ -41,8 +41,6 @@ func init() {
 			if err = svc.InsertLotteryLogs(log.Platform, log); err != nil {
 				logger.Logger.Errorf("InsertLotteryLogs error: %v", err)
 			}
-
-			mq.Write(&model.LotteryLog{Platform: log.Platform}, mq.RankLotteryLog)
 			return
 		},
 	})
diff --git a/dbproxy/svc/l_lotterylog.go b/dbproxy/svc/l_lotterylog.go
index bc6e298..601558c 100644
--- a/dbproxy/svc/l_lotterylog.go
+++ b/dbproxy/svc/l_lotterylog.go
@@ -69,7 +69,8 @@ func GetLotteryLogs(plt string, count int) (ret []*model.LotteryLog, err error)
 	if clog == nil {
 		return nil, LotteryLogDBErr
 	}
-	err = clog.Find(bson.M{"ts": bson.M{"$lt": time.Now().Unix()}}).Sort("-ts").Limit(count).All(&ret)
+	now := time.Now().Unix()
+	err = clog.Find(bson.M{"ts": bson.M{"$lt": now}}).Sort("-ts").Limit(count).All(&ret)
 	if err != nil && !errors.Is(err, mgo.ErrNotFound) {
 		return nil, err
 	}
diff --git a/worldsrv/lotterymgr.go b/worldsrv/lotterymgr.go
index a05e14f..e481865 100644
--- a/worldsrv/lotterymgr.go
+++ b/worldsrv/lotterymgr.go
@@ -104,6 +104,7 @@ func (l *LotteryData) Reset() {
 	l.CostCard = 0
 	l.RobotCodeCount = 0
 	l.PlayerNum = 0
+	logger.Logger.Tracef("LotteryData Reset: %v", l.CId)
 }
 
 // GetCode 获取抽奖码
@@ -143,8 +144,8 @@ func (l *LotteryData) GetRemainCode() int {
 }
 
 // 发奖
-func (l *LotteryData) sendAward() {
-	if l.isDone {
+func (l *LotteryData) sendAward(must bool) {
+	if l.isDone || !must {
 		return
 	}
 
@@ -153,6 +154,7 @@ func (l *LotteryData) sendAward() {
 		return
 	}
 	l.IsSend = true
+	mq.Write(&model.LotteryLog{Platform: l.Platform}, mq.RankLotteryLog)
 
 	var lotteryAward []*welfare.PropInfo
 	for _, v := range l.Reward {
@@ -218,6 +220,7 @@ func (l *LotteryData) Done() {
 		return
 	}
 	l.isDone = true
+	logger.Logger.Tracef("LotteryData Done1: cid:%v wincode:%v snid:%v", l.CId, l.WinCode, l.SnId)
 
 	now := time.Now()
 	if l.EndTs <= 0 || l.EndTs >= now.Unix() || l.SnId > 0 || now.Unix()-l.EndTs > 5*60 {
@@ -415,11 +418,12 @@ func (l *LotteryData) Done() {
 				Ts:        l.WinTs,
 			}
 			mq.Write(lotteryLog)
-			logger.Logger.Tracef("LotteryData 抽奖中奖记录: %+v", *lotteryLog)
+			logger.Logger.Tracef("LotteryData 抽奖中奖记录: %+v %p", *lotteryLog, l)
+			logger.Logger.Tracef("LotteryData Done2: cid:%v wincode:%v snid:%v", l.CId, l.WinCode, l.SnId)
 			// 开始发奖
-			l.sendAward()
+			l.sendAward(true)
 		}
-	}), "LotterySendAward").Start()
+	})).StartByExecutor(fmt.Sprintf("LotterySendAward_%s_%d", l.Platform, l.CId))
 }
 
 type LotteryConfig struct {
@@ -463,8 +467,9 @@ func (l *LotteryMgr) Init() {
 }
 
 func (l *LotteryMgr) Update() {
-	for _, v := range l.Data {
-		for _, d := range v {
+	for i := range l.Data {
+		for k := range l.Data[i] {
+			d := l.Data[i][k]
 			if d == nil {
 				continue
 			}
@@ -475,9 +480,11 @@ func (l *LotteryMgr) Update() {
 			// 随机给机器人发放抽奖码
 			d.sendRobotCode(1, 5)
 			// 活动结束，开始抽奖
+			logger.Logger.Tracef("Done1 cid:%v wincode:%v %p", d.CId, d.WinCode, d)
 			d.Done()
+			logger.Logger.Tracef("Done2 cid:%v wincode:%v %p", d.CId, d.WinCode, d)
 			// 开始发奖
-			d.sendAward()
+			d.sendAward(false)
 		}
 	}
 }