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-09-18 15:57:36 +08:00
parent 990c7d3359
commit 49cc50ff4e
3 changed files with 50 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,33 +54,31 @@ func (l *GetProductTemplateTagsLogic) GetProductTemplateTags(req *types.GetProdu
logx.Error(err) logx.Error(err)
return return
} }
var colors interface{} var colors map[string][]types.ColorsItem
if logoInfo.Metadata == nil || *logoInfo.Metadata == "" { if logoInfo.Metadata == nil || *logoInfo.Metadata == "" {
// 返回固定模板A1a return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "logo info`s metadata is not set")
productTemplateTags, err = l.svcCtx.AllModels.FsProductTemplateTags.GetListByTagNames(l.ctx, []string{"A1"}, req.Limit, 1, "`id` DESC") }
if err != nil { //解析元数据
logx.Error(err) var metaData map[string]interface{}
return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get template tags") if err = json.Unmarshal([]byte(*logoInfo.Metadata), &metaData); err != nil {
} logx.Error(err)
} else { return resp.SetStatusWithMessage(basic.CodeJsonErr, "failed to parse user metadata")
//解析元数据 }
var metaData map[string]interface{} b, _ := json.Marshal(metaData["colors"])
if err = json.Unmarshal([]byte(*logoInfo.Metadata), &metaData); err != nil { if err = json.Unmarshal(b, &colors); err != nil {
logx.Error(err) logx.Error(err)
return resp.SetStatusWithMessage(basic.CodeJsonErr, "failed to parse user metadata") return resp.SetStatusWithMessage(basic.CodeJsonErr, "invalid format of metadata`s colors")
} }
colors = metaData["colors"] var templateTagNameList []string
var templateTagNameList []string b, _ = json.Marshal(metaData["template_tagid"])
b, _ := json.Marshal(metaData["template_tagid"]) if err = json.Unmarshal(b, &templateTagNameList); err != nil {
if err = json.Unmarshal(b, &templateTagNameList); err != nil { logx.Error(err)
logx.Error(err) return resp.SetStatusWithMessage(basic.CodeJsonErr, "invalid format of metadata`s template_tagid")
return resp.SetStatusWithMessage(basic.CodeJsonErr, "invalid format of metadata`s template_tagid") }
} productTemplateTags, err = l.svcCtx.AllModels.FsProductTemplateTags.GetListByTagNames(l.ctx, templateTagNameList, req.Limit, 1, "id DESC")
productTemplateTags, err = l.svcCtx.AllModels.FsProductTemplateTags.GetListByTagNames(l.ctx, templateTagNameList, req.Limit, 1, "id DESC") if err != nil {
if err != nil { logx.Error(err)
logx.Error(err) return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get template tags")
return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get template tags")
}
} }
//资源id集合 //资源id集合
resourceIds := make([]string, 0, 5) resourceIds := make([]string, 0, 5)

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

@ -10,11 +10,20 @@ type GetProductTemplateTagsReq struct {
} }
type GetProductTemplateTagsRsp struct { type GetProductTemplateTagsRsp struct {
Id int64 `json:"id"` Id int64 `json:"id"`
TemplateTag string `json:"template_tag"` TemplateTag string `json:"template_tag"`
Cover string `json:"cover"` Cover string `json:"cover"`
CoverMetadata interface{} `json:"cover_metadata"` CoverMetadata interface{} `json:"cover_metadata"`
Colors interface{} `json:"colors"` Colors map[string][]ColorsItem `json:"colors"`
}
type ColorsItem struct {
Color []ColorItem `json:"color"`
}
type ColorItem struct {
Value string `json:"value"`
Selected bool `json:"selected"`
} }
type Request struct { type Request struct {

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

@ -20,9 +20,16 @@ type GetProductTemplateTagsReq {
Limit int `form:"limit"` Limit int `form:"limit"`
} }
type GetProductTemplateTagsRsp { type GetProductTemplateTagsRsp {
Id int64 `json:"id"` Id int64 `json:"id"`
TemplateTag string `json:"template_tag"` TemplateTag string `json:"template_tag"`
Cover string `json:"cover"` Cover string `json:"cover"`
CoverMetadata interface{} `json:"cover_metadata"` CoverMetadata interface{} `json:"cover_metadata"`
Colors interface{} `json:"colors"` Colors map[string][]ColorsItem `json:"colors"`
}
type ColorsItem {
Color []ColorItem `json:"color"`
}
type ColorItem {
Value string `json:"value"`
Selected bool `json:"selected"`
} }