diff --git a/cv/group_power_cv/group_rank.go b/cv/group_power_cv/group_rank.go index f3c9adfa03aa6cb25dfebfcd514b417627b0c68c..14e9f1243708d6c72163bac763f52adc22481eda 100644 --- a/cv/group_power_cv/group_rank.go +++ b/cv/group_power_cv/group_rank.go @@ -32,7 +32,6 @@ type CvGroupPowerGrade struct { Exp uint32 `json:"exp"` // 经验值 NextExp uint32 `json:"nextExp,omitempty"` // 升级所需经验值 ExpireAt string `json:"expireAt,omitempty"` // 有效期 - ShowExp bool `json:"showExp"` // 是否展示经验值 } // 家族榜单 @@ -72,6 +71,7 @@ type CvGroupPowerGradeDetail struct { GroupPowerGrade CvGroupPowerGrade `json:"groupPowerGrade"` // 家族等级信息 ResGradeList []CvResGrade `json:"resGradeList"` // 资源等级列表,青铜、白银、黄金、黑金 PrivilegeList []CvPrivilege `json:"privilegeList"` // 等级特权 + IsMember bool `json:"isMember"` // 是否家族成员 } var CvResGradeList = []CvResGrade{ diff --git a/route/group_power_r/group_rank.go b/route/group_power_r/group_rank.go index 0b9a4f0c1fe91b8a2f0f55a45d9c24ccccb60010..36727a4745d57b457f2db74e6dbdcf99dca8b19a 100644 --- a/route/group_power_r/group_rank.go +++ b/route/group_power_r/group_rank.go @@ -204,11 +204,11 @@ func GroupPowerGradeDetail(c *gin.Context) (*mycontext.MyContext, error) { if grade.ExpireAt.After(time.Now()) { expireAt = grade.ExpireAt.Format("2006-01-02") } - showExp := false + isMember := false if exits, _, err := groupPower_m.CheckGroupPowerUser(model, userId); err != nil { return myContext, err } else if exits { - showExp = true + isMember = true } response := group_power_cv.CvGroupPowerGradeDetail{ GroupPowerBase: group_power_cv.CvGroupPowerBase{ @@ -222,10 +222,10 @@ func GroupPowerGradeDetail(c *gin.Context) (*mycontext.MyContext, error) { Exp: grade.Exp, NextExp: nextExp, ExpireAt: expireAt, - ShowExp: showExp, }, ResGradeList: group_power_cv.CvResGradeList, PrivilegeList: group_power_cv.GroupPowerGradePrivilegeNum[grade.Grade], + IsMember: isMember, } resp.ResponseOk(c, response) return myContext, nil