Compare commits

..

No commits in common. "74c36f408354874b7309e56a9e49402c960625eb" and "fcdb12669c23a6122e87aabb74b35cd2db50fcee" have entirely different histories.

3 changed files with 13 additions and 13 deletions

View File

@ -124,7 +124,15 @@ func (svc *ItemLogSvc) GetClawdollItemLog(args *model.ClawdollItemLogReq, ret *m
return
}
err = c.Find(cond).Select(bson.M{"itemid": 1, "createts": 1, "typeid": 1, "count": 1, "logtype": 1}).All(&ret.Logs)
type RetClawdollItemLog struct {
ItemId int32 //道具ID
Time int64 //时间
TypeId int32 //道具记录类型
Num int64 //数量
LogType int32 //记录类型 0.获取 1.消耗
}
err = c.Find(cond).Limit(1000).Select(bson.M{"itemid": 1, "createts": 1, "typeid": 1, "count": 1, "logtype": 1}).All(&ret.Logs)
return
}
@ -138,7 +146,7 @@ func (svc *ItemLogSvc) GetClawdollSuccessItemLog(args *model.ClawdollSuccessItem
}
var datas []model.ItemLog
err = c.Find(cond).All(&datas)
err = c.Find(cond).Limit(1000).All(&datas)
if err != nil {
logger.Logger.Error("GetClawdollSuccessItemLog error: ", err)
return err

View File

@ -132,19 +132,11 @@ type ClawdollItemLogReq struct {
TypeIds []int32
}
type RetClawdollItemLog struct {
ItemId int32 //道具ID
CreateTs int64 //记录时间
TypeId int32 // 变化类型
Count int64 //个数
LogType int32 //记录类型 0.获取 1.消耗
}
type GetClawdollItemLogRet struct {
Logs []RetClawdollItemLog
Logs []ItemLog
}
func GetClawdollItemLog(plt string, snid int32, typeIds []int32) (logs []RetClawdollItemLog, err error) {
func GetClawdollItemLog(plt string, snid int32, typeIds []int32) (logs []ItemLog, err error) {
if rpcCli == nil {
logger.Logger.Error("model.GetClawdollItemLog rpcCli == nil")

View File

@ -3180,7 +3180,7 @@ func CSClawdollItemLog(s *netlib.Session, packetId int, data interface{}, sid in
ret.TypeIds = append(ret.TypeIds, msg.TypeIds...)
var err error
var ItemUseLogs []model.RetClawdollItemLog
var ItemUseLogs []model.ItemLog
//娃娃机道具使用日志
task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {