fix
This commit is contained in:
parent
49785df983
commit
c12c24d03b
|
@ -48,6 +48,7 @@ type logoSelect struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l *GetProductTemplateTagsLogic) GetProductTemplateTags(req *types.GetProductTemplateTagsReq, userinfo *auth.UserInfo) (resp *basic.Response) {
|
func (l *GetProductTemplateTagsLogic) GetProductTemplateTags(req *types.GetProductTemplateTagsReq, userinfo *auth.UserInfo) (resp *basic.Response) {
|
||||||
|
userinfo.UserId = 127
|
||||||
if req.Limit <= 0 || req.Limit > 100 {
|
if req.Limit <= 0 || req.Limit > 100 {
|
||||||
req.Limit = 5
|
req.Limit = 5
|
||||||
}
|
}
|
||||||
|
@ -73,13 +74,14 @@ func (l *GetProductTemplateTagsLogic) GetProductTemplateTags(req *types.GetProdu
|
||||||
logx.Error(err)
|
logx.Error(err)
|
||||||
return resp.SetStatusWithMessage(basic.CodeJsonErr, "failed to parse user metadata")
|
return resp.SetStatusWithMessage(basic.CodeJsonErr, "failed to parse user metadata")
|
||||||
}
|
}
|
||||||
var mapTemplateTag map[string][]types.ColorsItem
|
var mapTemplateTag map[string][][]string
|
||||||
b, _ := json.Marshal(metaData["template_tag"])
|
b, _ := json.Marshal(metaData["template_tag"])
|
||||||
if err = json.Unmarshal(b, &mapTemplateTag); err != nil {
|
if err = json.Unmarshal(b, &mapTemplateTag); err != nil {
|
||||||
logx.Error(err)
|
logx.Error(err)
|
||||||
return resp.SetStatusWithMessage(basic.CodeJsonErr, "invalid format of metadata`s colors")
|
return resp.SetStatusWithMessage(basic.CodeJsonErr, "invalid format of metadata`s template_tag")
|
||||||
}
|
}
|
||||||
//获取选中的颜色数据
|
//获取选中的颜色数据
|
||||||
|
mapSelectColor := make(map[string]int) //key是模板标签val是选中的索引
|
||||||
if logoInfo.UserInfoMetadata != nil && *logoInfo.UserInfoMetadata != "" {
|
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([]byte(*logoInfo.UserInfoMetadata), &logoSelectInfo); err != nil {
|
||||||
|
@ -88,9 +90,8 @@ func (l *GetProductTemplateTagsLogic) GetProductTemplateTags(req *types.GetProdu
|
||||||
}
|
}
|
||||||
//设置选中
|
//设置选中
|
||||||
key := logoSelectInfo.LogoSelected.TemplateTagSelected.TemplateTag
|
key := logoSelectInfo.LogoSelected.TemplateTagSelected.TemplateTag
|
||||||
index := logoSelectInfo.LogoSelected.TemplateTagSelected.SelectedIndex
|
|
||||||
if _, ok := mapTemplateTag[key]; ok {
|
if _, ok := mapTemplateTag[key]; ok {
|
||||||
mapTemplateTag[key][index].Selected = true
|
mapSelectColor[key] = logoSelectInfo.LogoSelected.TemplateTagSelected.SelectedIndex
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
var templateTagNameList []string
|
var templateTagNameList []string
|
||||||
|
@ -122,14 +123,25 @@ func (l *GetProductTemplateTagsLogic) GetProductTemplateTags(req *types.GetProdu
|
||||||
mapResourceMetadata[*v.ResourceUrl] = metadata
|
mapResourceMetadata[*v.ResourceUrl] = metadata
|
||||||
}
|
}
|
||||||
list := make([]types.GetProductTemplateTagsRsp, 0, len(productTemplateTags))
|
list := make([]types.GetProductTemplateTagsRsp, 0, len(productTemplateTags))
|
||||||
for _, v := range productTemplateTags {
|
for _, templateInfo := range productTemplateTags {
|
||||||
colors := make([]types.ColorsItem, 0, 10)
|
colors := make([]types.ColorsItem, 0, 10)
|
||||||
colors = append(colors, mapTemplateTag[*v.TemplateTag]...)
|
for index, v := range mapTemplateTag[*templateInfo.TemplateTag] {
|
||||||
|
selected := false
|
||||||
|
if selectIndex, ok := mapSelectColor[*templateInfo.TemplateTag]; ok {
|
||||||
|
if index == selectIndex {
|
||||||
|
selected = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
colors = append(colors, types.ColorsItem{
|
||||||
|
Color: v,
|
||||||
|
Selected: selected,
|
||||||
|
})
|
||||||
|
}
|
||||||
list = append(list, types.GetProductTemplateTagsRsp{
|
list = append(list, types.GetProductTemplateTagsRsp{
|
||||||
Id: v.Id,
|
Id: templateInfo.Id,
|
||||||
TemplateTag: *v.TemplateTag,
|
TemplateTag: *templateInfo.TemplateTag,
|
||||||
Cover: *v.Cover,
|
Cover: *templateInfo.Cover,
|
||||||
CoverMetadata: mapResourceMetadata[*v.Cover],
|
CoverMetadata: mapResourceMetadata[*templateInfo.Cover],
|
||||||
Colors: colors,
|
Colors: colors,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user