From 187ec2a74aeaf247e4c3b62f003461a143cd434e Mon Sep 17 00:00:00 2001
From: chenweijian <820961417@qq.com>
Date: Mon, 27 Mar 2023 21:12:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E7=94=A8=E6=88=B7=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E5=8A=A0=E5=85=A5=E5=AE=B6=E6=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 route/group_power_r/group_power.go | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/route/group_power_r/group_power.go b/route/group_power_r/group_power.go
index 3f21f35..92577a7 100644
--- a/route/group_power_r/group_power.go
+++ b/route/group_power_r/group_power.go
@@ -53,6 +53,15 @@ import (
 // @Router /v1/groupPower/user [post]
 func GroupPowerJoin(c *gin.Context) (*mycontext.MyContext, error) {
 	myContext := mycontext.CreateMyContext(c.Keys)
+	// 旧版本(3.5.0以下)，提示升级
+	//_, major, minor, _, err := GetAppVersion(c)
+	//if err != nil {
+	//	return myContext, err
+	//}
+	//if major <= 3 && minor < 5 {
+	//	return myContext, bizerr.UpgradeRequired
+	//}
+
 	groupPowerId, err := strconv.ParseUint(c.PostForm("groupPowerId"), 10, 64)
 	if err != nil {
 		return myContext, err
@@ -62,6 +71,14 @@ func GroupPowerJoin(c *gin.Context) (*mycontext.MyContext, error) {
 	if err != nil {
 		return myContext, err
 	}
+
+	// Aoxi要求不能让这些人加入家族
+	banUserMap := map[uint64]bool{251: true, 1384611: true, 4223511: true, 4338751: true, 4339471: true, 4339541: true,
+		4354581: true, 6541: true, 23971: true}
+	if _, ok := banUserMap[userId]; ok {
+		return myContext, bizerr.GroupPowerCannotJoin
+	}
+
 	if err := group_power_s.NewGroupPowerService(myContext).GroupPowerUserJoin(groupPowerId, userId); err != nil {
 		return myContext, err
 	}
-- 
2.22.0