merge: sync internal with main

Co-authored-by: multica-agent <github@multica.ai>

internal/model/log/log.go

@@ -50,6 +50,7 @@ const (
 	CommissionTypeWithdraw       uint16 = 334 // withdraw
 	CommissionTypeAdjust         uint16 = 335 // Admin Adjust
 	CommissionTypeConvertBalance uint16 = 336 // Convert to Balance
+	CommissionTypeWithdrawReject uint16 = 337 // Withdraw rejected refund
 	GiftTypeIncrease             uint16 = 341 // Increase
 	GiftTypeReduce               uint16 = 342 // Reduce
 )

internal/model/logmessage/entity.go

@@ -3,25 +3,25 @@ package logmessage
 import "time"
 
 type LogMessage struct {
-    Id         int64     `gorm:"primaryKey;AUTO_INCREMENT"`
-    Platform   string    `gorm:"type:varchar(32);not null"`
-    AppVersion string    `gorm:"type:varchar(32);default:null"`
-    OsName     string    `gorm:"type:varchar(32);default:null"`
-    OsVersion  string    `gorm:"type:varchar(32);default:null"`
-    DeviceId   string    `gorm:"type:varchar(64);default:null"`
-    UserId     *int64    `gorm:"type:bigint;default:null"`
-    SessionId  string    `gorm:"type:varchar(64);default:null"`
-    Level      uint8     `gorm:"type:tinyint(1);not null;default:3"`
-    ErrorCode  string    `gorm:"type:varchar(64);default:null"`
-    Message    string    `gorm:"type:text;not null"`
-    Stack      string    `gorm:"type:mediumtext;default:null"`
-    Context    string    `gorm:"type:json;default:null"`
-    ClientIP   string    `gorm:"type:varchar(45);default:null"`
-    UserAgent  string    `gorm:"type:varchar(255);default:null"`
-    Locale     string    `gorm:"type:varchar(16);default:null"`
-    Digest     string    `gorm:"type:varchar(64);uniqueIndex:uniq_digest;default:null"`
-    OccurredAt *time.Time `gorm:"type:datetime;default:null"`
-    CreatedAt  time.Time `gorm:"<-:create;comment:Create Time"`
+	Id         int64      `gorm:"primaryKey;AUTO_INCREMENT"`
+	Platform   string     `gorm:"type:varchar(32);not null"`
+	AppVersion string     `gorm:"type:varchar(64);default:null"`
+	OsName     string     `gorm:"type:varchar(64);default:null"`
+	OsVersion  string     `gorm:"type:varchar(64);default:null"`
+	DeviceId   string     `gorm:"type:varchar(255);default:null"`
+	UserId     *int64     `gorm:"type:bigint;default:null"`
+	SessionId  string     `gorm:"type:varchar(255);default:null"`
+	Level      uint8      `gorm:"type:tinyint(1);not null;default:3"`
+	ErrorCode  string     `gorm:"type:varchar(128);default:null"`
+	Message    string     `gorm:"type:text;not null"`
+	Stack      string     `gorm:"type:mediumtext;default:null"`
+	Context    string     `gorm:"type:json;default:null"`
+	ClientIP   string     `gorm:"type:varchar(45);default:null"`
+	UserAgent  string     `gorm:"type:varchar(255);default:null"`
+	Locale     string     `gorm:"type:varchar(16);default:null"`
+	Digest     string     `gorm:"type:varchar(64);uniqueIndex:uniq_digest;default:null"`
+	OccurredAt *time.Time `gorm:"type:datetime;default:null"`
+	CreatedAt  time.Time  `gorm:"<-:create;comment:Create Time"`
 }
 
 func (LogMessage) TableName() string { return "log_message" }

internal/model/user/default.go

@@ -26,6 +26,7 @@ type (
 		Insert(ctx context.Context, data *User, tx ...*gorm.DB) error
 		FindOne(ctx context.Context, id int64) (*User, error)
 		Update(ctx context.Context, data *User, tx ...*gorm.DB) error
+		UpdateCommission(ctx context.Context, userId int64, delta int64, tx ...*gorm.DB) error
 		Delete(ctx context.Context, id int64, tx ...*gorm.DB) error
 		Transaction(ctx context.Context, fn func(db *gorm.DB) error) error
 	}
@@ -111,6 +112,22 @@ func (m *defaultUserModel) Update(ctx context.Context, data *User, tx ...*gorm.D
 	return err
 }
 
+func (m *defaultUserModel) UpdateCommission(ctx context.Context, userId int64, delta int64, tx ...*gorm.DB) error {
+	old, err := m.FindOne(ctx, userId)
+	if err != nil {
+		return err
+	}
+
+	return m.ExecCtx(ctx, func(conn *gorm.DB) error {
+		if len(tx) > 0 {
+			conn = tx[0]
+		}
+		return conn.Model(&User{}).
+			Where("id = ?", userId).
+			UpdateColumn("commission", gorm.Expr("commission + ?", delta)).Error
+	}, m.getCacheKeys(old)...)
+}
+
 func (m *defaultUserModel) Delete(ctx context.Context, id int64, tx ...*gorm.DB) error {
 	data, err := m.FindOne(ctx, id)
 	if err != nil {

internal/model/user/device.go

@@ -8,6 +8,22 @@ import (
 	"gorm.io/gorm"
 )
 
+const userDeviceUserAgentMaxLength = 255
+
+func normalizeDeviceForStorage(data *Device) {
+	if data == nil {
+		return
+	}
+	data.UserAgent = truncateForColumn(data.UserAgent, userDeviceUserAgentMaxLength)
+}
+
+func truncateForColumn(s string, max int) string {
+	if len(s) <= max {
+		return s
+	}
+	return s[:max]
+}
+
 func (m *customUserModel) FindOneDevice(ctx context.Context, id int64) (*Device, error) {
 	deviceIdKey := fmt.Sprintf("%s%v", cacheUserDeviceIdPrefix, id)
 	var resp Device
@@ -69,6 +85,7 @@ func (m *customUserModel) QueryDeviceListByUserIds(ctx context.Context, userIds
 }
 
 func (m *customUserModel) UpdateDevice(ctx context.Context, data *Device, tx ...*gorm.DB) error {
+	normalizeDeviceForStorage(data)
 	old, err := m.FindOneDevice(ctx, data.Id)
 	if err != nil {
 		return err
@@ -100,6 +117,7 @@ func (m *customUserModel) DeleteDevice(ctx context.Context, id int64, tx ...*gor
 }
 
 func (m *customUserModel) InsertDevice(ctx context.Context, data *Device, tx ...*gorm.DB) error {
+	normalizeDeviceForStorage(data)
 	defer func() {
 		if clearErr := m.ClearDeviceCache(ctx, data); clearErr != nil {
 			// log cache clear error