Merge branch 'develop' into release
This commit is contained in:
commit
8aa5fd7c56
|
@ -2818,11 +2818,16 @@ 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
|
||||||
|
var logs []model.CoinLog
|
||||||
|
task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
|
||||||
|
logs, _, err = model.GetCoinLogGame(p.Platform, p.SnId, common.BillTypeCoin, startTs, endTs, int(fromIndex), int(toIndex))
|
||||||
|
return nil
|
||||||
|
}), task.CompleteNotifyWrapper(func(i interface{}, t task.Task) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Logger.Errorf("GetCoinLogGame err:%v", err)
|
logger.Logger.Errorf("GetCoinLogGame err:%v", err)
|
||||||
p.SendToClient(int(player_proto.PlayerPacketID_PACKET_SCBillList), ret)
|
p.SendToClient(int(player_proto.PlayerPacketID_PACKET_SCBillList), ret)
|
||||||
return err
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, v := range logs {
|
for _, v := range logs {
|
||||||
|
@ -2839,6 +2844,7 @@ func CSBillList(s *netlib.Session, packetId int, data interface{}, sid int64) er
|
||||||
}
|
}
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue