From 86972535262b98e651030f09d13193cb1d41655d Mon Sep 17 00:00:00 2001
From: chenweijian <820961417@qq.com>
Date: Wed, 15 Mar 2023 18:37:29 +0800
Subject: [PATCH] =?UTF-8?q?=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 | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/route/group_power_r/group_power.go b/route/group_power_r/group_power.go
index 29a1bf6..4754794 100644
--- a/route/group_power_r/group_power.go
+++ b/route/group_power_r/group_power.go
@@ -748,6 +748,9 @@ func GroupPowerInfo(c *gin.Context) (*mycontext.MyContext, error) {
 		Grade: gpInfo.Grade, Exp: gpInfo.Exp, NextExp: gpInfo.NextExp, GradeName: gpInfo.GradeName, GradeMedal: gpInfo.GradeMedal,
 		MemberNum: mysql.Num(total), MemberMax: mysql.Num(group_power_cv.GroupPowerGradePrivilegeNum[groupPowerGrade[gp.ID].Grade][0].Num),
 	}
+	if info.Icon != "" {
+		info.Icon = common.MakeFullUrl(info.Icon)
+	}
 	// 我在该家族中的角色
 	myPU := groupPower_m.GroupPowerUser{UserId: myUserId}
 	myGroupPUser, err := myPU.GetGroupPowerUser(model)
@@ -1334,7 +1337,7 @@ func GroupPowerSetAdmin(c *gin.Context) (*mycontext.MyContext, error) {
 // @Param name formData string false "家族名称"
 // @Param nameplate formData string false "家族铭牌"
 // @Param declaration formData string false "家族宣言"
-// @Success 200
+// @Success 200 group_power_cv.GroupPower
 // @Router /v1/groupPower/info/set [post]
 func GroupPowerSetInfo(c *gin.Context) (*mycontext.MyContext, error) {
 	myContext := mycontext.CreateMyContext(c.Keys)
@@ -1396,7 +1399,27 @@ func GroupPowerSetInfo(c *gin.Context) (*mycontext.MyContext, error) {
 	if err != nil {
 		return myContext, myerr.WrapErr(err)
 	}
+	// 返回家族信息
+	gp := &groupPower_m.GroupPower{Entity: mysql.Entity{ID: para.Id}}
+	gpInfo, err := gp.Get(model)
+	if err != nil {
+		return myContext, myerr.WrapErr(err)
+	}
+	gpMember := &groupPower_m.GroupPowerUser{GroupPowerId: gpInfo.ID}
+	_, total, _, _, err := gpMember.GetBy(model, 5, 0)
+	if err != nil {
+		return myContext, myerr.WrapErr(err)
+	}
+	groupPowerGrade, err := groupPower_m.MGetGroupPowerGrade(model, []mysql.ID{gp.ID})
+	info := &group_power_cv.GroupPower{
+		Id: gpInfo.ID, Name: gpInfo.Name, Nameplate: gpInfo.Nameplate, Declaration: gpInfo.Declaration, Icon: gpInfo.Icon,
+		Grade: gpInfo.Grade, Exp: gpInfo.Exp, NextExp: gpInfo.NextExp, GradeName: gpInfo.GradeName, GradeMedal: gpInfo.GradeMedal,
+		MemberNum: mysql.Num(total), MemberMax: mysql.Num(group_power_cv.GroupPowerGradePrivilegeNum[groupPowerGrade[gp.ID].Grade][0].Num),
+	}
+	if info.Icon != "" {
+		info.Icon = common.MakeFullUrl(info.Icon)
+	}
 
-	resp.ResponseOk(c, nil)
+	resp.ResponseOk(c, info)
 	return myContext, nil
 }
-- 
2.22.0