From 916acd72f4d4f8d314c094d0ab7cda9feda2984c Mon Sep 17 00:00:00 2001
From: chenweijian <820961417@qq.com>
Date: Sun, 23 Apr 2023 14:11:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=B6=E6=97=8F=E5=B0=8F=E5=8A=A9=E6=89=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 domain/service/group_power_s/group_power.go | 34 +++++++++++++++++++++
 route/group_power_r/group_power.go          |  5 ++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/domain/service/group_power_s/group_power.go b/domain/service/group_power_s/group_power.go
index 6032e9d..c8611f5 100644
--- a/domain/service/group_power_s/group_power.go
+++ b/domain/service/group_power_s/group_power.go
@@ -4,11 +4,14 @@ import (
 	"git.hilo.cn/hilo-common/domain"
 	"git.hilo.cn/hilo-common/mycontext"
 	"git.hilo.cn/hilo-common/resource/mysql"
+	"git.hilo.cn/hilo-common/utils"
 	"hilo-group/_const/enum/groupPower_e"
 	"hilo-group/cv/group_power_cv"
 	"hilo-group/domain/event/group_power_ev"
 	"hilo-group/domain/model/groupPower_m"
+	"hilo-group/domain/model/msg_m"
 	"hilo-group/domain/model/noble_m"
+	"hilo-group/domain/model/user_m"
 )
 
 type GroupPowerService struct {
@@ -93,3 +96,34 @@ func GetGroupPowerMaxMemberNum(model *domain.Model, familyId uint64, groupPowerG
 	}
 	return
 }
+
+// 检查需不需要通知用户拉取家族小助手消息
+func CheckoutSendMsgToMgr(myContext *mycontext.MyContext, groupPowerId uint64) {
+	defer utils.CheckGoPanic()
+	model := domain.CreateModelContext(myContext)
+	//// 申请人数
+	//cnt, err := groupPower_m.CountGroupPowerApply(model, groupPowerId, 0)
+	//if err != nil {
+	//	model.Log.Errorf("CheckoutSendMsgToMgr err:%v, id:%v", err, groupPowerId)
+	//	return
+	//}
+	//if cnt <= 0 {
+	//	return
+	//}
+	// 找到家族管理员们
+	mgrList, err := groupPower_m.GetGroupPowerMgrList(model, groupPowerId)
+	if err != nil {
+		model.Log.Errorf("CheckoutSendMsgToMgr err:%v, id:%v", err, groupPowerId)
+		return
+	}
+	userMap, err := user_m.GetUserMapByIds(model, mgrList)
+	if err != nil {
+		model.Log.Errorf("CheckoutSendMsgToMgr err:%v, id:%v", err, groupPowerId)
+		return
+	}
+	for _, v := range mgrList {
+		if user, ok := userMap[v]; ok {
+			msg_m.SendEmasMsgAssistant(model, user.ExternalId, user.DeviceType)
+		}
+	}
+}
diff --git a/route/group_power_r/group_power.go b/route/group_power_r/group_power.go
index a3ab9d1..b92736d 100644
--- a/route/group_power_r/group_power.go
+++ b/route/group_power_r/group_power.go
@@ -1099,6 +1099,8 @@ func GroupPowerApplyPass(c *gin.Context) (*mycontext.MyContext, error) {
 			return myContext, err
 		}
 		resp.ResponseOk(c, nil)
+		// 家族小助手通知
+		go group_power_s.CheckoutSendMsgToMgr(myContext, myGroupPUser.GroupPowerId)
 		return myContext, nil
 	}
 	// 判断家族是否满人了
@@ -1156,6 +1158,8 @@ func GroupPowerApplyPass(c *gin.Context) (*mycontext.MyContext, error) {
 	if err != nil {
 		model.Log.Errorf("GroupPowerApplyPass msg err:%v", err)
 	}
+	// 家族小助手通知
+	go group_power_s.CheckoutSendMsgToMgr(myContext, myGroupPUser.GroupPowerId)
 
 	resp.ResponseOk(c, nil)
 	return myContext, nil
@@ -1590,7 +1594,6 @@ func GroupPowerSetInfo(c *gin.Context) (*mycontext.MyContext, error) {
 	if err != nil {
 		return myContext, myerr.WrapErr(err)
 	}
-	groupPowerGrade, err := groupPower_m.MGetGroupPowerGrade(model, []mysql.ID{gp.ID})
 	gradeM, err := groupPower_m.MGetGroupPowerGrade(model, []mysql.ID{gp.ID})
 	if err != nil {
 		return myContext, err
-- 
2.22.0