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

fix:合图调整

Browse Source
This commit is contained in:
momo 2023-09-19 14:50:54 +08:00
parent dbb1591cbb
commit 640560acf6
2 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,8 +137,6 @@ func (l *UserLogoSetLogic) UserLogoSet(req *types.UserLogoSetReq, userinfo *auth
var metadataChildUserInfo = make(map[string]interface{}, 1)
_, userInfoLogoSelectedEx := metadataMapOldUserInfo["logo_selected"]
if !userInfoLogoSelectedEx {
userMaterialTemplateTagData, userMaterialTemplateTagEx := metadataMapOldUserMaterial["template_tag"]
if !userMaterialTemplateTagEx {
logc.Errorf(l.ctx, "userMaterialInfo Metadata template_tag err：%+v", err)
@ -165,11 +163,6 @@ func (l *UserLogoSetLogic) UserLogoSet(req *types.UserLogoSetReq, userinfo *auth
"logo_selected_id": req.LogoSelectedId,
"template_tag_selected": templateTagSelected,
}
} else {
metadataChildUserInfo["logo_selected"] = map[string]interface{}{
"logo_selected_id": req.LogoSelectedId,
}
}
metadataMapUserInfo, err := metadata.SetMetadata(metadataChildUserInfo, metadataMapOldUserInfo)
if err != nil {

5
service/repositories/image_handle.go
View File

@ -102,13 +102,13 @@ func (l *defaultImageHandle) LogoInfo(ctx context.Context, in *LogoInfoReq) (*Lo
LogoSelectedId int64 `json:"logo_selected_id"`
} `json:"logo_selected"`
}
userInfo.Id = 0
if userInfo.Id == 0 {
userMaterialInfo, err = userMaterialModel.FindLatestOne(ctx, in.UserId, in.GuestId)
if err != gorm.ErrRecordNotFound {
if err != nil && err != gorm.ErrRecordNotFound {
logc.Errorf(ctx, "FsUserMaterial FindLatestOne err：%+v", err)
return nil, err
}
// var userMaterialInfoMetadata map[string]interface{}
} else {
if userInfo.Metadata != nil {
err = json.Unmarshal([]byte(*userInfo.Metadata), &metadataUserInfo)
@ -152,7 +152,6 @@ func (l *defaultImageHandle) LogoInfo(ctx context.Context, in *LogoInfoReq) (*Lo
return &LogoInfoRes{
Metadata: metadata,
LogoUrl: logoUrl,
LogoSelected: metadataUserInfo.LogoSelected,
}, nil
}