道具兑换撤单
This commit is contained in:
parent
f637724a61
commit
8e880d65b1
|
|
@ -27,6 +27,7 @@ type ItemLog struct {
|
||||||
GameId int32 // 游戏id,游戏中获得时有值
|
GameId int32 // 游戏id,游戏中获得时有值
|
||||||
GameFreeId int32 // 场次id,游戏中获得时有值
|
GameFreeId int32 // 场次id,游戏中获得时有值
|
||||||
Cost []*ItemInfo // 消耗的道具
|
Cost []*ItemInfo // 消耗的道具
|
||||||
|
Id string // 撤销的id,兑换失败
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewItemLog() *ItemLog {
|
func NewItemLog() *ItemLog {
|
||||||
|
|
@ -46,6 +47,7 @@ type ItemParam struct {
|
||||||
GameId int64 // 游戏id,游戏中获得时有值
|
GameId int64 // 游戏id,游戏中获得时有值
|
||||||
GameFreeId int64 // 场次id,游戏中获得时有值
|
GameFreeId int64 // 场次id,游戏中获得时有值
|
||||||
Cost []*ItemInfo // 消耗的道具
|
Cost []*ItemInfo // 消耗的道具
|
||||||
|
LogId string // 撤销的id,兑换失败
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewItemLogEx(param ItemParam) *ItemLog {
|
func NewItemLogEx(param ItemParam) *ItemLog {
|
||||||
|
|
@ -62,6 +64,7 @@ func NewItemLogEx(param ItemParam) *ItemLog {
|
||||||
itemLog.GameId = int32(param.GameId)
|
itemLog.GameId = int32(param.GameId)
|
||||||
itemLog.GameFreeId = int32(param.GameFreeId)
|
itemLog.GameFreeId = int32(param.GameFreeId)
|
||||||
itemLog.Cost = param.Cost
|
itemLog.Cost = param.Cost
|
||||||
|
itemLog.Id = param.LogId
|
||||||
return itemLog
|
return itemLog
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -150,16 +150,18 @@ type ItemParam struct {
|
||||||
Operator, Remark string // 操作人,备注
|
Operator, Remark string // 操作人,备注
|
||||||
gameId, gameFreeId int64 // 游戏id,场次id
|
gameId, gameFreeId int64 // 游戏id,场次id
|
||||||
noLog bool // 是否不记录日志
|
noLog bool // 是否不记录日志
|
||||||
LogId string
|
LogId string // 撤销的id,道具兑换失败
|
||||||
}
|
}
|
||||||
|
|
||||||
type AddItemParam struct {
|
type AddItemParam struct {
|
||||||
Cost []*model.ItemInfo // 获得道具时消耗的道具数量
|
Cost []*model.ItemInfo // 获得道具时消耗的道具数量
|
||||||
|
LogId string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (this *BagMgr) AddItemsV2(args *ItemParam) (*BagInfo, bag.OpResultCode, bool) {
|
func (this *BagMgr) AddItemsV2(args *ItemParam) (*BagInfo, bag.OpResultCode, bool) {
|
||||||
return this.AddItems(args.P, args.Change, args.Add, args.GainWay, args.Operator, args.Remark, args.gameId, args.gameFreeId, args.noLog, AddItemParam{
|
return this.AddItems(args.P, args.Change, args.Add, args.GainWay, args.Operator, args.Remark, args.gameId, args.gameFreeId, args.noLog, AddItemParam{
|
||||||
Cost: args.Cost,
|
Cost: args.Cost,
|
||||||
|
LogId: args.LogId,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -175,8 +177,10 @@ func (this *BagMgr) AddItemsV2(args *ItemParam) (*BagInfo, bag.OpResultCode, boo
|
||||||
func (this *BagMgr) AddItems(p *Player, addItems []*Item, add int64, gainWay int32, operator, remark string,
|
func (this *BagMgr) AddItems(p *Player, addItems []*Item, add int64, gainWay int32, operator, remark string,
|
||||||
gameId, gameFreeId int64, noLog bool, params ...AddItemParam) (*BagInfo, bag.OpResultCode, bool) {
|
gameId, gameFreeId int64, noLog bool, params ...AddItemParam) (*BagInfo, bag.OpResultCode, bool) {
|
||||||
var cost []*model.ItemInfo
|
var cost []*model.ItemInfo
|
||||||
|
var id string
|
||||||
if len(params) > 0 {
|
if len(params) > 0 {
|
||||||
cost = params[0].Cost
|
cost = params[0].Cost
|
||||||
|
id = params[0].LogId
|
||||||
}
|
}
|
||||||
|
|
||||||
var items []*Item
|
var items []*Item
|
||||||
|
|
@ -313,6 +317,7 @@ func (this *BagMgr) AddItems(p *Player, addItems []*Item, add int64, gainWay int
|
||||||
GameId: gameId,
|
GameId: gameId,
|
||||||
GameFreeId: gameFreeId,
|
GameFreeId: gameFreeId,
|
||||||
Cost: cost,
|
Cost: cost,
|
||||||
|
LogId: id,
|
||||||
})
|
})
|
||||||
if log != nil {
|
if log != nil {
|
||||||
LogChannelSingleton.WriteLog(log)
|
LogChannelSingleton.WriteLog(log)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue