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

合并develop

Browse Source
This commit is contained in:
laodaming 2023-09-19 14:06:54 +08:00
parent 7fd65d9ac7
commit b19a16e5a0
3 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,22 +125,25 @@ func (l *GetProductTemplateTagsLogic) GetProductTemplateTags(req *types.GetProdu
list := make([]types.GetProductTemplateTagsRsp, 0, len(productTemplateTags)) list := make([]types.GetProductTemplateTagsRsp, 0, len(productTemplateTags))
for _, templateInfo := range productTemplateTags { for _, templateInfo := range productTemplateTags {
colors := make([]types.ColorsItem, 0, 10) colors := make([]types.ColorsItem, 0, 10)
SelectedIndex := 0 SelectedColorIndex := 0
isDefaultTemplateTag := false
for _, colorsSet := range mapTemplateTag[*templateInfo.TemplateTag] { for _, colorsSet := range mapTemplateTag[*templateInfo.TemplateTag] {
if selectIndex, ok := mapSelectColor[*templateInfo.TemplateTag]; ok { if selectIndex, ok := mapSelectColor[*templateInfo.TemplateTag]; ok {
SelectedIndex = selectIndex isDefaultTemplateTag = true
SelectedColorIndex = selectIndex
} }
colors = append(colors, types.ColorsItem{ colors = append(colors, types.ColorsItem{
Color: colorsSet, Color: colorsSet,
}) })
} }
list = append(list, types.GetProductTemplateTagsRsp{ list = append(list, types.GetProductTemplateTagsRsp{
Id: templateInfo.Id, Id: templateInfo.Id,
TemplateTag: *templateInfo.TemplateTag, TemplateTag: *templateInfo.TemplateTag,
Cover: *templateInfo.Cover, IsDefaultTemplateTag: isDefaultTemplateTag,
CoverMetadata: mapResourceMetadata[*templateInfo.Cover], Cover: *templateInfo.Cover,
Colors: colors, CoverMetadata: mapResourceMetadata[*templateInfo.Cover],
SelectedIndex: SelectedIndex, Colors: colors,
SelectedColorIndex: SelectedColorIndex,
}) })
} }
return resp.SetStatusWithMessage(basic.CodeOK, "success", list) return resp.SetStatusWithMessage(basic.CodeOK, "success", list)

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

@ -10,12 +10,13 @@ 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"` IsDefaultTemplateTag bool `json:"is_default_template_tag"`
CoverMetadata interface{} `json:"cover_metadata"` Cover string `json:"cover"`
Colors []ColorsItem `json:"colors"` CoverMetadata interface{} `json:"cover_metadata"`
SelectedIndex int `json:"selected_index"` Colors []ColorsItem `json:"colors"`
SelectedColorIndex int `json:"selected_color_index"`
} }
type ColorsItem struct { type ColorsItem struct {

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

@ -20,12 +20,13 @@ 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"` IsDefaultTemplateTag bool `json:"is_default_template_tag"`
CoverMetadata interface{} `json:"cover_metadata"` Cover string `json:"cover"`
Colors []ColorsItem `json:"colors"` CoverMetadata interface{} `json:"cover_metadata"`
SelectedIndex int `json:"selected_index"` Colors []ColorsItem `json:"colors"`
SelectedColorIndex int `json:"selected_color_index"`
} }
type ColorsItem { type ColorsItem {
Color []string `json:"color"` Color []string `json:"color"`