Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop

This commit is contained in:
sk 2024-09-28 10:12:23 +08:00
commit 0e794ac6c3
1 changed files with 5 additions and 2 deletions

View File

@ -120,10 +120,11 @@ func (svc *ItemLogSvc) GetClawdollItemLog(args *model.ClawdollItemLogReq, ret *m
var Logs []model.RetClawdollItemLog var Logs []model.RetClawdollItemLog
for _, typeId := range args.TypeIds { for _, typeId := range args.TypeIds {
var SubLogs []model.RetClawdollItemLog
sql = append(sql, bson.M{"snid": args.Snid, "typeid": typeId}) sql = append(sql, bson.M{"snid": args.Snid, "typeid": typeId})
switch typeId { switch typeId {
case common.GainWay_Shop_Buy: // 商城兑换 case common.GainWay_ShopBuy: // 充值记录
sql = append(sql, bson.M{"itemid": common.ItemIDClawdoll}) sql = append(sql, bson.M{"itemid": common.ItemIDClawdoll})
case common.GainWayItemShopChangeDoll: // 积分支出 case common.GainWayItemShopChangeDoll: // 积分支出
sql = append(sql, bson.M{"itemid": common.ItemDollCard}) sql = append(sql, bson.M{"itemid": common.ItemDollCard})
@ -136,7 +137,9 @@ func (svc *ItemLogSvc) GetClawdollItemLog(args *model.ClawdollItemLogReq, ret *m
return 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 ret.Logs = Logs