Merge branch 'feature/3.10' into 'master'

Feature/3.10

See merge request !49

myerr/bizerr/bizCode.go

@@ -69,7 +69,7 @@ var (
 	GroupCustomThemeLimit    = myerr.NewBusinessCode(14020, "Group Custom Theme Limit", myerr.BusinessData{})                                                       //群主题定制数量只能是5个
 	GroupSupportIpLimit      = myerr.NewBusinessCode(14024, "ID:%v is a duplicate account, please select another user to receive the reward", myerr.BusinessData{}) // 群组扶持ip限制
 	GroupNoPowerToSvip6      = myerr.NewBusinessCode(14026, "Cannot use this permission for SVIP6", myerr.BusinessData{})                                           // 踢出,无法对SVIP6使用此权限
-	GroupSupportWealthLevel8 = myerr.NewBusinessCode(14027, "Wealth level not reach 8", myerr.BusinessData{})                                                       // 财富等级8级
+	GroupSupportWealthLevel3 = myerr.NewBusinessCode(14027, "Wealth level not reach 3", myerr.BusinessData{})                                                       // 财富等级3级
 
 	// 家族
 	GroupPowerHasJoinOther      = myerr.NewBusinessCode(15001, "You already have joined power, please exit first", myerr.BusinessData{})              // 已经加入了其它国家势力

route/group_r/group_support.go

@@ -222,16 +222,16 @@ func TryAddSupporter(c *gin.Context) (*mycontext.MyContext, error) {
 	if role != group_e.GROUP_MANAGER && role != group_e.GROUP_ADMIN {
 		return myContext, bizerr.NotManagerOrAdmin
 	}
-	// 判断财富等级必须要大于等于8级
+	// 判断财富等级必须要大于等于3级
 	wealthGrade, _, err := user_m.GetWealthGrade(model, userId)
 	if err != nil {
 		return myContext, err
 	}
-	if wealthGrade < 8 {
+	if wealthGrade < 3 {
 		if msg, _ := res_m.GetResMultiTextBy(model.DB(), 187, lang); msg != nil { // 187:res_multi_text 财富等级为到8级
-			return myContext, myerr.NewBusinessCodeNoCheck(bizerr.GroupSupportWealthLevel8.GetCode(), msg.Content, myerr.BusinessData{})
+			return myContext, myerr.NewBusinessCodeNoCheck(bizerr.GroupSupportWealthLevel3.GetCode(), msg.Content, myerr.BusinessData{})
 		}
-		return myContext, bizerr.GroupSupportWealthLevel8
+		return myContext, bizerr.GroupSupportWealthLevel3
 	}
 	// 判断用户是否作为助手领取过奖励
 	sameImeiUsers, err := user_m.GetSameImeiMap(model, userId)