feat(用户管理): 添加用户备注字段并优化用户信息更新逻辑

为User类型添加remark字段以支持用户备注功能
重构updateUserBasicInfoLogic使用事务处理用户信息更新
优化错误处理和日志记录

apis/types.api

@@ -28,6 +28,7 @@ type (
 		EnableTradeNotify     bool             `json:"enable_trade_notify"`
 		LastLoginTime         int64            `json:"last_login_time"`
 		MemberStatus          string           `json:"member_status"`
+		Remark                string           `json:"remark"`
 		AuthMethods           []UserAuthMethod `json:"auth_methods"`
 		UserDevices           []UserDevice     `json:"user_devices"`
 		CreatedAt             int64            `json:"created_at"`

internal/logic/admin/user/updateUserBasicInfoLogic.go

@@ -2,6 +2,7 @@ package user
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"strings"
 	"time"
@@ -13,6 +14,7 @@ import (
 	"github.com/perfect-panel/server/pkg/tool"
 	"github.com/perfect-panel/server/pkg/xerr"
 	"github.com/pkg/errors"
+	"gorm.io/gorm"
 )
 
 type UpdateUserBasicInfoLogic struct {
@@ -43,6 +45,7 @@ func (l *UpdateUserBasicInfoLogic) UpdateUserBasicInfo(req *types.UpdateUserBasi
 		return errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "Invalid Image Size")
 	}
 
+	err = l.svcCtx.UserModel.Transaction(l.ctx, func(tx *gorm.DB) error {
 		if userInfo.Balance != req.Balance {
 			change := req.Balance - userInfo.Balance
 			balanceLog := log.Balance{
@@ -54,15 +57,14 @@ func (l *UpdateUserBasicInfoLogic) UpdateUserBasicInfo(req *types.UpdateUserBasi
 			}
 			content, _ := balanceLog.Marshal()
 
-		err = l.svcCtx.LogModel.Insert(l.ctx, &log.SystemLog{
+			err = tx.Create(&log.SystemLog{
 				Type:     log.TypeBalance.Uint8(),
 				Date:     time.Now().Format(time.DateOnly),
 				ObjectID: userInfo.Id,
 				Content:  string(content),
-		})
+			}).Error
 			if err != nil {
-			l.Errorw("[UpdateUserBasicInfoLogic] Insert Balance Log Error:", logger.Field("err", err.Error()), logger.Field("userId", req.UserId))
+				return err
-			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "Insert Balance Log Error")
 			}
 			userInfo.Balance = req.Balance
 		}
@@ -85,15 +87,14 @@ func (l *UpdateUserBasicInfoLogic) UpdateUserBasicInfo(req *types.UpdateUserBasi
 				}
 				content, _ := giftLog.Marshal()
 				// Add gift amount change log
-			err = l.svcCtx.LogModel.Insert(l.ctx, &log.SystemLog{
+				err = tx.Create(&log.SystemLog{
 					Type:     log.TypeGift.Uint8(),
 					Date:     time.Now().Format(time.DateOnly),
 					ObjectID: userInfo.Id,
 					Content:  string(content),
-			})
+				}).Error
 				if err != nil {
-				l.Errorw("[UpdateUserBasicInfoLogic] Insert Balance Log Error:", logger.Field("err", err.Error()), logger.Field("userId", req.UserId))
+					return err
-				return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "Insert Balance Log Error")
 				}
 				userInfo.GiftAmount = req.GiftAmount
 			}
@@ -108,15 +109,14 @@ func (l *UpdateUserBasicInfoLogic) UpdateUserBasicInfo(req *types.UpdateUserBasi
 			}
 
 			content, _ := commentLog.Marshal()
-		err = l.svcCtx.LogModel.Insert(l.ctx, &log.SystemLog{
+			err = tx.Create(&log.SystemLog{
 				Type:     log.TypeCommission.Uint8(),
 				Date:     time.Now().Format(time.DateOnly),
 				ObjectID: userInfo.Id,
 				Content:  string(content),
-		})
+			}).Error
 			if err != nil {
-			l.Errorw("[UpdateUserBasicInfoLogic] Insert Commission Log Error:", logger.Field("err", err.Error()), logger.Field("userId", req.UserId))
+				return err
-			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "Insert Commission Log Error")
 			}
 			userInfo.Commission = req.Commission
 		}
@@ -128,16 +128,26 @@ func (l *UpdateUserBasicInfoLogic) UpdateUserBasicInfo(req *types.UpdateUserBasi
 
 		if req.Password != "" {
 			if userInfo.Id == 2 && isDemo {
-			return errors.Wrapf(xerr.NewErrCodeMsg(503, "Demo mode does not allow modification of the admin user password"), "UpdateUserBasicInfo failed: cannot update admin user password in demo mode")
+				return errors.New("Demo mode does not allow modification of the admin user password")
 			}
 			userInfo.Password = tool.EncodePassWord(req.Password)
 			userInfo.Algo = "default"
 		}
 
-	err = l.svcCtx.UserModel.Update(l.ctx, userInfo)
+		err = l.svcCtx.UserModel.Update(l.ctx, userInfo, tx)
+		if err != nil {
+			return err
+		}
+
+		return nil
+	})
+
 	if err != nil {
 		l.Errorw("[UpdateUserBasicInfoLogic] Update User Error:", logger.Field("err", err.Error()), logger.Field("userId", req.UserId))
-		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "Update User Error")
+		if err.Error() == "Demo mode does not allow modification of the admin user password" {
+			return errors.Wrapf(xerr.NewErrCodeMsg(503, "Demo mode does not allow modification of the admin user password"), "UpdateUserBasicInfo failed: cannot update admin user password in demo mode")
+		}
+		return errors.Wrapf(xerr.NewErrCodeMsg(xerr.DatabaseUpdateError, fmt.Sprintf("Database update error: %v", err)), "Update User Error")
 	}
 
 	return nil

internal/types/types.go

@@ -2604,6 +2604,7 @@ type User struct {
 	EnableTradeNotify     bool             `json:"enable_trade_notify"`
 	LastLoginTime         int64            `json:"last_login_time"`
 	MemberStatus          string           `json:"member_status"`
+	Remark                string           `json:"remark"`
 	AuthMethods           []UserAuthMethod `json:"auth_methods"`
 	UserDevices           []UserDevice     `json:"user_devices"`
 	CreatedAt             int64            `json:"created_at"`