fix🐛:优化发送给客户端的活动配置

王家文
1 parent 908db8e3
Showing 5 changed files with 36 additions and 1 deletions Show diff stats
models/cardholder.go
service/cardholder/config-client.go
service/cardholder/config-registry.go
service/cardholder/config.go
service/cardholder/handle.go
@@ -14,6 +14,7 @@ type RspCardHolderGetConfig struct {
 	PrepareTime int64 `form:"prepare_time" json:"prepare_time"` // 活动预告时间
 	StartTime   int64 `form:"start_time" json:"start_time"`     // 活动开始时间
 	EndTime     int64 `form:"end_time" json:"end_time"`         // 活动结束时间
+	OpenLevel   int   `form:"open_level" json:"open_level"`     // 开启等级
 	Config      any   `form:"config" json:"config"`             // 活动配置对象
 }
  
@@ -0,0 +1,10 @@
+package cardholder
+
+// CardActivityConfigClient 卡牌活动配置 给客户端数据
+type CardActivityConfigClient struct {
+	Id          int64                  `form:"id" json:"id"`                     // ID
+	RoundAwards map[string]string      `form:"round_awards" json:"round_awards"` // 轮次奖励配置
+	Albums      []AlbumConfig          `form:"albums" json:"albums"`             // 卡组配置
+	Cards       []CardConfig           `form:"cards" json:"cards"`               // 卡牌配置
+	Holders     []OpenCardholderConfig `form:"holders" json:"holders"`           // 卡包开卡规则
+}
@@ -107,6 +107,29 @@ func ConfigDecode(gameId string, configRaw *CardActivityConfigRaw) {
 		}
 	}
 	Configs[gameId] = Config
+
+	GenerateConfigClient(Config)
+}
+
+// GenerateConfigClient 生成给客户端的配置
+func GenerateConfigClient(config *CardActivityConfig) {
+	configClient := &CardActivityConfigClient{
+		Id:          config.Id,
+		RoundAwards: config.Awards,
+		Albums:      make([]AlbumConfig, 0),
+		Cards:       make([]CardConfig, 0),
+		Holders:     make([]OpenCardholderConfig, 0),
+	}
+	for _, i2 := range config.AlbumConfig {
+		configClient.Albums = append(configClient.Albums, i2)
+	}
+	for _, i2 := range config.CardConfig {
+		configClient.Cards = append(configClient.Cards, i2)
+	}
+	for _, i2 := range config.CardholderConfig {
+		configClient.Holders = append(configClient.Holders, i2)
+	}
+	config.Client = configClient
 }
  
 // CombineIdSequenceIdCohort 组合ID k=ID_用户序列_用户分组
@@ -10,6 +10,7 @@ type CardActivityUpdateConfig struct {
 // CardActivityConfig 卡牌活动配置 分析后数据
 type CardActivityConfig struct {
 	Raw                  *CardActivityConfigRaw
+	Client               *CardActivityConfigClient
 	GameId               string                          // 所属游戏ID
 	Id                   int64                           // ID
 	Awards               map[string]string               // 奖励配置
@@ -23,7 +23,7 @@ func HandleGetConfig(req *models.ReqCardHolderGetConfig) (code string, rsp model
 	rsp.StartTime = config.Raw.StartTime
 	rsp.EndTime = config.Raw.EndTime
  
-	rsp.Config = config
+	rsp.Config = config.Client
  
 	return
 }
...	...	@@ -14,6 +14,7 @@ type RspCardHolderGetConfig struct {
14	14	PrepareTime int64 `form:"prepare_time" json:"prepare_time"` // 活动预告时间
15	15	StartTime int64 `form:"start_time" json:"start_time"` // 活动开始时间
16	16	EndTime int64 `form:"end_time" json:"end_time"` // 活动结束时间
	17	+ OpenLevel int `form:"open_level" json:"open_level"` // 开启等级
17	18	Config any `form:"config" json:"config"` // 活动配置对象
18	19	}
19	20
...	...
...	...	@@ -0,0 +1,10 @@
	1	+package cardholder
	2	+
	3	+// CardActivityConfigClient 卡牌活动配置给客户端数据
	4	+type CardActivityConfigClient struct {
	5	+ Id int64 `form:"id" json:"id"` // ID
	6	+ RoundAwards map[string]string `form:"round_awards" json:"round_awards"` // 轮次奖励配置
	7	+ Albums []AlbumConfig `form:"albums" json:"albums"` // 卡组配置
	8	+ Cards []CardConfig `form:"cards" json:"cards"` // 卡牌配置
	9	+ Holders []OpenCardholderConfig `form:"holders" json:"holders"` // 卡包开卡规则
	10	+}
...	...
...	...	@@ -107,6 +107,29 @@ func ConfigDecode(gameId string, configRaw *CardActivityConfigRaw) {
107	107	}
108	108	}
109	109	Configs[gameId] = Config
	110	+
	111	+ GenerateConfigClient(Config)
	112	+}
	113	+
	114	+// GenerateConfigClient 生成给客户端的配置
	115	+func GenerateConfigClient(config *CardActivityConfig) {
	116	+ configClient := &CardActivityConfigClient{
	117	+ Id: config.Id,
	118	+ RoundAwards: config.Awards,
	119	+ Albums: make([]AlbumConfig, 0),
	120	+ Cards: make([]CardConfig, 0),
	121	+ Holders: make([]OpenCardholderConfig, 0),
	122	+ }
	123	+ for _, i2 := range config.AlbumConfig {
	124	+ configClient.Albums = append(configClient.Albums, i2)
	125	+ }
	126	+ for _, i2 := range config.CardConfig {
	127	+ configClient.Cards = append(configClient.Cards, i2)
	128	+ }
	129	+ for _, i2 := range config.CardholderConfig {
	130	+ configClient.Holders = append(configClient.Holders, i2)
	131	+ }
	132	+ config.Client = configClient
110	133	}
111	134
112	135	// CombineIdSequenceIdCohort 组合ID k=ID_用户序列_用户分组
...	...
...	...	@@ -10,6 +10,7 @@ type CardActivityUpdateConfig struct {
10	10	// CardActivityConfig 卡牌活动配置分析后数据
11	11	type CardActivityConfig struct {
12	12	Raw *CardActivityConfigRaw
	13	+ Client *CardActivityConfigClient
13	14	GameId string // 所属游戏ID
14	15	Id int64 // ID
15	16	Awards map[string]string // 奖励配置
...	...
...	...	@@ -23,7 +23,7 @@ func HandleGetConfig(req *models.ReqCardHolderGetConfig) (code string, rsp model
23	23	rsp.StartTime = config.Raw.StartTime
24	24	rsp.EndTime = config.Raw.EndTime
25	25
26		- rsp.Config = config
	26	+ rsp.Config = config.Client
27	27
28	28	return
29	29	}
...	...