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

Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

Browse Source
This commit is contained in:
laodaming 2023-11-24 16:01:41 +08:00
commit 4cacf2c16d
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/home-user-auth/internal/logic/userlogosetlogic.go
View File

@ -187,9 +187,10 @@ func (l *UserLogoSetLogic) UserLogoSet(req *types.UserLogoSetReq, userinfo *auth
return err return err
} }
userMaterialVrsionData, userMaterialVersionEx := metadataMapOldUserMaterial["version"] var templateTagSelectedVersion string
if !userMaterialVersionEx { userMaterialVersionData, userMaterialVersionEx := metadataMapOldUserMaterial["version"]
userMaterialVrsionData = "" if userMaterialVersionEx {
templateTagSelectedVersion = userMaterialVersionData.(string)
} }
userMaterialTemplateIdTagIds := userMaterialTemplateIdTagIdData.([]interface{}) userMaterialTemplateIdTagIds := userMaterialTemplateIdTagIdData.([]interface{})
@ -200,7 +201,7 @@ func (l *UserLogoSetLogic) UserLogoSet(req *types.UserLogoSetReq, userinfo *auth
userMaterialTemplateTagIndex := userMaterialTemplateTag[userMaterialTemplateIdTagId] userMaterialTemplateTagIndex := userMaterialTemplateTag[userMaterialTemplateIdTagId]
templateTagSelected := make(map[string]interface{}, 4) templateTagSelected := make(map[string]interface{}, 4)
templateTagSelected["version"] = userMaterialVrsionData templateTagSelected["version"] = templateTagSelectedVersion
templateTagSelected["color"] = userMaterialTemplateTagIndex templateTagSelected["color"] = userMaterialTemplateTagIndex
templateTagSelected["template_tag"] = userMaterialTemplateIdTagId templateTagSelected["template_tag"] = userMaterialTemplateIdTagId
templateTagSelected["selected_index"] = 0 templateTagSelected["selected_index"] = 0

9
server/home-user-auth/internal/logic/userlogotemplatetagsetlogic.go
View File

@ -112,6 +112,12 @@ func (l *UserLogoTemplateTagSetLogic) UserLogoTemplateTagSet(req *types.UserLogo
return err return err
} }
var templateTagSelectedVersion string
userMaterialVersionData, userMaterialVersionEx := metadataMapOldUserMaterial["version"]
if userMaterialVersionEx {
templateTagSelectedVersion = userMaterialVersionData.(string)
}
userMaterialTemplateTag := userMaterialTemplateTagData.(map[string]interface{}) userMaterialTemplateTag := userMaterialTemplateTagData.(map[string]interface{})
userMaterialTemplateTagIndex := userMaterialTemplateTag[req.TemplateTag] userMaterialTemplateTagIndex := userMaterialTemplateTag[req.TemplateTag]
@ -121,7 +127,8 @@ func (l *UserLogoTemplateTagSetLogic) UserLogoTemplateTagSet(req *types.UserLogo
return err return err
} }
templateTagSelected := make(map[string]interface{}, 3) templateTagSelected := make(map[string]interface{}, 4)
templateTagSelected["version"] = templateTagSelectedVersion
templateTagSelected["color"] = userMaterialTemplateTagIndex templateTagSelected["color"] = userMaterialTemplateTagIndex
templateTagSelected["template_tag"] = req.TemplateTag templateTagSelected["template_tag"] = req.TemplateTag
templateTagSelected["selected_index"] = req.TemplateTagColorIndex templateTagSelected["selected_index"] = req.TemplateTagColorIndex