Commit dfa99133a5375390f40a8b2edfe702c098776bf4
1 parent
414e572a
Exists in
master
and in
1 other branch
refactor: 日志记录代码优化
Showing
2 changed files
with
73 additions
and
116 deletions
Show diff stats
dto/cardholder-record.go
| ... | ... | @@ -6,18 +6,48 @@ import ( |
| 6 | 6 | "fmt" |
| 7 | 7 | ) |
| 8 | 8 | |
| 9 | +// CardHolderRecordBase 开卡包活动日志公共 | |
| 10 | +type CardHolderRecordBase struct { | |
| 11 | + Id int64 `orm:"auto"` // 日志ID | |
| 12 | + Uid int64 // 玩家唯一ID | |
| 13 | + SequenceId string // 用户序列组ID | |
| 14 | + Cohort string // 用户分组ID | |
| 15 | + ActivityId int64 // 当前活动ID | |
| 16 | + Round int // 当前轮次 | |
| 17 | + CreateTime int64 // 创建时间戳 | |
| 18 | + UpdateTime int64 // 修改时间戳 | |
| 19 | +} | |
| 20 | + | |
| 21 | +func (d *CardHolderRecordBase) SqlPairsBase() map[string]string { | |
| 22 | + m := make(map[string]string) | |
| 23 | + m["uid"] = fmt.Sprintf("%d", d.Uid) | |
| 24 | + m["sequence_id"] = fmt.Sprintf("'%s'", d.SequenceId) | |
| 25 | + m["cohort"] = fmt.Sprintf("'%s'", d.Cohort) | |
| 26 | + m["activity_id"] = fmt.Sprintf("%d", d.ActivityId) | |
| 27 | + m["round"] = fmt.Sprintf("%d", d.Round) | |
| 28 | + m["create_time"] = fmt.Sprintf("%d", d.CreateTime) | |
| 29 | + m["update_time"] = fmt.Sprintf("%d", d.UpdateTime) | |
| 30 | + return m | |
| 31 | +} | |
| 32 | + | |
| 33 | +func NewCardHolderRecordBase(uid int64, sequenceId string, cohort string, activityId int64, round int) CardHolderRecordBase { | |
| 34 | + secNow := lxtime.NowUninx() | |
| 35 | + return CardHolderRecordBase{ | |
| 36 | + CreateTime: secNow, | |
| 37 | + UpdateTime: secNow, | |
| 38 | + Uid: uid, | |
| 39 | + SequenceId: sequenceId, | |
| 40 | + Cohort: cohort, | |
| 41 | + ActivityId: activityId, | |
| 42 | + Round: round, | |
| 43 | + } | |
| 44 | +} | |
| 45 | + | |
| 9 | 46 | // CardHolderRecordGetNew 开卡包活动日志获得卡包 |
| 10 | 47 | type CardHolderRecordGetNew struct { |
| 11 | - Id int64 `orm:"auto"` // 日志ID | |
| 12 | - Uid int64 // 玩家唯一ID | |
| 13 | - SequenceId string // 用户序列组ID | |
| 14 | - Cohort string // 用户分组ID | |
| 15 | - ActivityId int64 // 当前活动ID | |
| 16 | - Round int // 当前轮次 | |
| 17 | - CardholderId int // 卡包ID | |
| 18 | - CardholderCount int // 卡包数量 | |
| 19 | - CreateTime int64 // 创建时间戳 | |
| 20 | - UpdateTime int64 // 修改时间戳 | |
| 48 | + CardHolderRecordBase | |
| 49 | + CardholderId int // 卡包ID | |
| 50 | + CardholderCount int // 卡包数量 | |
| 21 | 51 | } |
| 22 | 52 | |
| 23 | 53 | func (d *CardHolderRecordGetNew) TableName(gameId string) string { |
| ... | ... | @@ -29,47 +59,26 @@ func (d *CardHolderRecordGetNew) CreateSqlPath() string { |
| 29 | 59 | } |
| 30 | 60 | |
| 31 | 61 | func (d *CardHolderRecordGetNew) SqlPairs() map[string]string { |
| 32 | - m := make(map[string]string) | |
| 33 | - m["uid"] = fmt.Sprintf("%d", d.Uid) | |
| 34 | - m["sequence_id"] = fmt.Sprintf("'%s'", d.SequenceId) | |
| 35 | - m["cohort"] = fmt.Sprintf("'%s'", d.Cohort) | |
| 36 | - m["activity_id"] = fmt.Sprintf("%d", d.ActivityId) | |
| 37 | - m["round"] = fmt.Sprintf("%d", d.Round) | |
| 62 | + m := d.SqlPairsBase() | |
| 38 | 63 | m["cardholder_id"] = fmt.Sprintf("%d", d.CardholderId) |
| 39 | 64 | m["cardholder_count"] = fmt.Sprintf("%d", d.CardholderCount) |
| 40 | - m["create_time"] = fmt.Sprintf("%d", d.CreateTime) | |
| 41 | - m["update_time"] = fmt.Sprintf("%d", d.UpdateTime) | |
| 42 | 65 | return m |
| 43 | 66 | } |
| 44 | 67 | |
| 45 | -func NewCardHolderRecordGetNew(uid int64, sequenceId string, cohort string, activityId int64, round int, | |
| 68 | +func NewCardHolderRecordGetNew(recordBase CardHolderRecordBase, | |
| 46 | 69 | cardholderId int, cardholderCount int) *CardHolderRecordGetNew { |
| 47 | - secNow := lxtime.NowUninx() | |
| 48 | 70 | return &CardHolderRecordGetNew{ |
| 49 | - CreateTime: secNow, | |
| 50 | - UpdateTime: secNow, | |
| 51 | - Uid: uid, | |
| 52 | - SequenceId: sequenceId, | |
| 53 | - Cohort: cohort, | |
| 54 | - ActivityId: activityId, | |
| 55 | - Round: round, | |
| 56 | - CardholderId: cardholderId, | |
| 57 | - CardholderCount: cardholderCount, | |
| 71 | + CardHolderRecordBase: recordBase, | |
| 72 | + CardholderId: cardholderId, | |
| 73 | + CardholderCount: cardholderCount, | |
| 58 | 74 | } |
| 59 | 75 | } |
| 60 | 76 | |
| 61 | 77 | // CardHolderRecordOpen 开卡包活动日志开卡包 |
| 62 | 78 | type CardHolderRecordOpen struct { |
| 63 | - Id int64 `orm:"auto"` // 日志ID | |
| 64 | - Uid int64 // 玩家唯一ID | |
| 65 | - SequenceId string // 用户序列组ID | |
| 66 | - Cohort string // 用户分组ID | |
| 67 | - ActivityId int64 // 当前活动ID | |
| 68 | - Round int // 当前轮次 | |
| 79 | + CardHolderRecordBase | |
| 69 | 80 | CardholderId int // 卡包ID |
| 70 | 81 | CardList string // 开卡内容 |
| 71 | - CreateTime int64 // 创建时间戳 | |
| 72 | - UpdateTime int64 // 修改时间戳 | |
| 73 | 82 | } |
| 74 | 83 | |
| 75 | 84 | func (d *CardHolderRecordOpen) TableName(gameId string) string { |
| ... | ... | @@ -81,47 +90,26 @@ func (d *CardHolderRecordOpen) CreateSqlPath() string { |
| 81 | 90 | } |
| 82 | 91 | |
| 83 | 92 | func (d *CardHolderRecordOpen) SqlPairs() map[string]string { |
| 84 | - m := make(map[string]string) | |
| 85 | - m["uid"] = fmt.Sprintf("%d", d.Uid) | |
| 86 | - m["sequence_id"] = fmt.Sprintf("'%s'", d.SequenceId) | |
| 87 | - m["cohort"] = fmt.Sprintf("'%s'", d.Cohort) | |
| 88 | - m["activity_id"] = fmt.Sprintf("%d", d.ActivityId) | |
| 89 | - m["round"] = fmt.Sprintf("%d", d.Round) | |
| 93 | + m := d.SqlPairsBase() | |
| 90 | 94 | m["cardholder_id"] = fmt.Sprintf("%d", d.CardholderId) |
| 91 | 95 | m["card_list"] = fmt.Sprintf("'%s'", d.CardList) |
| 92 | - m["create_time"] = fmt.Sprintf("%d", d.CreateTime) | |
| 93 | - m["update_time"] = fmt.Sprintf("%d", d.UpdateTime) | |
| 94 | 96 | return m |
| 95 | 97 | } |
| 96 | 98 | |
| 97 | -func NewCardHolderRecordOpen(uid int64, sequenceId string, cohort string, activityId int64, round int, | |
| 99 | +func NewCardHolderRecordOpen(recordBase CardHolderRecordBase, | |
| 98 | 100 | cardholderId int, cardList string) *CardHolderRecordOpen { |
| 99 | - secNow := lxtime.NowUninx() | |
| 100 | 101 | return &CardHolderRecordOpen{ |
| 101 | - CreateTime: secNow, | |
| 102 | - UpdateTime: secNow, | |
| 103 | - Uid: uid, | |
| 104 | - SequenceId: sequenceId, | |
| 105 | - Cohort: cohort, | |
| 106 | - ActivityId: activityId, | |
| 107 | - Round: round, | |
| 108 | - CardholderId: cardholderId, | |
| 109 | - CardList: cardList, | |
| 102 | + CardHolderRecordBase: recordBase, | |
| 103 | + CardholderId: cardholderId, | |
| 104 | + CardList: cardList, | |
| 110 | 105 | } |
| 111 | 106 | } |
| 112 | 107 | |
| 113 | 108 | // CardHolderRecordRewardAlbum 开卡包活动日志领取卡组奖励 |
| 114 | 109 | type CardHolderRecordRewardAlbum struct { |
| 115 | - Id int64 `orm:"auto"` // 日志ID | |
| 116 | - Uid int64 // 玩家唯一ID | |
| 117 | - SequenceId string // 用户序列组ID | |
| 118 | - Cohort string // 用户分组ID | |
| 119 | - ActivityId int64 // 当前活动ID | |
| 120 | - Round int // 当前轮次 | |
| 121 | - AlbumId int // 卡组ID | |
| 122 | - Award string // 奖励内容 | |
| 123 | - CreateTime int64 // 创建时间戳 | |
| 124 | - UpdateTime int64 // 修改时间戳 | |
| 110 | + CardHolderRecordBase | |
| 111 | + AlbumId int // 卡组ID | |
| 112 | + Award string // 奖励内容 | |
| 125 | 113 | } |
| 126 | 114 | |
| 127 | 115 | func (d *CardHolderRecordRewardAlbum) TableName(gameId string) string { |
| ... | ... | @@ -133,46 +121,25 @@ func (d *CardHolderRecordRewardAlbum) CreateSqlPath() string { |
| 133 | 121 | } |
| 134 | 122 | |
| 135 | 123 | func (d *CardHolderRecordRewardAlbum) SqlPairs() map[string]string { |
| 136 | - m := make(map[string]string) | |
| 137 | - m["uid"] = fmt.Sprintf("%d", d.Uid) | |
| 138 | - m["sequence_id"] = fmt.Sprintf("'%s'", d.SequenceId) | |
| 139 | - m["cohort"] = fmt.Sprintf("'%s'", d.Cohort) | |
| 140 | - m["activity_id"] = fmt.Sprintf("%d", d.ActivityId) | |
| 141 | - m["round"] = fmt.Sprintf("%d", d.Round) | |
| 124 | + m := d.SqlPairsBase() | |
| 142 | 125 | m["album_id"] = fmt.Sprintf("%d", d.AlbumId) |
| 143 | 126 | m["award"] = fmt.Sprintf("'%s'", d.Award) |
| 144 | - m["create_time"] = fmt.Sprintf("%d", d.CreateTime) | |
| 145 | - m["update_time"] = fmt.Sprintf("%d", d.UpdateTime) | |
| 146 | 127 | return m |
| 147 | 128 | } |
| 148 | 129 | |
| 149 | -func NewCardHolderRecordRewardAlbum(uid int64, sequenceId string, cohort string, activityId int64, round int, | |
| 130 | +func NewCardHolderRecordRewardAlbum(recordBase CardHolderRecordBase, | |
| 150 | 131 | albumId int, award string) *CardHolderRecordRewardAlbum { |
| 151 | - secNow := lxtime.NowUninx() | |
| 152 | 132 | return &CardHolderRecordRewardAlbum{ |
| 153 | - CreateTime: secNow, | |
| 154 | - UpdateTime: secNow, | |
| 155 | - Uid: uid, | |
| 156 | - SequenceId: sequenceId, | |
| 157 | - Cohort: cohort, | |
| 158 | - ActivityId: activityId, | |
| 159 | - Round: round, | |
| 160 | - AlbumId: albumId, | |
| 161 | - Award: award, | |
| 133 | + CardHolderRecordBase: recordBase, | |
| 134 | + AlbumId: albumId, | |
| 135 | + Award: award, | |
| 162 | 136 | } |
| 163 | 137 | } |
| 164 | 138 | |
| 165 | 139 | // CardHolderRecordRewardRound 开卡包活动日志领取轮次奖励 |
| 166 | 140 | type CardHolderRecordRewardRound struct { |
| 167 | - Id int64 `orm:"auto"` // 日志ID | |
| 168 | - Uid int64 // 玩家唯一ID | |
| 169 | - SequenceId string // 用户序列组ID | |
| 170 | - Cohort string // 用户分组ID | |
| 171 | - ActivityId int64 // 当前活动ID | |
| 172 | - Round int // 当前轮次 | |
| 173 | - Award string // 奖励内容 | |
| 174 | - CreateTime int64 // 创建时间戳 | |
| 175 | - UpdateTime int64 // 修改时间戳 | |
| 141 | + CardHolderRecordBase | |
| 142 | + Award string // 奖励内容 | |
| 176 | 143 | } |
| 177 | 144 | |
| 178 | 145 | func (d *CardHolderRecordRewardRound) TableName(gameId string) string { |
| ... | ... | @@ -184,29 +151,15 @@ func (d *CardHolderRecordRewardRound) CreateSqlPath() string { |
| 184 | 151 | } |
| 185 | 152 | |
| 186 | 153 | func (d *CardHolderRecordRewardRound) SqlPairs() map[string]string { |
| 187 | - m := make(map[string]string) | |
| 188 | - m["uid"] = fmt.Sprintf("%d", d.Uid) | |
| 189 | - m["sequence_id"] = fmt.Sprintf("'%s'", d.SequenceId) | |
| 190 | - m["cohort"] = fmt.Sprintf("'%s'", d.Cohort) | |
| 191 | - m["activity_id"] = fmt.Sprintf("%d", d.ActivityId) | |
| 192 | - m["round"] = fmt.Sprintf("%d", d.Round) | |
| 154 | + m := d.SqlPairsBase() | |
| 193 | 155 | m["award"] = fmt.Sprintf("'%s'", d.Award) |
| 194 | - m["create_time"] = fmt.Sprintf("%d", d.CreateTime) | |
| 195 | - m["update_time"] = fmt.Sprintf("%d", d.UpdateTime) | |
| 196 | 156 | return m |
| 197 | 157 | } |
| 198 | 158 | |
| 199 | -func NewCardHolderRecordRewardRound(uid int64, sequenceId string, cohort string, activityId int64, round int, | |
| 159 | +func NewCardHolderRecordRewardRound(recordBase CardHolderRecordBase, | |
| 200 | 160 | award string) *CardHolderRecordRewardRound { |
| 201 | - secNow := lxtime.NowUninx() | |
| 202 | 161 | return &CardHolderRecordRewardRound{ |
| 203 | - CreateTime: secNow, | |
| 204 | - UpdateTime: secNow, | |
| 205 | - Uid: uid, | |
| 206 | - SequenceId: sequenceId, | |
| 207 | - Cohort: cohort, | |
| 208 | - ActivityId: activityId, | |
| 209 | - Round: round, | |
| 210 | - Award: award, | |
| 162 | + CardHolderRecordBase: recordBase, | |
| 163 | + Award: award, | |
| 211 | 164 | } |
| 212 | 165 | } | ... | ... |
service/cardholder/handle.go
| ... | ... | @@ -74,7 +74,8 @@ func HandleGetNew(req *models.ReqCardHolderGetNew) (code string, rsp models.RspC |
| 74 | 74 | |
| 75 | 75 | sequenceId, cohort := GetUserSequenceIdAndCohort(req.UID) |
| 76 | 76 | // 记录日志 |
| 77 | - dto.SaveRecord(req.GameID, dto.NewCardHolderRecordGetNew(gameData.Uid, sequenceId, cohort, config.Id, gameData.Details.Round, | |
| 77 | + recordBase := dto.NewCardHolderRecordBase(gameData.Uid, sequenceId, cohort, config.Id, gameData.Details.Round) | |
| 78 | + dto.SaveRecord(req.GameID, dto.NewCardHolderRecordGetNew(recordBase, | |
| 78 | 79 | req.Id, req.Count)) |
| 79 | 80 | |
| 80 | 81 | return |
| ... | ... | @@ -179,7 +180,8 @@ func HandleOpen(req *models.ReqCardHolderOpen) (code string, rsp models.RspCardH |
| 179 | 180 | SaveData(req.GameID, gameData) |
| 180 | 181 | |
| 181 | 182 | // 记录日志 |
| 182 | - dto.SaveRecord(req.GameID, dto.NewCardHolderRecordOpen(gameData.Uid, sequenceId, cohort, config.Id, gameData.Details.Round, | |
| 183 | + recordBase := dto.NewCardHolderRecordBase(gameData.Uid, sequenceId, cohort, config.Id, gameData.Details.Round) | |
| 184 | + dto.SaveRecord(req.GameID, dto.NewCardHolderRecordOpen(recordBase, | |
| 183 | 185 | req.Id, utjson.JsonString(rsp.NewCards))) |
| 184 | 186 | |
| 185 | 187 | //logs.Debug("wjwdbg 获取卡牌列表:", rsp.NewCards) |
| ... | ... | @@ -255,7 +257,8 @@ func HandleGetRewardAlbum(req *models.ReqCardHolderGetRewardAlbum) (code string, |
| 255 | 257 | |
| 256 | 258 | sequenceId, cohort := GetUserSequenceIdAndCohort(req.UID) |
| 257 | 259 | // 记录日志 |
| 258 | - dto.SaveRecord(req.GameID, dto.NewCardHolderRecordRewardAlbum(gameData.Uid, sequenceId, cohort, config.Id, gameData.Details.Round, | |
| 260 | + recordBase := dto.NewCardHolderRecordBase(gameData.Uid, sequenceId, cohort, config.Id, gameData.Details.Round) | |
| 261 | + dto.SaveRecord(req.GameID, dto.NewCardHolderRecordRewardAlbum(recordBase, | |
| 259 | 262 | req.Id, rsp.Award)) |
| 260 | 263 | |
| 261 | 264 | return |
| ... | ... | @@ -304,7 +307,8 @@ func HandleGetRewardRound(req *models.ReqCardHolderGetRewardRound) (code string, |
| 304 | 307 | |
| 305 | 308 | sequenceId, cohort := GetUserSequenceIdAndCohort(req.UID) |
| 306 | 309 | // 记录日志 |
| 307 | - dto.SaveRecord(req.GameID, dto.NewCardHolderRecordRewardRound(gameData.Uid, sequenceId, cohort, config.Id, gameData.Details.Round, | |
| 310 | + recordBase := dto.NewCardHolderRecordBase(gameData.Uid, sequenceId, cohort, config.Id, gameData.Details.Round) | |
| 311 | + dto.SaveRecord(req.GameID, dto.NewCardHolderRecordRewardRound(recordBase, | |
| 308 | 312 | rsp.Award)) |
| 309 | 313 | |
| 310 | 314 | // 处理轮次完成 | ... | ... |