From b18e2393b0e96f02caf2edd0305223a04b5e71c5 Mon Sep 17 00:00:00 2001
From: "DESKTOP-45ANQ2C\\unis" <179233648@qq.com>
Date: Fri, 27 Sep 2024 18:28:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A8=83=E5=A8=83=E6=9C=BA=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=E5=85=91=E6=8D=A2=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dbproxy/svc/l_itemlog.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dbproxy/svc/l_itemlog.go b/dbproxy/svc/l_itemlog.go
index 420d038..2292a1e 100644
--- a/dbproxy/svc/l_itemlog.go
+++ b/dbproxy/svc/l_itemlog.go
@@ -120,6 +120,7 @@ func (svc *ItemLogSvc) GetClawdollItemLog(args *model.ClawdollItemLogReq, ret *m
 
 	var Logs []model.RetClawdollItemLog
 	for _, typeId := range args.TypeIds {
+		var SubLogs []model.RetClawdollItemLog
 		sql = append(sql, bson.M{"snid": args.Snid, "typeid": typeId})
 
 		switch typeId {
@@ -136,7 +137,9 @@ func (svc *ItemLogSvc) GetClawdollItemLog(args *model.ClawdollItemLogReq, ret *m
 			return
 		}
 
-		err = c.Find(bson.M{"$and": sql}).Select(bson.M{"itemid": 1, "createts": 1, "typeid": 1, "count": 1, "logtype": 1}).All(&Logs)
+		err = c.Find(bson.M{"$and": sql}).Select(bson.M{"itemid": 1, "createts": 1, "typeid": 1, "count": 1, "logtype": 1}).All(&SubLogs)
+
+		Logs = append(Logs, SubLogs...)
 	}
 
 	ret.Logs = Logs

From e47ee084d3758fadd6aa06e63bdbfb939d1d3128 Mon Sep 17 00:00:00 2001
From: "DESKTOP-45ANQ2C\\unis" <179233648@qq.com>
Date: Sat, 28 Sep 2024 10:05:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A8=83=E5=A8=83=E5=8D=A1=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E8=AE=B0=E5=BD=95=20typeid=20=20=20GainWay=5FShop=5FB?=
 =?UTF-8?q?uy=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=3D=2035=20=20//=E8=B4=AD=E4=B9=B0=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=20=20=20=20=E6=8D=A2=E6=88=90=20=EF=BC=9A=20GainWay?=
 =?UTF-8?q?=5FShopBuy=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=3D=2010=20=20//=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E6=88=96=E8=80=85=E5=85=91=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dbproxy/svc/l_itemlog.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dbproxy/svc/l_itemlog.go b/dbproxy/svc/l_itemlog.go
index 2292a1e..e3a1ddd 100644
--- a/dbproxy/svc/l_itemlog.go
+++ b/dbproxy/svc/l_itemlog.go
@@ -124,7 +124,7 @@ func (svc *ItemLogSvc) GetClawdollItemLog(args *model.ClawdollItemLogReq, ret *m
 		sql = append(sql, bson.M{"snid": args.Snid, "typeid": typeId})
 
 		switch typeId {
-		case common.GainWay_Shop_Buy: // 商城兑换
+		case common.GainWay_ShopBuy: // 充值记录
 			sql = append(sql, bson.M{"itemid": common.ItemIDClawdoll})
 		case common.GainWayItemShopChangeDoll: // 积分支出
 			sql = append(sql, bson.M{"itemid": common.ItemDollCard})