tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into release

This commit is contained in:
sk 2024-09-19 10:37:41 +08:00
parent e636afc4aa 7dd1a191ea
commit 8aa5fd7c56
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
worldsrv/action_player.go
View File

@ -2818,27 +2818,33 @@ func CSBillList(s *netlib.Session, packetId int, data interface{}, sid int64) er
fromIndex := msg.GetPageNo() * msg.GetPageSize() fromIndex := msg.GetPageNo() * msg.GetPageSize()
toIndex := fromIndex + msg.GetPageSize() toIndex := fromIndex + msg.GetPageSize()
logs, _, err := model.GetCoinLogGame(p.Platform, p.SnId, common.BillTypeCoin, startTs, endTs, int(fromIndex), int(toIndex)) var err error
if err != nil { var logs []model.CoinLog
logger.Logger.Errorf("GetCoinLogGame err:%v", err) task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
p.SendToClient(int(player_proto.PlayerPacketID_PACKET_SCBillList), ret) logs, _, err = model.GetCoinLogGame(p.Platform, p.SnId, common.BillTypeCoin, startTs, endTs, int(fromIndex), int(toIndex))
return err return nil
} }), task.CompleteNotifyWrapper(func(i interface{}, t task.Task) {
if err != nil {
logger.Logger.Errorf("GetCoinLogGame err:%v", err)
p.SendToClient(int(player_proto.PlayerPacketID_PACKET_SCBillList), ret)
return
}
for _, v := range logs { for _, v := range logs {
ret.Items = append(ret.Items, &player_proto.BillItem{ ret.Items = append(ret.Items, &player_proto.BillItem{
Ts: v.Ts, Ts: v.Ts,
Id: v.LogId.Hex(), Id: v.LogId.Hex(),
BillType: int64(v.LogType), BillType: int64(v.LogType),
Amount: v.Count, Amount: v.Count,
Balance: v.RestCount, Balance: v.RestCount,
GameID: int64(v.InGame), GameID: int64(v.InGame),
GameFreeID: v.GameFreeId, GameFreeID: v.GameFreeId,
BaseCoin: v.BaseCoin, BaseCoin: v.BaseCoin,
}) })
} }
p.SendToClient(int(player_proto.PlayerPacketID_PACKET_SCBillList), ret) p.SendToClient(int(player_proto.PlayerPacketID_PACKET_SCBillList), ret)
logger.Logger.Tracef("SCBillList pageNo:%d, pageSize:%d %v", msg.GetPageNo(), msg.GetPageSize(), ret) logger.Logger.Tracef("SCBillList pageNo:%d, pageSize:%d %v", msg.GetPageNo(), msg.GetPageSize(), ret)
}), "GetCoinLogGame").Start()
return nil return nil
} }