From 7feca849307be9aa31781bae9ef7e70f3a0d0248 Mon Sep 17 00:00:00 2001
From: sk <123456@qq.com>
Date: Fri, 10 Jan 2025 15:10:45 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=BA=A2=E5=8C=85=E9=A2=86=E5=8F=96?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dao/red_packet_history.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dao/red_packet_history.go b/dao/red_packet_history.go
index a418ed3..d4aa21d 100644
--- a/dao/red_packet_history.go
+++ b/dao/red_packet_history.go
@@ -43,6 +43,10 @@ func NewRedPacketHistory(db *mongo.Database, c *mongo.Collection) (*RedPacketHis
 			Keys:    bson.D{{"snid", 1}, {"cid", 1}, {"ts", -1}},         // 1 表示升序，-1 表示降序
 			Options: options.Index().SetBackground(true).SetSparse(true), // 后台创建索引，稀疏索引
 		},
+		{
+			Keys:    bson.D{{"snid", 1}, {"ts", -1}},
+			Options: options.Index().SetBackground(true).SetSparse(true),
+		},
 		{
 			Keys:    bson.D{{"cid", 1}},                                  // 1 表示升序，-1 表示降序
 			Options: options.Index().SetBackground(true).SetSparse(true), // 后台创建索引，稀疏索引
@@ -66,7 +70,10 @@ func NewRedPacketHistory(db *mongo.Database, c *mongo.Collection) (*RedPacketHis
 
 func (r *RedPacketHistory) GetHistory(snid int32, cid int64) ([]*modelpkg.RedPacketHistory, error) {
 	res, err := r.FindMany(context.Background(), func(cols *internal.RedPacketHistoryColumns) interface{} {
-		return bson.M{cols.Snid: snid, cols.Cid: cid}
+		if cid > 0 {
+			return bson.M{cols.Snid: snid, cols.Cid: cid}
+		}
+		return bson.M{cols.Snid: snid}
 	}, func(cols *internal.RedPacketHistoryColumns) *options.FindOptions {
 		return options.Find().SetSort(bson.D{{cols.Ts, -1}}).SetLimit(30)
 	})