fix

server/product-template-tag/internal/logic/getproducttemplatetagslogic.go

@@ -36,6 +36,16 @@ func NewGetProductTemplateTagsLogic(ctx context.Context, svcCtx *svc.ServiceCont
 // func (l *GetProductTemplateTagsLogic) AfterLogic(w http.ResponseWriter, r *http.Request, resp *basic.Response) {
 // // httpx.OkJsonCtx(r.Context(), w, resp)
 // }
+type logoSelect struct {
+	LogoSelected struct {
+		LogoSelectedId      int `json:"logo_selected_id"`
+		TemplateTagSelected struct {
+			TemplateTag   string     `json:"template_tag"`
+			Color         [][]string `json:"color"`
+			SelectedIndex int        `json:"selected_index"`
+		} `json:"template_tag_selected"`
+	} `json:"logo_selected"`
+}
 
 func (l *GetProductTemplateTagsLogic) GetProductTemplateTags(req *types.GetProductTemplateTagsReq, userinfo *auth.UserInfo) (resp *basic.Response) {
 	if req.Limit <= 0 || req.Limit > 100 {
@@ -54,7 +64,6 @@ func (l *GetProductTemplateTagsLogic) GetProductTemplateTags(req *types.GetProdu
 		logx.Error(err)
 		return
 	}
-	var colors map[string][]types.ColorsItem
 	if logoInfo.Metadata == nil || *logoInfo.Metadata == "" {
 		return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "logo info`s metadata is not set")
 	}
@@ -64,16 +73,29 @@ func (l *GetProductTemplateTagsLogic) GetProductTemplateTags(req *types.GetProdu
 		logx.Error(err)
 		return resp.SetStatusWithMessage(basic.CodeJsonErr, "failed to parse user metadata")
 	}
-	b, _ := json.Marshal(metaData["colors"])
+	var mapTemplateTag map[string][]types.ColorsItem
-	if err = json.Unmarshal(b, &colors); err != nil {
+	b, _ := json.Marshal(metaData["template_tag"])
+	if err = json.Unmarshal(b, &mapTemplateTag); err != nil {
 		logx.Error(err)
 		return resp.SetStatusWithMessage(basic.CodeJsonErr, "invalid format of metadata`s colors")
 	}
-	var templateTagNameList []string
+	//获取选中的颜色数据
-	b, _ = json.Marshal(metaData["template_tagid"])
+	if logoInfo.UserInfoMetadata != nil && *logoInfo.UserInfoMetadata != "" {
-	if err = json.Unmarshal(b, &templateTagNameList); err != nil {
+		var logoSelectInfo logoSelect
+		if err = json.Unmarshal([]byte(*logoInfo.UserInfoMetadata), &logoSelectInfo); err != nil {
 			logx.Error(err)
-		return resp.SetStatusWithMessage(basic.CodeJsonErr, "invalid format of metadata`s template_tagid")
+			return resp.SetStatusWithMessage(basic.CodeJsonErr, "failed to parse user info metadata")
+		}
+		//设置选中
+		key := logoSelectInfo.LogoSelected.TemplateTagSelected.TemplateTag
+		index := logoSelectInfo.LogoSelected.TemplateTagSelected.SelectedIndex
+		if _, ok := mapTemplateTag[key]; ok {
+			mapTemplateTag[key][index].Selected = true
+		}
+	}
+	var templateTagNameList []string
+	for templateTag, _ := range mapTemplateTag {
+		templateTagNameList = append(templateTagNameList, templateTag)
 	}
 	productTemplateTags, err = l.svcCtx.AllModels.FsProductTemplateTags.GetListByTagNames(l.ctx, templateTagNameList, req.Limit, 1, "id DESC")
 	if err != nil {
@@ -101,6 +123,8 @@ func (l *GetProductTemplateTagsLogic) GetProductTemplateTags(req *types.GetProdu
 	}
 	list := make([]types.GetProductTemplateTagsRsp, 0, len(productTemplateTags))
 	for _, v := range productTemplateTags {
+		colors := make([]types.ColorsItem, 0, 10)
+		colors = append(colors, mapTemplateTag[*v.TemplateTag]...)
 		list = append(list, types.GetProductTemplateTagsRsp{
 			Id:            v.Id,
 			TemplateTag:   *v.TemplateTag,

server/product-template-tag/internal/types/types.go

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

server_api/product-template-tag.api

@@ -24,12 +24,9 @@ type GetProductTemplateTagsRsp {
 	TemplateTag   string       `json:"template_tag"`
 	Cover         string       `json:"cover"`
 	CoverMetadata interface{}  `json:"cover_metadata"`
-	Colors        map[string][]ColorsItem `json:"colors"`
+	Colors        []ColorsItem `json:"colors"`
 }
 type ColorsItem {
-	Color []ColorItem `json:"color"`
+	Color    []string `json:"color"`
-}
-type ColorItem {
-	Value    string `json:"value"`
 	Selected bool     `json:"selected"`
 }

service/repositories/image_handle.go

@@ -56,13 +56,14 @@ type (
 	LogoInfoRes struct {
 		Metadata         *string `json:"metadata"`
 		LogoUrl          *string `json:"logo_url"`
+		UserInfoMetadata *string `json:"user_info_metadata"`
 	}
 )
 
 func (l *defaultImageHandle) LogoInfo(ctx context.Context, in *LogoInfoReq) (*LogoInfoRes, error) {
 	var metadata *string
 	var logoUrl *string
-
+	var userInfoMetadata *string
 	// 更新用户信息
 	var module = "profile"
 	userInfoGorm := l.MysqlConn.Where("module = ?", module)
@@ -82,6 +83,10 @@ func (l *defaultImageHandle) LogoInfo(ctx context.Context, in *LogoInfoReq) (*Lo
 			return nil, err
 		}
 	}
+	if userInfo.Id != 0 {
+		tmp := string(*userInfo.Metadata)
+		userInfoMetadata = &tmp
+	}
 	var userMaterialInfo gmodel.FsUserMaterial
 	userMaterialModel := gmodel.NewFsUserMaterialModel(l.MysqlConn)
 
@@ -136,6 +141,7 @@ func (l *defaultImageHandle) LogoInfo(ctx context.Context, in *LogoInfoReq) (*Lo
 	return &LogoInfoRes{
 		Metadata:         metadata,
 		LogoUrl:          logoUrl,
+		UserInfoMetadata: userInfoMetadata,
 	}, nil
 }