接口优化

cv/billboard_cv/billboard.go

@@ -8,6 +8,7 @@ import (
 	"hilo-group/_const/enum/gift_e"
 	"hilo-group/_const/redis_key"
 	"hilo-group/cv/gift_cv"
+	"hilo-group/cv/group_cv"
 	"hilo-group/cv/user_cv"
 	"sort"
 	"strconv"
@@ -22,7 +23,15 @@ type BillboardUserInfo struct {
 	Num uint64 `json:"num"`
 }
 
-func GetGroupTop3Consume(model *domain.Model, groupId string, myUserId uint64) ([]BillboardUserInfo, error) {
+//榜单中用户信息
+type GroupTop3ConsumeUser struct {
+	//用户基本信息
+	UserBase group_cv.TopConsumersUser `json:"userBase"`
+	//数值
+	Num uint64 `json:"num"`
+}
+
+func GetGroupTop3Consume(model *domain.Model, groupId string, myUserId uint64) ([]GroupTop3ConsumeUser, error) {
 	now := time.Now()
 	period := now.Format(utils.COMPACT_MONTH_FORMAT)
 	data, err := getGroupTop3Consume(period, groupId)
@@ -86,7 +95,15 @@ func GetGroupTop3Consume(model *domain.Model, groupId string, myUserId uint64) (
 			})
 		}
 	}
-	return result, nil
+
+	list := make([]GroupTop3ConsumeUser, 0, len(result))
+	for _, v := range result {
+		list = append(list, GroupTop3ConsumeUser{
+			UserBase: group_cv.TopConsumersUser{Id: v.UserBase.Id, Avatar: v.UserBase.Avatar, ExternalId: v.UserBase.ExternalId, Nick: v.UserBase.Nick},
+		})
+	}
+
+	return list, nil
 }
 
 func getGroupTop3Consume(period string, groupId string) (map[string]string, error) {

cv/group_cv/group.go

@@ -2,6 +2,7 @@ package group_cv
 
 import (
 	"git.hilo.cn/hilo-common/domain"
+	"git.hilo.cn/hilo-common/resource/mysql"
 	"git.hilo.cn/hilo-common/utils"
 	"hilo-group/_const/enum/game_e"
 	"hilo-group/_const/enum/groupPower_e"
@@ -138,7 +139,7 @@ type GroupDetail struct {
 	MsgStatus    uint8                               `json:"msgStatus"`    // 消息提醒状态
 	WelcomeText  string                              `json:"welcomeText"`  // 新成员入群欢迎语
 	TotalConsume uint64                              `json:"totalConsume"` // 群内消费总额
-	TopConsumers []billboard_cv.BillboardUserInfo `json:"topConsumers"` // 月最高消费三甲
+	TopConsumers []billboard_cv.GroupTop3ConsumeUser `json:"topConsumers"` // 月最高消费三甲
 	DiceNum      uint16                              `json:"diceNum"`      // 骰子游戏的数量
 	DiceType     uint16                              `json:"diceType"`     // 骰子游戏的数字点数
 	// "AppDefinedData": 群组维度的自定义字段 【暂时不用】
@@ -146,6 +147,17 @@ type GroupDetail struct {
 	Owner       *user_cv.CvUserDetail `json:"owner"` // 群主信息
 }
 
+type TopConsumersUser struct {
+	//不会有返回值
+	Id *mysql.ID `json:"id,omitempty"`
+	//头像,不存在为nil
+	Avatar *string `json:"avatar"`
+	//用户对外ID
+	ExternalId *string `json:"externalId"`
+	//昵称,不存在为nil
+	Nick *string `json:"nick"`
+}
+
 type SimpleRoleInfo struct {
 	ExternalId string                `json:"externalId"`
 	Role       group_e.GroupRoleType `json:"role"`
@@ -176,7 +188,7 @@ type RoomInfo struct {
 	LuckyWheel      LuckyWheelState        `json:"luckyWheel"`
 	TotalConsume    uint64                 `json:"totalConsume"`
 	GameConfig      *game_m.GameConfig     `json:"gameConfig"`
-	Owner           *user_cv.CvUserDetail `json:"owner"`
+	Owner           *user_cv.RoomInfoOwner `json:"owner"`
 	EntryEffectType int                    `json:"entryEffectType"` // 进场特效类型 1: CP 2:神秘人 3:贵族 4:vip
 	CpUserAvatar    string                 `json:"cpUserAvatar"`    // cp对象头像
 	CpLevel         int                    `json:"cpLevel"`         // cp等级

cv/user_cv/user.go

@@ -69,6 +69,25 @@ type CvUserDetail struct {
 	CountryManager    *country_cv.CVCountryManager `json:"countryManager,omitempty"` // 国家管理员
 }
 
+type RoomInfoOwner struct {
+	//头像,不存在为nil
+	Avatar *string `json:"avatar"`
+	//用户对外ID
+	ExternalId *string `json:"externalId"`
+	//昵称,不存在为nil
+	Nick         *string `json:"nick"`
+	IsPrettyCode bool    `json:"isPrettyCode"` // 是否靓号
+	//是否VIP用户
+	IsVip            bool             `json:"isVip"`
+	Svip             rpc.CvSvip       `json:"svip"`             // svip结构,等级+权限
+	Medals           []uint32         `json:"medals"`           // 勋章列表
+	Noble            noble_cv.CvNoble `json:"noble"`            // 当前的
+	WealthUserGrade  uint32           `json:"wealthUserGrade"`  //财富等级
+	CharmUserGrade   uint32           `json:"charmUserGrade"`   //魅力等级
+	MyGroupPowerName string           `json:"myGroupPowerName"` // 当前用户所在势力绑定群组的名称
+	GroupPower       GroupPower       `json:"groupPower"`       // 当前用户势力信息
+}
+
 type GroupPower struct {
 	Id        uint64                       `json:"id"`                  // 群主所在的势力ID
 	Icon      string                       `json:"icon"`                // 家族头像
@@ -1288,3 +1307,20 @@ func getMedalInfo(db *gorm.DB, medals []uint32) ([]uint32, []medal_cv.CvMedal, e
 	}
 	return validMedals, medalInfo, nil
 }
+
+func UserDetailToRoomInfoOwner(user *CvUserDetail) *RoomInfoOwner {
+	return &RoomInfoOwner{
+		Avatar:           user.Avatar,
+		ExternalId:       user.ExternalId,
+		Nick:             user.Nick,
+		IsPrettyCode:     user.IsPrettyCode,
+		IsVip:            user.IsVip,
+		Svip:             user.Svip,
+		Medals:           user.Medals,
+		Noble:            user.Noble,
+		WealthUserGrade:  user.WealthUserGrade,
+		CharmUserGrade:   user.CharmUserGrade,
+		MyGroupPowerName: user.MyGroupPowerName,
+		GroupPower:       user.GroupPower,
+	}
+}

route/group_r/group_info.go

@@ -604,7 +604,8 @@ func GetRoomInfo(c *gin.Context) (*mycontext.MyContext, error) {
 		model.Log.Infof("GetRoomInfo: GetLuckWheelState: %s", err.Error())
 	}
 	// 群主的详情
-	result.Owner, err = user_cv.GetUserDetail(model, groupInfo.Owner, userId)
+	owner, err := user_cv.GetUserDetail(model, groupInfo.Owner, userId)
+	result.Owner = user_cv.UserDetailToRoomInfoOwner(owner)
 	if err != nil {
 		model.Log.Errorf("GetRoomInfo: GetUserBase: %s", err.Error())
 	}