feat(设备绑定): 添加用户数据迁移功能以支持设备重新绑定
Build docker and publish / build (20.15.1) (push) Successful in 6m41s
Build docker and publish / build (20.15.1) (push) Successful in 6m41s
在设备重新绑定到新用户时,自动迁移旧用户的订单、订阅和余额数据 移除游客订单特殊处理逻辑,统一所有订单处理流程 更新设备绑定文档说明新的静默登录机制
This commit is contained in:
@@ -167,6 +167,16 @@ func (l *BindDeviceLogic) rebindDeviceToNewUser(deviceInfo *user.Device, ip, use
|
||||
|
||||
// Only disable old user if they have no other auth methods
|
||||
if nonDeviceAuthCount == 0 {
|
||||
// Migrate user data from old user to new user before disabling
|
||||
if err := l.migrateUserData(db, oldUserId, newUserId); err != nil {
|
||||
l.Errorw("failed to migrate user data",
|
||||
logger.Field("old_user_id", oldUserId),
|
||||
logger.Field("new_user_id", newUserId),
|
||||
logger.Field("error", err.Error()),
|
||||
)
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "migrate user data failed: %v", err)
|
||||
}
|
||||
|
||||
falseVal := false
|
||||
if err := db.Model(&user.User{}).Where("id = ?", oldUserId).Update("enable", &falseVal).Error; err != nil {
|
||||
l.Errorw("failed to disable old user",
|
||||
@@ -176,8 +186,9 @@ func (l *BindDeviceLogic) rebindDeviceToNewUser(deviceInfo *user.Device, ip, use
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "disable old user failed: %v", err)
|
||||
}
|
||||
|
||||
l.Infow("disabled old user (no other auth methods)",
|
||||
l.Infow("disabled old user after data migration (no other auth methods)",
|
||||
logger.Field("old_user_id", oldUserId),
|
||||
logger.Field("new_user_id", newUserId),
|
||||
)
|
||||
} else {
|
||||
l.Infow("old user has other auth methods, not disabling",
|
||||
@@ -232,3 +243,72 @@ func (l *BindDeviceLogic) rebindDeviceToNewUser(deviceInfo *user.Device, ip, use
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// migrateUserData migrates user data from old user to new user
|
||||
// This includes orders, subscriptions, balance, and other user-related data
|
||||
func (l *BindDeviceLogic) migrateUserData(db *gorm.DB, oldUserId, newUserId int64) error {
|
||||
l.Infow("starting user data migration",
|
||||
logger.Field("old_user_id", oldUserId),
|
||||
logger.Field("new_user_id", newUserId),
|
||||
)
|
||||
|
||||
// Migrate orders - using table name directly
|
||||
if err := db.Table("order").Where("user_id = ?", oldUserId).Update("user_id", newUserId).Error; err != nil {
|
||||
l.Errorw("failed to migrate orders",
|
||||
logger.Field("old_user_id", oldUserId),
|
||||
logger.Field("new_user_id", newUserId),
|
||||
logger.Field("error", err.Error()),
|
||||
)
|
||||
return err
|
||||
}
|
||||
|
||||
// Migrate user subscriptions - using Subscribe model
|
||||
if err := db.Model(&user.Subscribe{}).Where("user_id = ?", oldUserId).Update("user_id", newUserId).Error; err != nil {
|
||||
l.Errorw("failed to migrate user subscriptions",
|
||||
logger.Field("old_user_id", oldUserId),
|
||||
logger.Field("new_user_id", newUserId),
|
||||
logger.Field("error", err.Error()),
|
||||
)
|
||||
return err
|
||||
}
|
||||
|
||||
// Migrate user balance and gift amount
|
||||
var oldUser user.User
|
||||
if err := db.Where("id = ?", oldUserId).First(&oldUser).Error; err != nil {
|
||||
l.Errorw("failed to get old user data",
|
||||
logger.Field("old_user_id", oldUserId),
|
||||
logger.Field("error", err.Error()),
|
||||
)
|
||||
return err
|
||||
}
|
||||
|
||||
// Add old user's balance and gift to new user
|
||||
if oldUser.Balance > 0 || oldUser.GiftAmount > 0 {
|
||||
if err := db.Model(&user.User{}).Where("id = ?", newUserId).Updates(map[string]interface{}{
|
||||
"balance": gorm.Expr("balance + ?", oldUser.Balance),
|
||||
"gift_amount": gorm.Expr("gift_amount + ?", oldUser.GiftAmount),
|
||||
}).Error; err != nil {
|
||||
l.Errorw("failed to migrate user balance and gift",
|
||||
logger.Field("old_user_id", oldUserId),
|
||||
logger.Field("new_user_id", newUserId),
|
||||
logger.Field("old_balance", oldUser.Balance),
|
||||
logger.Field("old_gift", oldUser.GiftAmount),
|
||||
logger.Field("error", err.Error()),
|
||||
)
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
// Migrate other user-related tables if needed
|
||||
// Note: We don't migrate auth methods as they are handled separately
|
||||
// Note: Traffic usage (Upload/Download) is tracked at subscription level, not user level
|
||||
|
||||
l.Infow("user data migration completed",
|
||||
logger.Field("old_user_id", oldUserId),
|
||||
logger.Field("new_user_id", newUserId),
|
||||
logger.Field("migrated_balance", oldUser.Balance),
|
||||
logger.Field("migrated_gift", oldUser.GiftAmount),
|
||||
)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -61,18 +61,7 @@ func (l *CloseOrderLogic) CloseOrder(req *types.CloseOrderRequest) error {
|
||||
)
|
||||
return err
|
||||
}
|
||||
// If User ID is 0, it means that the order is a guest order and does not need to be refunded, the order can be deleted directly
|
||||
if orderInfo.UserId == 0 {
|
||||
err = tx.Model(&order.Order{}).Where("order_no = ?", req.OrderNo).Delete(&order.Order{}).Error
|
||||
if err != nil {
|
||||
l.Errorw("[CloseOrder] Delete order failed",
|
||||
logger.Field("error", err.Error()),
|
||||
logger.Field("orderNo", req.OrderNo),
|
||||
)
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
// All orders now have associated users, no special handling needed for guest orders
|
||||
// refund deduction amount to user deduction balance
|
||||
if orderInfo.GiftAmount > 0 {
|
||||
userInfo, err := l.svcCtx.UserModel.FindOne(l.ctx, orderInfo.UserId)
|
||||
|
||||
Reference in New Issue
Block a user