From 6895ff2816be6ff76d7049fe09a86c19debd570d Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Tue, 19 Sep 2023 18:10:00 +0800 Subject: [PATCH] fix --- .../internal/logic/getproducttemplatetagslogic.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/server/product-template-tag/internal/logic/getproducttemplatetagslogic.go b/server/product-template-tag/internal/logic/getproducttemplatetagslogic.go index 51b0ef36..f51e2dfb 100644 --- a/server/product-template-tag/internal/logic/getproducttemplatetagslogic.go +++ b/server/product-template-tag/internal/logic/getproducttemplatetagslogic.go @@ -73,9 +73,9 @@ func (l *GetProductTemplateTagsLogic) GetProductTemplateTags(req *types.GetProdu logx.Error(err) return resp.SetStatusWithMessage(basic.CodeJsonErr, "failed to parse user metadata") } - var mapTemplateTag map[string][][]string + var mapMaterialTemplateTag map[string][][]string b, _ := json.Marshal(metaData["template_tag"]) - if err = json.Unmarshal(b, &mapTemplateTag); err != nil { + if err = json.Unmarshal(b, &mapMaterialTemplateTag); err != nil { logx.Error(err) return resp.SetStatusWithMessage(basic.CodeJsonErr, "invalid format of metadata`s template_tag") } @@ -90,12 +90,12 @@ func (l *GetProductTemplateTagsLogic) GetProductTemplateTags(req *types.GetProdu } //设置选中 key := logoSelectInfo.LogoSelected.TemplateTagSelected.TemplateTag - if _, ok := mapTemplateTag[key]; ok { + if _, ok := mapMaterialTemplateTag[key]; ok { mapSelectColor[key] = logoSelectInfo.LogoSelected.TemplateTagSelected.SelectedIndex } } var templateTagNameList []string - for templateTag, _ := range mapTemplateTag { + for templateTag, _ := range mapMaterialTemplateTag { templateTagNameList = append(templateTagNameList, templateTag) } productTemplateTags, err = l.svcCtx.AllModels.FsProductTemplateTags.GetListByTagNames(l.ctx, templateTagNameList, req.Limit, 1, "id DESC") @@ -127,11 +127,15 @@ func (l *GetProductTemplateTagsLogic) GetProductTemplateTags(req *types.GetProdu colors := make([][]string, 0, 10) SelectedColorIndex := 0 isDefaultTemplateTag := false - if colorsSet, ok := mapTemplateTag[*templateInfo.TemplateTag]; ok { + //查看用户素材中标签对应的颜色 + if colorsSet, ok := mapMaterialTemplateTag[*templateInfo.TemplateTag]; ok { + //是不是选中的标签 if selectIndex, ok := mapSelectColor[*templateInfo.TemplateTag]; ok { isDefaultTemplateTag = true + //标签中选中的索引 SelectedColorIndex = selectIndex } + //标签颜色 colors = colorsSet } var templateTagGroups []interface{}