feat:用户设置logo

server/upload/internal/logic/uploadfilesbackendlogic.go

@@ -207,6 +207,7 @@ type UploadData struct {
 }
 
 type UploadUrl struct {
+	LogoId       int64  `json:"logo_id"`
 	Key          string `json:"key"`
 	Status       int64  `json:"status"`
 	ApiType      int64  `json:"api_type"`

server/upload/internal/logic/uploadlogologic.go

@@ -1,7 +1,6 @@
 package logic
 
 import (
-	"encoding/json"
 	"fmt"
 	"fusenapi/model/gmodel"
 	"fusenapi/service/repositories"
@@ -9,7 +8,6 @@ import (
 	"fusenapi/utils/basic"
 	"fusenapi/utils/file"
 	"fusenapi/utils/hash"
-	"fusenapi/utils/metadata"
 	"io"
 	"net/http"
 	"time"
@@ -190,88 +188,23 @@ func (l *UploadLogoLogic) UploadLogo(req *types.UploadLogoReq, userinfo *auth.Us
 
 	var module = "logo"
 	var nowTime = time.Now().UTC()
+	// 新增素材记录
+	materialInfo := gmodel.FsUserMaterial{
+		Module:      &module,
+		UserId:      &userId,
+		GuestId:     &guestId,
+		ResourceId:  &uploadRes.ResourceId,
+		ResourceUrl: &uploadRes.ResourceUrl,
+		Metadata:    &resultStrB,
+		Ctime:       &nowTime,
+	}
 	err = l.svcCtx.MysqlConn.WithContext(l.ctx).Transaction(func(tx *gorm.DB) error {
-		// 新增素材记录
-		materialInfo := gmodel.FsUserMaterial{
-			Module:      &module,
-			UserId:      &userId,
-			GuestId:     &guestId,
-			ResourceId:  &uploadRes.ResourceId,
-			ResourceUrl: &uploadRes.ResourceUrl,
-			Metadata:    &resultStrB,
-			Ctime:       &nowTime,
-		}
 		resCreate := tx.Create(&materialInfo)
 		err = resCreate.Error
 		if err != nil {
 			logc.Errorf(l.ctx, "FsUserInfo First err：%+v", err)
 			return err
 		}
-		// 更新用户信息
-		var module = "profile"
-		userInfoGorm := tx.Where("module = ?", module)
-		userInfo := gmodel.FsUserInfo{}
-		if userId > 0 {
-			userInfoGorm.Where("user_id = ?", userId)
-			userInfo.UserId = &userId
-		} else {
-			userInfoGorm.Where("guest_id = ?", guestId)
-			userInfo.GuestId = &guestId
-		}
-		resFirst := userInfoGorm.First(&userInfo)
-		err = resFirst.Error
-		if err != nil {
-			if err != gorm.ErrRecordNotFound {
-				logc.Errorf(l.ctx, "FsUserInfo First err：%+v", err)
-				return err
-			}
-		}
-		var metadataMap map[string]interface{}
-		var metadataMapOld map[string]interface{}
-		if userInfo.Id > 0 {
-			err = json.Unmarshal(*userInfo.Metadata, &metadataMapOld)
-			if err != nil {
-				logc.Errorf(l.ctx, "userInfo.Metadata Unmarshal err：%+v", err)
-				return err
-			}
-		}
-		var metadataChild = make(map[string]interface{}, 1)
-		metadataChild["logo_selected_id"] = materialInfo.Id
-		metadataMap, err = metadata.SetMetadata(metadataChild, metadataMapOld)
-		if err != nil {
-			logc.Errorf(l.ctx, "metadata SetMetadata err：%+v", err)
-			return err
-		}
-		metadataB, err := json.Marshal(metadataMap)
-		if err != nil {
-			logc.Errorf(l.ctx, "metadata marshal err：%+v", err)
-			return err
-		}
-		userInfo.Metadata = &metadataB
-		if userInfo.Id > 0 {
-			userInfo.Utime = &nowTime
-			resUpdates := tx.Select("metadata").Where("id = ?", userInfo.Id).Updates(&userInfo)
-			err = resUpdates.Error
-			if err != nil {
-				if err != gorm.ErrRecordNotFound {
-					logc.Errorf(l.ctx, "FsUserInfo Updates err：%+v", err)
-					return err
-				}
-			}
-		} else {
-			var nowTime = time.Now().UTC()
-			userInfo.Module = &module
-			userInfo.Ctime = &nowTime
-			userInfo.Utime = &nowTime
-			resCreate := tx.Create(&userInfo)
-			err = resCreate.Error
-			if err != nil {
-				if err != gorm.ErrRecordNotFound {
-					logc.Errorf(l.ctx, "FsUserInfo Create err：%+v", err)
-					return err
-				}
-			}
-		}
 		return nil
 	})
 
@@ -284,6 +217,7 @@ func (l *UploadLogoLogic) UploadLogo(req *types.UploadLogoReq, userinfo *auth.Us
 	return resp.SetStatus(basic.CodeOK, map[string]interface{}{
 		"upload_data": UploadUrl{
 			Status:      1,
+			LogoId:      materialInfo.Id,
 			ResourceId:  uploadRes.ResourceId,
 			ResourceUrl: uploadRes.ResourceUrl,
 		},