fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
laodaming 2023-10-13 18:17:31 +08:00
parent dbffda69fd
commit 23b2eded5a
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/product-template-tag/internal/logic/getproducttemplatetagslogic.go
View File

@ -6,7 +6,6 @@ import (
"fusenapi/model/gmodel" "fusenapi/model/gmodel"
"fusenapi/server/product-template-tag/internal/svc" "fusenapi/server/product-template-tag/internal/svc"
"fusenapi/server/product-template-tag/internal/types" "fusenapi/server/product-template-tag/internal/types"
"fusenapi/service/repositories"
"fusenapi/utils/auth" "fusenapi/utils/auth"
"fusenapi/utils/basic" "fusenapi/utils/basic"
"fusenapi/utils/s3url_to_s3id" "fusenapi/utils/s3url_to_s3id"
@ -55,16 +54,17 @@ func (l *GetProductTemplateTagsLogic) GetProductTemplateTags(req *types.GetProdu
productTemplateTags []gmodel.FsProductTemplateTags productTemplateTags []gmodel.FsProductTemplateTags
err error err error
) )
//获取用户需要渲染logo if req.Logo == "" {
logoInfo, err := l.svcCtx.Repositories.ImageHandle.LogoInfo(l.ctx, &repositories.LogoInfoReq{ return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "logo is required")
UserId: userinfo.UserId, }
GuestId: userinfo.GuestId, logoResourceId := s3url_to_s3id.GetS3ResourceIdFormUrl(req.Logo)
}) logoInfo, err := l.svcCtx.AllModels.FsUserMaterial.FindOneByLogoResourceId(l.ctx, logoResourceId)
if err != nil { if err != nil {
logx.Error(err) logx.Error(err)
return return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get logo info")
} }
if logoInfo.Metadata == nil || *logoInfo.Metadata == "" { //查询logo素材信息
if logoInfo.Metadata == nil || len(*logoInfo.Metadata) == 0 {
return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "logo info`s metadata is not set") return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "logo info`s metadata is not set")
} }
//解析用户素材元数据 //解析用户素材元数据
@ -89,10 +89,9 @@ func (l *GetProductTemplateTagsLogic) GetProductTemplateTags(req *types.GetProdu
} }
//从用户元数据获取选中的颜色数据 //从用户元数据获取选中的颜色数据
mapSelectColor := make(map[string]int) //key是模板标签val是选中的索引 mapSelectColor := make(map[string]int) //key是模板标签val是选中的索引
if logoInfo.UserInfoMetadata != nil && *logoInfo.UserInfoMetadata != "" {
//解析用户信息元数据 //解析用户信息元数据
var logoSelectInfo LogoSelect var logoSelectInfo LogoSelect
if err = json.Unmarshal([]byte(*logoInfo.UserInfoMetadata), &logoSelectInfo); err != nil { if err = json.Unmarshal(*logoInfo.Metadata, &logoSelectInfo); err != nil {
logx.Error(err) logx.Error(err)
return resp.SetStatusWithMessage(basic.CodeJsonErr, "failed to parse user info metadata") return resp.SetStatusWithMessage(basic.CodeJsonErr, "failed to parse user info metadata")
} }
@ -101,7 +100,6 @@ func (l *GetProductTemplateTagsLogic) GetProductTemplateTags(req *types.GetProdu
if _, ok := mapMaterialTemplateTagColors[key]; ok { if _, ok := mapMaterialTemplateTagColors[key]; ok {
mapSelectColor[key] = logoSelectInfo.LogoSelected.TemplateTagSelected.SelectedIndex mapSelectColor[key] = logoSelectInfo.LogoSelected.TemplateTagSelected.SelectedIndex
} }
}
var templateTagNameList []string var templateTagNameList []string
for templateTag, _ := range mapMaterialTemplateTagColors { for templateTag, _ := range mapMaterialTemplateTagColors {
templateTagNameList = append(templateTagNameList, templateTag) templateTagNameList = append(templateTagNameList, templateTag)

1
server/product-template-tag/internal/types/types.go
View File

@ -7,6 +7,7 @@ import (
type GetProductTemplateTagsReq struct { type GetProductTemplateTagsReq struct {
Limit int `form:"limit"` Limit int `form:"limit"`
Logo string `form:"logo"`
} }
type GetProductTemplateTagsRsp struct { type GetProductTemplateTagsRsp struct {

1
server_api/product-template-tag.api
View File

@ -21,6 +21,7 @@ service product-template-tag {
//获取产品模板标签列表 //获取产品模板标签列表
type GetProductTemplateTagsReq { type GetProductTemplateTagsReq {
Limit int `form:"limit"` Limit int `form:"limit"`
Logo string `form:"logo"`
} }
type GetProductTemplateTagsRsp { type GetProductTemplateTagsRsp {
Id int64 `json:"id"` Id int64 `json:"id"`