refactor♻️:redis对象和mysql对象持久化和读取

王家文
1 parent 015645a1
Showing 3 changed files with 47 additions and 60 deletions Show diff stats
service/cardholder/dto-record.go
service/cardholder/init.go
service/cardholder/logic.go
@@ -2,15 +2,13 @@ package cardholder
 import (
 	"apigame/common/svconst"
-	"apigame/common/svdto"
+	"apigame/common/svmysql"
 	"apigame/service/constd"
-	"apigame/util/utdto"
 	"apigame/util/util-lx/lxtime"
-	"fmt"
 )
-// CardHolderRecordBase 开卡包活动日志公共
-type CardHolderRecordBase struct {
+// RecordCardHolderBase 开卡包活动日志公共
+type RecordCardHolderBase struct {
 	Id         int64  `gorm:"primaryKey;comment:日志ID"`
 	Uid        int64  `gorm:"comment:玩家唯一ID"`
 	SequenceId string `gorm:"type:varchar(255);comment:用户序列组ID"`
@@ -21,9 +19,9 @@ type CardHolderRecordBase struct {
 	UpdateTime int64  `gorm:"comment:修改时间戳"`
 }
-func NewCardHolderRecordBase(uid int64, sequenceId string, cohort string, activityId int64, round int) CardHolderRecordBase {
+func NewRecordCardHolderBase(uid int64, sequenceId string, cohort string, activityId int64, round int) RecordCardHolderBase {
 	secNow := lxtime.NowUninx()
-	return CardHolderRecordBase{
+	return RecordCardHolderBase{
 		CreateTime: secNow,
 		UpdateTime: secNow,
 		Uid:        uid,
@@ -34,86 +32,74 @@ func NewCardHolderRecordBase(uid int64, sequenceId string, cohort string, activi
 	}
 }
-// CardHolderRecordOpen 开卡包活动日志开卡包
-type CardHolderRecordOpen struct {
-	CardHolderRecordBase
+// RecordCardHolderOpen 开卡包活动日志开卡包
+type RecordCardHolderOpen struct {
+	RecordCardHolderBase
 	OpenMode     int    `gorm:"comment:开包类型0客户端驱动1星星商店购买2剩余星星兑换"`
 	CardholderId int    `gorm:"comment:卡包ID"`
 	CardList     string `gorm:"type:varchar(255);comment:开卡内容"`
 }
-func (c *CardHolderRecordOpen) TableName() string { return utdto.MYSQL_TABLE_TEMPLATE }
-
-func (d *CardHolderRecordOpen) GetRule(gameId string) *svdto.DtoRule {
+func (d *RecordCardHolderOpen) MysqlInfo(gameId string) *svmysql.MysqlInfo {
 	tableName := constd.MYSQL_TABLE_S_CARDHOLDER_RECORD_OPEN
-	return &svdto.DtoRule{
+	return &svmysql.MysqlInfo{
 		DbMysql:   svconst.DbCommon,
 		TableName: tableName + gameId,
-		CacheKey:  fmt.Sprintf("%s:%s:%s", svdto.REDIS_CACHEP_REFIX, tableName, gameId),
-		CacheTime: 300,
 	}
 }
-func NewCardHolderRecordOpen(recordBase CardHolderRecordBase,
-	openMode int, cardholderId int, cardList string) *CardHolderRecordOpen {
-	return &CardHolderRecordOpen{
-		CardHolderRecordBase: recordBase,
+func NewRecordCardHolderOpen(recordBase RecordCardHolderBase,
+	openMode int, cardholderId int, cardList string) *RecordCardHolderOpen {
+	return &RecordCardHolderOpen{
+		RecordCardHolderBase: recordBase,
 		OpenMode:             openMode,
 		CardholderId:         cardholderId,
 		CardList:             cardList,
 	}
 }
-// CardHolderRecordRewardAlbum 开卡包活动日志领取卡组奖励
-type CardHolderRecordRewardAlbum struct {
-	CardHolderRecordBase
+// RecordCardHolderRewardAlbum 开卡包活动日志领取卡组奖励
+type RecordCardHolderRewardAlbum struct {
+	RecordCardHolderBase
 	AlbumId int    `gorm:"comment:卡组ID"`
 	Award   string `gorm:"type:varchar(255);comment:奖励内容"`
 }
-func (c *CardHolderRecordRewardAlbum) TableName() string { return utdto.MYSQL_TABLE_TEMPLATE }
-
-func (d *CardHolderRecordRewardAlbum) GetRule(gameId string) *svdto.DtoRule {
+func (d *RecordCardHolderRewardAlbum) MysqlInfo(gameId string) *svmysql.MysqlInfo {
 	tableName := constd.MYSQL_TABLE_S_CARDHOLDER_RECORD_REWARDALBUM
-	return &svdto.DtoRule{
+	return &svmysql.MysqlInfo{
 		DbMysql:   svconst.DbCommon,
 		TableName: tableName + gameId,
-		CacheKey:  fmt.Sprintf("%s:%s:%s", svdto.REDIS_CACHEP_REFIX, tableName, gameId),
-		CacheTime: 300,
 	}
 }
-func NewCardHolderRecordRewardAlbum(recordBase CardHolderRecordBase,
-	albumId int, award string) *CardHolderRecordRewardAlbum {
-	return &CardHolderRecordRewardAlbum{
-		CardHolderRecordBase: recordBase,
+func NewRecordCardHolderRewardAlbum(recordBase RecordCardHolderBase,
+	albumId int, award string) *RecordCardHolderRewardAlbum {
+	return &RecordCardHolderRewardAlbum{
+		RecordCardHolderBase: recordBase,
 		AlbumId:              albumId,
 		Award:                award,
 	}
 }
-// CardHolderRecordRewardRound 开卡包活动日志领取轮次奖励
-type CardHolderRecordRewardRound struct {
-	CardHolderRecordBase
+// RecordCardHolderRewardRound 开卡包活动日志领取轮次奖励
+type RecordCardHolderRewardRound struct {
+	RecordCardHolderBase
 	Award string `gorm:"type:varchar(255);comment:奖励内容"`
 }
-func (c *CardHolderRecordRewardRound) TableName() string { return utdto.MYSQL_TABLE_TEMPLATE }
-
-func (d *CardHolderRecordRewardRound) GetRule(gameId string) *svdto.DtoRule {
+func (d *RecordCardHolderRewardRound) MysqlInfo(gameId string) *svmysql.MysqlInfo {
 	tableName := constd.MYSQL_TABLE_S_CARDHOLDER_RECORD_REWARDROUND
-	return &svdto.DtoRule{
+	return &svmysql.MysqlInfo{
 		DbMysql:   svconst.DbCommon,
 		TableName: tableName + gameId,
-		CacheKey:  fmt.Sprintf("%s:%s:%s", svdto.REDIS_CACHEP_REFIX, tableName, gameId),
-		CacheTime: 300,
 	}
 }
-func NewCardHolderRecordRewardRound(recordBase CardHolderRecordBase,
-	award string) *CardHolderRecordRewardRound {
-	return &CardHolderRecordRewardRound{
-		CardHolderRecordBase: recordBase,
+func NewRecordCardHolderRewardRound(recordBase RecordCardHolderBase,
+	award string) *RecordCardHolderRewardRound {
+	return &RecordCardHolderRewardRound{
+		RecordCardHolderBase: recordBase,
 		Award:                award,
 	}
 }
@@ -2,7 +2,6 @@ package cardholder
 import (
 	"apigame/common/svconst"
-	"apigame/common/svdto"
 	"apigame/common/svmysql"
 )
@@ -12,9 +11,9 @@ func Init() {
 	// 卡牌卡包
 	for _, gameId := range svconst.GameListCardHolder {
 		svmysql.InitTable(new(DataCardHolder), gameId)
-		svdto.InitTable(new(CardHolderRecordOpen), gameId)
-		svdto.InitTable(new(CardHolderRecordRewardAlbum), gameId)
-		svdto.InitTable(new(CardHolderRecordRewardRound), gameId)
+		svmysql.InitTable(new(RecordCardHolderOpen), gameId)
+		svmysql.InitTable(new(RecordCardHolderRewardAlbum), gameId)
+		svmysql.InitTable(new(RecordCardHolderRewardRound), gameId)
 	}
 }
 package cardholder
 import (
-	"apigame/common/svdto"
 	"apigame/common/svmysql"
 	"apigame/configs"
 	"apigame/models"
@@ -242,9 +241,10 @@ func DoOpen(gameId string,
 	}
 	// 记录开卡包日志
 	{
-		recordBase := NewCardHolderRecordBase(gameData.Uid, sequenceId, cohort, config.Id, gameData.Details.Round)
-		svdto.SaveRecord(gameId, NewCardHolderRecordOpen(recordBase,
-			openMode, utstring.StringToInt(confCardholder.Id), utjson.JsonString(newCards)))
+		recordBase := NewRecordCardHolderBase(gameData.Uid, sequenceId, cohort, config.Id, gameData.Details.Round)
+		_ = svmysql.Insert(NewRecordCardHolderOpen(recordBase,
+			openMode, utstring.StringToInt(confCardholder.Id), utjson.JsonString(newCards)),
+			gameId)
 	}
 	return
@@ -290,9 +290,10 @@ func DoOpenCheckAward(gameId string,
 			awardAlbum[albumId] = award
 			{
 				// 记录日志
-				recordBase := NewCardHolderRecordBase(gameData.Uid, sequenceId, cohort, config.Id, gameData.Details.Round)
-				svdto.SaveRecord(gameId, NewCardHolderRecordRewardAlbum(recordBase,
-					albumId, award))
+				recordBase := NewRecordCardHolderBase(gameData.Uid, sequenceId, cohort, config.Id, gameData.Details.Round)
+				_ = svmysql.Insert(NewRecordCardHolderRewardAlbum(recordBase,
+					albumId, award),
+					gameId)
 			}
 		}
 		// 判断 处理 发放轮次奖励 轮次完成
@@ -301,9 +302,10 @@ func DoOpenCheckAward(gameId string,
 			awardRound = config.Awards[utstring.IntToString(gameData.Details.Round)]
 			// 记录日志
-			recordBase := NewCardHolderRecordBase(gameData.Uid, sequenceId, cohort, config.Id, gameData.Details.Round)
-			svdto.SaveRecord(gameId, NewCardHolderRecordRewardRound(recordBase,
-				awardRound))
+			recordBase := NewRecordCardHolderBase(gameData.Uid, sequenceId, cohort, config.Id, gameData.Details.Round)
+			_ = svmysql.Insert(NewRecordCardHolderRewardRound(recordBase,
+				awardRound),
+				gameId)
 			// 处理轮次完成
 			HandleNextRound(gameData)