From c0cd7cded2f6adadcf435f1ece72f1a37d092d93 Mon Sep 17 00:00:00 2001
From: 王家文 <wangjiawen@puchigames.com>
Date: Mon, 8 Apr 2024 16:05:59 +0800
Subject: [PATCH] feat:轮次

---
 models/ht-cardholder.go         |  2 +-
 service/constd/index.go         | 14 ++++++++------
 service/ht-cardholder/handle.go | 20 ++++++++++++++++++++
 service/ht-cardholder/logic.go  |  8 ++++++++
 4 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/models/ht-cardholder.go b/models/ht-cardholder.go
index d629e82..c91c8d5 100644
--- a/models/ht-cardholder.go
+++ b/models/ht-cardholder.go
@@ -7,7 +7,7 @@ type HtCardHolderInfo struct {
 	Cardholder map[int]int    `form:"cardholder" json:"cardholder"` // 卡包数量 k=卡包ID v=卡包数量
 	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"`           // 卡册完成轮次
+	Round      int            `form:"round" json:"round"`           // 卡册当前轮次
 }
 
 // ReqHtCardHolderInfo 请求 卡包信息
diff --git a/service/constd/index.go b/service/constd/index.go
index b0eb501..aaf253b 100644
--- a/service/constd/index.go
+++ b/service/constd/index.go
@@ -42,12 +42,13 @@ const (
 
 	RECODE_MERGE_CARDHOLDER_NOTOPEN1_ERROR             = "2101"
 	RECODE_MERGE_CARDHOLDER_NOTOPEN2_ERROR             = "2102"
-	RECODE_MERGE_CARDHOLDER_CARDHOLDERID_ERROR         = "2103"
-	RECODE_MERGE_CARDHOLDER_COUNTILLEGAL_ERROR         = "2104"
-	RECODE_MERGE_CARDHOLDER_CARDHOLDER_NOTENOUGH_ERROR = "2105"
-	RECODE_MERGE_CARDHOLDER_ALBUMID_ERROR              = "2106"
-	RECODE_MERGE_CARDHOLDER_ALBUM_HASGOT_ERROR         = "2107"
-	RECODE_MERGE_CARDHOLDER_ALBUM_NOTFINISH_ERROR      = "2108"
+	RECODE_MERGE_CARDHOLDER_ROUNDFINISH_ERROR          = "2103"
+	RECODE_MERGE_CARDHOLDER_CARDHOLDERID_ERROR         = "2104"
+	RECODE_MERGE_CARDHOLDER_COUNTILLEGAL_ERROR         = "2105"
+	RECODE_MERGE_CARDHOLDER_CARDHOLDER_NOTENOUGH_ERROR = "2106"
+	RECODE_MERGE_CARDHOLDER_ALBUMID_ERROR              = "2107"
+	RECODE_MERGE_CARDHOLDER_ALBUM_HASGOT_ERROR         = "2108"
+	RECODE_MERGE_CARDHOLDER_ALBUM_NOTFINISH_ERROR      = "2109"
 )
 
 var recodeText = map[string]string{
@@ -90,6 +91,7 @@ var recodeText = map[string]string{
 
 	RECODE_MERGE_CARDHOLDER_NOTOPEN1_ERROR:             "活动未开始",
 	RECODE_MERGE_CARDHOLDER_NOTOPEN2_ERROR:             "活动已结束",
+	RECODE_MERGE_CARDHOLDER_ROUNDFINISH_ERROR:          "活动轮次已全部完成",
 	RECODE_MERGE_CARDHOLDER_CARDHOLDERID_ERROR:         "卡包ID错误",
 	RECODE_MERGE_CARDHOLDER_COUNTILLEGAL_ERROR:         "数目不合法",
 	RECODE_MERGE_CARDHOLDER_CARDHOLDER_NOTENOUGH_ERROR: "卡包不足",
diff --git a/service/ht-cardholder/handle.go b/service/ht-cardholder/handle.go
index cdafa15..112f665 100644
--- a/service/ht-cardholder/handle.go
+++ b/service/ht-cardholder/handle.go
@@ -50,6 +50,11 @@ func HandleGetNew(req *models.ReqHtCardHolderGetNew) (code string, rsp models.Rs
 
 	// 读取游戏数据
 	gameData := LoadData(req.UID)
+	// 检查游戏数据 轮次等
+	code = CheckGameData(gameData)
+	if code != constd.RECODE_OK {
+		return
+	}
 
 	gameData.Details.Cardholder[req.Id] += req.Count
 	SaveData(gameData)
@@ -82,6 +87,11 @@ func HandleOpen(req *models.ReqHtCardHolderOpen) (code string, rsp models.RspHtC
 
 	// 读取游戏数据
 	gameData := LoadData(req.UID)
+	// 检查游戏数据 轮次等
+	code = CheckGameData(gameData)
+	if code != constd.RECODE_OK {
+		return
+	}
 
 	// 判断卡包数目
 	countOld, _ := gameData.Details.Cardholder[req.Id]
@@ -182,6 +192,11 @@ func HandleGetRewardAlbum(req *models.ReqHtCardHolderGetRewardAlbum) (code strin
 
 	// 读取游戏数据
 	gameData := LoadData(req.UID)
+	// 检查游戏数据 轮次等
+	code = CheckGameData(gameData)
+	if code != constd.RECODE_OK {
+		return
+	}
 
 	// 是否已领过
 	countGot := gameData.Details.Album[albumId]
@@ -237,6 +252,11 @@ func HandleGetRewardRound(req *models.ReqHtCardHolderGetRewardRound) (code strin
 	//
 	//// 读取游戏数据
 	//gameData := LoadData(req.UID)
+	//// 检查游戏数据 轮次等
+	//code = CheckGameData(gameData)
+	//if code != constd.RECODE_OK {
+	//	return
+	//}
 	//
 	//// 是否已领过
 	//countGot := gameData.Details.Album[albumId]
diff --git a/service/ht-cardholder/logic.go b/service/ht-cardholder/logic.go
index ae1ff94..7121e9a 100644
--- a/service/ht-cardholder/logic.go
+++ b/service/ht-cardholder/logic.go
@@ -69,6 +69,14 @@ func CheckStatus() string {
 	return constd.RECODE_OK
 }
 
+// CheckGameData 检查游戏数据 轮次等
+func CheckGameData(d *dto.HtCardHolderData) string {
+	if d.Details.Round > Config.Raw.Round {
+		return constd.RECODE_MERGE_CARDHOLDER_ROUNDFINISH_ERROR
+	}
+	return constd.RECODE_OK
+}
+
 // GetUserSequenceIdAndCohort 获取 用户序列组ID(sequenceId) 用户分组(cohort)
 func GetUserSequenceIdAndCohort(uid int64) (sequenceId, cohort string) {
 	// todo 这里后续要对接
--
libgit2 0.21.0