diff --git a/dto/cardholder-record.go b/dto/cardholder-record.go
index cbb5f59..f04a755 100644
--- a/dto/cardholder-record.go
+++ b/dto/cardholder-record.go
@@ -57,7 +57,7 @@ func NewCardHolderRecordOpen(recordBase CardHolderRecordBase,
 // CardHolderRecordRewardAlbum 开卡包活动日志领取卡组奖励
 type CardHolderRecordRewardAlbum struct {
 	CardHolderRecordBase
-	AlbumId string `gorm:"type:varchar(255);comment:卡组ID"`
+	AlbumId int    `gorm:"comment:卡组ID"`
 	Award   string `gorm:"type:varchar(255);comment:奖励内容"`
 }
 
@@ -69,7 +69,7 @@ func (d *CardHolderRecordRewardAlbum) GetTableName(gameId string) string {
 }
 
 func NewCardHolderRecordRewardAlbum(recordBase CardHolderRecordBase,
-	albumId string, award string) *CardHolderRecordRewardAlbum {
+	albumId int, award string) *CardHolderRecordRewardAlbum {
 	return &CardHolderRecordRewardAlbum{
 		CardHolderRecordBase: recordBase,
 		AlbumId:              albumId,
diff --git a/dto/cardholder.go b/dto/cardholder.go
index ba51861..c474c75 100644
--- a/dto/cardholder.go
+++ b/dto/cardholder.go
@@ -21,7 +21,7 @@ type CardHolderData struct {
 // CardHolderDataDetails 卡牌活动详情
 type CardHolderDataDetails struct {
 	Cards              map[int]int    // 每张卡集了多少张 k=卡牌ID v=数量
-	Album              map[string]int // 卡组奖励领取 k=卡组ID v=数量
+	Album              map[int]int    // 卡组奖励领取 k=卡组ID v=数量
 	StarSequenceScales map[string]int // 星级序列刻度 k=ID_用户序列_用户分组 v=刻度
 	CardSequenceScales map[string]int // 卡牌序列刻度 k=ID_用户序列_用户分组 v=刻度
 	Round              int            // 卡册当前轮次
@@ -39,7 +39,7 @@ func NewCardHolderData(uid int64) *CardHolderData {
 func NewCardHolderDataDetails() *CardHolderDataDetails {
 	return &CardHolderDataDetails{
 		Cards:              make(map[int]int),
-		Album:              make(map[string]int),
+		Album:              make(map[int]int),
 		StarSequenceScales: make(map[string]int),
 		CardSequenceScales: make(map[string]int),
 		Round:              1,
diff --git a/models/cardholder.go b/models/cardholder.go
index 4a98821..fae5cc4 100644
--- a/models/cardholder.go
+++ b/models/cardholder.go
@@ -20,9 +20,9 @@ type RspCardHolderGetConfig struct {
 
 // CardHolderInfo 卡包信息
 type CardHolderInfo struct {
-	Cards map[int]int    `form:"cards" json:"cards"` // 每张卡集了多少张 k=卡牌ID v=数量
-	Album map[string]int `form:"album" json:"album"` // 卡组奖励领取 k=卡组ID v=数量
-	Round int            `form:"round" json:"round"` // 卡册当前轮次
+	Cards map[int]int `form:"cards" json:"cards"` // 每张卡集了多少张 k=卡牌ID v=数量
+	Album map[int]int `form:"album" json:"album"` // 卡组奖励领取 k=卡组ID v=数量
+	Round int         `form:"round" json:"round"` // 卡册当前轮次
 }
 
 // ReqCardHolderInfo 请求 卡包信息
@@ -59,9 +59,9 @@ type ReqCardHolderOpen struct {
 // RspCardHolderOpen 返回 打开卡包
 type RspCardHolderOpen struct {
 	CardHolderInfo
-	NewCards   []int             `form:"new_cards" json:"new_cards"`     // 新获得的卡牌列表
-	AwardAlbum map[string]string `form:"award_album" json:"award_album"` // 触发的卡组奖励列表 k=出发的卡组ID v=对应奖励
-	AwardRound string            `form:"award_round" json:"award_round"` // 触发的轮次奖励列表 空字符串未触发
+	NewCards   []int          `form:"new_cards" json:"new_cards"`     // 新获得的卡牌列表
+	AwardAlbum map[int]string `form:"award_album" json:"award_album"` // 触发的卡组奖励列表 k=出发的卡组ID v=对应奖励
+	AwardRound string         `form:"award_round" json:"award_round"` // 触发的轮次奖励列表 空字符串未触发
 }
 
 // ReqCardHolderGetRewardAlbum 请求 领取卡组奖励
diff --git a/service/cardholder/config-registry.go b/service/cardholder/config-registry.go
index e950961..ffe5333 100644
--- a/service/cardholder/config-registry.go
+++ b/service/cardholder/config-registry.go
@@ -28,7 +28,7 @@ func ConfigDecode(gameId string, configRaw *CardActivityConfigRaw) {
 		GameId:               gameId,
 		Id:                   configRaw.Id,
 		Awards:               make(map[string]string),
-		AlbumConfig:          make(map[string]AlbumConfig),
+		AlbumConfig:          make(map[int]AlbumConfig),
 		CardConfig:           make(map[int]CardConfig),
 		CardholderConfig:     make(map[string]OpenCardholderConfig),
 		NormalCardStarConfig: make(map[string]NormalCardStarConfig),
diff --git a/service/cardholder/config.go b/service/cardholder/config.go
index 99c8cac..9f04882 100644
--- a/service/cardholder/config.go
+++ b/service/cardholder/config.go
@@ -14,7 +14,7 @@ type CardActivityConfig struct {
 	GameId               string                          // 所属游戏ID
 	Id                   int64                           // ID
 	Awards               map[string]string               // 奖励配置
-	AlbumConfig          map[string]AlbumConfig          // 卡组配置
+	AlbumConfig          map[int]AlbumConfig             // 卡组配置
 	CardConfig           map[int]CardConfig              // 卡牌配置
 	CardholderConfig     map[string]OpenCardholderConfig // 卡包开卡规则
 	NormalCardStarConfig map[string]NormalCardStarConfig // k=ID_用户序列_用户分组 卡片星级配置
@@ -42,8 +42,8 @@ type CardActivityConfigRaw struct {
 
 // AlbumConfig 卡组表
 type AlbumConfig struct {
-	SetId     string            `json:"set_id"`     // 卡组名
-	Name      string            `json:"name"`       // 卡组图片
+	SetId     int               `json:"set_id"`     // 卡组名
+	Name      int               `json:"name"`       // 卡组图片
 	Icon      string            `json:"icon"`       // 卡组id
 	Rewards   map[string]string `json:"rewards"`    // 集齐奖励 k=轮次
 	StartTime int64             `json:"start_time"` // 开始时间
@@ -53,10 +53,10 @@ type AlbumConfig struct {
 // CardConfig 卡牌表
 type CardConfig struct {
 	Id     int    `json:"id"`          // ID
-	Name   string `json:"name"`        // 卡牌图片
+	Name   int    `json:"name"`        // 卡牌图片
 	Icon   string `json:"icon"`        // 卡牌id
-	Desc   string `json:"desc"`        // 卡牌描述
-	SetId  string `json:"album_setid"` // 卡组id
+	Desc   int    `json:"desc"`        // 卡牌描述
+	SetId  int    `json:"album_setid"` // 卡组id
 	Star   int    `json:"star"`        // 星级
 	IsGold int    `json:"is_gold"`     // 是否是金卡
 	IsSend int    `json:"is_send"`     // 卡片是否可赠送
diff --git a/service/cardholder/handle.go b/service/cardholder/handle.go
index e0c52be..e5095b8 100644
--- a/service/cardholder/handle.go
+++ b/service/cardholder/handle.go
@@ -59,7 +59,7 @@ func HandleInfo(req *models.ReqCardHolderInfo) (code string, rsp models.RspCardH
 func HandleOpen(req *models.ReqCardHolderOpen) (code string, rsp models.RspCardHolderOpen) {
 	rsp = models.RspCardHolderOpen{
 		NewCards:   make([]int, 0),
-		AwardAlbum: make(map[string]string),
+		AwardAlbum: make(map[int]string),
 	}
 	code = constd.RECODE_OK
 
diff --git a/service/cardholder/logic.go b/service/cardholder/logic.go
index c03c5ae..5264a5f 100644
--- a/service/cardholder/logic.go
+++ b/service/cardholder/logic.go
@@ -124,7 +124,7 @@ func GetNewCard(gameData *dto.CardHolderData, conf *CardActivityConfig) int {
 }
 
 // CheckAlbumFinish 判断卡组是否已集齐
-func CheckAlbumFinish(albumId string, gameData *dto.CardHolderData, config *CardActivityConfig) bool {
+func CheckAlbumFinish(albumId int, gameData *dto.CardHolderData, config *CardActivityConfig) bool {
 	for _, conf := range config.CardConfig {
 		if conf.SetId == albumId {
 			count := gameData.Details.Cards[conf.Id]
@@ -151,13 +151,13 @@ func CheckRoundFinish(gameData *dto.CardHolderData, config *CardActivityConfig) 
 func HandleNextRound(gameData *dto.CardHolderData) {
 	gameData.Details.Round += 1
 	gameData.Details.Cards = make(map[int]int)
-	gameData.Details.Album = make(map[string]int)
+	gameData.Details.Album = make(map[int]int)
 }
 
 func GetInfo(gameData *dto.CardHolderData, conf *CardActivityConfig) models.CardHolderInfo {
 	info := models.CardHolderInfo{
 		Cards: make(map[int]int),
-		Album: make(map[string]int),
+		Album: make(map[int]int),
 		Round: 0,
 	}
 	for i, i2 := range gameData.Details.Cards {
--
libgit2 0.21.0