diff --git a/server/home-user-auth/internal/logic/userinfosetlogic.go b/server/home-user-auth/internal/logic/userinfosetlogic.go index 777e50b3..60903759 100644 --- a/server/home-user-auth/internal/logic/userinfosetlogic.go +++ b/server/home-user-auth/internal/logic/userinfosetlogic.go @@ -75,15 +75,15 @@ func (l *UserInfoSetLogic) UserInfoSet(req *types.UserInfoSetReq, userinfo *auth BuilderDB := fsUserInfoModel.BuilderDB(l.ctx, nil).Model(&gmodel.FsUserInfo{}) BuilderDB1 := fsUserInfoModel.BuilderDB(l.ctx, nil).Model(&gmodel.FsUserInfo{}) if req.Module == "merchant_category" { - BuilderDB1.Where("module = ?", "profile") + BuilderDB1 = BuilderDB1.Where("module = ?", "profile") } else { - BuilderDB1.Where("module = ?", req.Module) + BuilderDB1 = BuilderDB1.Where("module = ?", req.Module) } //.Where("user_id=?", userId).Where("guest_id=?", guestId) if userId > 0 { - BuilderDB1.Where("user_id=?", userId) + BuilderDB1 = BuilderDB1.Where("user_id=?", userId) } else { - BuilderDB1.Where("guest_id=?", guestId) + BuilderDB1 = BuilderDB1.Where("guest_id=?", guestId) } userInfo, err = fsUserInfoModel.FindOne(BuilderDB1, nil) if err != nil { diff --git a/server/home-user-auth/internal/logic/userlogodatasetlogic.go b/server/home-user-auth/internal/logic/userlogodatasetlogic.go index 186cac4f..fd6035ad 100644 --- a/server/home-user-auth/internal/logic/userlogodatasetlogic.go +++ b/server/home-user-auth/internal/logic/userlogodatasetlogic.go @@ -96,9 +96,9 @@ func (l *UserLogoDataSetLogic) UserLogoDataSet(req *types.UserLogoDataSetReq, us "guest_id": materialInfoOld.GuestId, "resource_id": materialInfoOld.ResourceId, "resource_url": materialInfoOld.ResourceUrl, - "metadata": materialInfoOld.Metadata, "ctime": materialInfoOld.Ctime, "resource_info": nil, + "metadata": nil, }) } diff --git a/server/home-user-auth/internal/logic/userlogosetlogic.go b/server/home-user-auth/internal/logic/userlogosetlogic.go index 1eedb1ad..5771d98f 100644 --- a/server/home-user-auth/internal/logic/userlogosetlogic.go +++ b/server/home-user-auth/internal/logic/userlogosetlogic.go @@ -187,10 +187,10 @@ func (l *UserLogoSetLogic) UserLogoSet(req *types.UserLogoSetReq, userinfo *auth return err } - var templateTagSelectedVersion string + var userMaterialTemplateTagSelectedVersion string userMaterialVersionData, userMaterialVersionEx := metadataMapOldUserMaterial["version"] if userMaterialVersionEx { - templateTagSelectedVersion = userMaterialVersionData.(string) + userMaterialTemplateTagSelectedVersion = userMaterialVersionData.(string) } userMaterialTemplateIdTagIds := userMaterialTemplateIdTagIdData.([]interface{}) @@ -201,7 +201,7 @@ func (l *UserLogoSetLogic) UserLogoSet(req *types.UserLogoSetReq, userinfo *auth userMaterialTemplateTagIndex := userMaterialTemplateTag[userMaterialTemplateIdTagId] templateTagSelected := make(map[string]interface{}, 4) - templateTagSelected["version"] = templateTagSelectedVersion + templateTagSelected["version"] = userMaterialTemplateTagSelectedVersion templateTagSelected["color"] = userMaterialTemplateTagIndex templateTagSelected["template_tag"] = userMaterialTemplateIdTagId templateTagSelected["selected_index"] = 0 diff --git a/server/home-user-auth/internal/logic/userlogotemplatetagsetlogic.go b/server/home-user-auth/internal/logic/userlogotemplatetagsetlogic.go index 23c17749..46f6a8c0 100644 --- a/server/home-user-auth/internal/logic/userlogotemplatetagsetlogic.go +++ b/server/home-user-auth/internal/logic/userlogotemplatetagsetlogic.go @@ -64,9 +64,9 @@ func (l *UserLogoTemplateTagSetLogic) UserLogoTemplateTagSet(req *types.UserLogo var userInfo = &gmodel.FsUserInfo{} BuilderDB := tx.Model(&gmodel.FsUserInfo{}).Where("module = ?", module) if userId > 0 { - BuilderDB.Where("user_id=?", userId) + BuilderDB = BuilderDB.Where("user_id=?", userId) } else { - BuilderDB.Where("guest_id=?", guestId) + BuilderDB = BuilderDB.Where("guest_id=?", guestId) } userInfoFirstRes := BuilderDB.First(userInfo) err := userInfoFirstRes.Error @@ -112,10 +112,10 @@ func (l *UserLogoTemplateTagSetLogic) UserLogoTemplateTagSet(req *types.UserLogo return err } - var templateTagSelectedVersion string + var userMaterialTemplateTagSelectedVersion string userMaterialVersionData, userMaterialVersionEx := metadataMapOldUserMaterial["version"] if userMaterialVersionEx { - templateTagSelectedVersion = userMaterialVersionData.(string) + userMaterialTemplateTagSelectedVersion = userMaterialVersionData.(string) } userMaterialTemplateTag := userMaterialTemplateTagData.(map[string]interface{}) @@ -128,7 +128,7 @@ func (l *UserLogoTemplateTagSetLogic) UserLogoTemplateTagSet(req *types.UserLogo } templateTagSelected := make(map[string]interface{}, 4) - templateTagSelected["version"] = templateTagSelectedVersion + templateTagSelected["version"] = userMaterialTemplateTagSelectedVersion templateTagSelected["color"] = userMaterialTemplateTagIndex templateTagSelected["template_tag"] = req.TemplateTag templateTagSelected["selected_index"] = req.TemplateTagColorIndex