下载

internal/logic/public/user/deleteAccountLogic.go

@@ -78,13 +78,7 @@ func (l *DeleteAccountLogic) DeleteAccount() (resp *types.DeleteAccountResponse,
 		if isMainAccount {
 			l.Infow("主账号解绑，仅迁移当前设备", logger.Field("user_id", currentUser.Id), logger.Field("device_id", currentDeviceId))
 
-			// 为当前设备创建新用户并迁移
-			newUser, err := l.registerUserAndDevice(tx, currentDevice.Identifier, currentDevice.Ip, currentDevice.UserAgent)
-			if err != nil {
-				return err
-			}
-			newUserId = newUser.Id
-
+			// 【重要】先删除旧的认证记录，再创建新用户，避免唯一键冲突
 			// 从原用户删除当前设备的认证方式 (按 Identifier 准确删除)
 			if err := tx.Where("user_id = ? AND auth_type = ? AND auth_identifier = ?", currentUser.Id, "device", currentDevice.Identifier).Delete(&user.AuthMethods{}).Error; err != nil {
 				return errors.Wrap(err, "删除原设备认证失败")
@@ -94,6 +88,14 @@ func (l *DeleteAccountLogic) DeleteAccount() (resp *types.DeleteAccountResponse,
 			if err := tx.Where("id = ?", currentDeviceId).Delete(&user.Device{}).Error; err != nil {
 				return errors.Wrap(err, "删除原设备记录失败")
 			}
+
+			// 为当前设备创建新用户并迁移
+			newUser, err := l.registerUserAndDevice(tx, currentDevice.Identifier, currentDevice.Ip, currentDevice.UserAgent)
+			if err != nil {
+				return err
+			}
+			newUserId = newUser.Id
+
 		} else {
 			l.Infow("纯设备账号注销，执行物理删除并重置", logger.Field("user_id", currentUser.Id), logger.Field("device_id", currentDeviceId))