by Robin at 20241126

api/proto/account/proto/account_vo_op.go

@@ -30,6 +30,14 @@ type OpListOthersVO struct {
 	Role   *int64                   `json:"role" bson:"role"`       // 角色
 }
 
+func NewOpListVO() *OpListVO {
+	return &OpListVO{}
+}
+
+func NewOpListOthersVO() *OpListOthersVO {
+	return &OpListOthersVO{}
+}
+
 func (vo *OpListVO) CopyAccount(account *dbstruct.Account) *OpListVO {
 	if account == nil {
 		return vo

api/proto/guild_registration/proto/guild_registration_op.go

@@ -57,9 +57,9 @@ type OpListReq struct {
 }
 
 type OpListData struct {
-	List   []*dbstruct.GuildRegistration `json:"list"`
-	Offset int                           `json:"offset"`
-	More   int                           `json:"more"`
+	List   []*GuildRegistrationOpVO `json:"list"`
+	Offset int                      `json:"offset"`
+	More   int                      `json:"more"`
 }
 
 type OpListResp struct {

api/proto/guild_registration/proto/guild_registration_vo_api.go

@@ -1 +0,0 @@
-package proto

api/proto/guild_registration/proto/guild_registration_vo_op.go

@@ -1 +1,11 @@
 package proto
+
+import (
+	accountproto "service/api/proto/account/proto"
+	"service/dbstruct"
+)
+
+type GuildRegistrationOpVO struct {
+	*dbstruct.GuildRegistration
+	Account *accountproto.OpListOthersVO `json:"account"`
+}

app/mix/controller/guild_registration_op.go

@@ -7,6 +7,7 @@ import (
 	"service/app/mix/service"
 	"service/bizcommon/util"
 	"service/library/logger"
+	"service/library/mediafiller"
 
 	"github.com/gin-gonic/gin"
 )
@@ -26,6 +27,13 @@ func OpGetGuildRegistrationList(ctx *gin.Context) {
 		return
 	}
 
+	//填充媒体切片
+	mediaFillableList := make([]mediafiller.MediaFillable, len(list))
+	for i, media := range list {
+		mediaFillableList[i] = media.AccountShot
+	}
+	mediafiller.FillList(ctx, mediaFillableList)
+
 	data := &guild_registration_proto.OpListData{
 		List:   list,
 		Offset: req.Offset + len(list),

app/mix/service/service.go

@@ -5045,14 +5045,43 @@ func (s *Service) OpDeleteRavenIQTestVisit(ctx *gin.Context, id int64) (ec errco
 	return
 }
 
-func (s *Service) OpGetGuildRegistrationList(ctx *gin.Context, req *guild_registration_proto.OpListReq) (list []*dbstruct.GuildRegistration, ec errcode.ErrCode) {
+func (s *Service) OpGetGuildRegistrationList(ctx *gin.Context, req *guild_registration_proto.OpListReq) (volist []*guild_registration_proto.GuildRegistrationOpVO, ec errcode.ErrCode) {
 	ec = errcode.ErrCodeGuildRegistrationSrvOk
+
+	volist = make([]*guild_registration_proto.GuildRegistrationOpVO, 0)
+
 	list, err := _DefaultGuildRegistration.OpList(ctx, req)
 	if err != nil {
 		logger.Error("OpGetGuildRegistrationList fail, req: %v, err: %v", util.ToJson(req), err)
 		ec = errcode.ErrCodeGuildRegistrationSrvFail
 		return
 	}
+
+	if len(list) > 0 {
+		midSet := make(map[int64]*dbstruct.Account)
+		mids := make([]int64, 0)
+		for _, guildRegistration := range list {
+			if midSet[guildRegistration.GetMid()] != nil {
+				midSet[guildRegistration.GetMid()] = &dbstruct.Account{}
+			}
+			mids = append(mids, guildRegistration.GetMid())
+		}
+
+		acctMp, err := _DefaultAccount.GetAccountMapByMids(ctx, mids)
+		if err != nil {
+			logger.Error("_DefaultAccount GetAccountMapByMids fail, req: %v, err: %v", util.ToJson(req), err)
+			ec = errcode.ErrCodeAccountSrvFail
+			return
+		}
+
+		for _, guildRegistration := range list {
+			volist = append(volist, &guild_registration_proto.GuildRegistrationOpVO{
+				GuildRegistration: guildRegistration,
+				Account:           accountproto.NewOpListOthersVO().CopyAccount(acctMp[guildRegistration.GetMid()]),
+			})
+		}
+	}
+
 	return
 }
 

dbstruct/guild_registration.go

@@ -14,5 +14,11 @@ type GuildRegistration struct {
 	Ct                 *int64          `json:"ct" bson:"ct"`                                   // 创建时间
 	Ut                 *int64          `json:"ut" bson:"ut"`                                   // 更新时间
 	DelFlag            *int64          `json:"del_flag" bson:"del_flag"`                       // 删除标记
-
+}
+
+func (p *GuildRegistration) GetMid() int64 {
+	if p != nil && p.Mid != nil {
+		return *p.Mid
+	}
+	return -1
 }