Implement profile tab with Android-aligned flows and OSS upload.

Add personal info page, account switch, real-name auth, withdrawal settings, session cache extensions, AlibabaCloudOSS SPM, and unit tests. Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-06 16:01:05 +08:00
parent 02a80764ea
commit 005cac3f78
36 changed files with 4077 additions and 57 deletions
--- a/suixinkan/Features/Auth/AuthSessionHelper.swift
+++ b/suixinkan/Features/Auth/AuthSessionHelper.swift
@ -5,14 +5,15 @@

 import Foundation

-/// 登录会话辅助工具，负责写入本地 Token 并广播登录成功通知。
+/// 登录会话辅助工具，负责写入本地 Token、账号上下文并广播登录成功通知。
 enum AuthSessionHelper {

-    /// 完成登录，保存 Token 与用户偏好，并通知 SceneDelegate 切换根页面。
+    /// 完成登录，保存 Token、账号上下文与用户偏好，并通知 SceneDelegate 切换根页面。
    static func completeLogin(
        with response: V9AuthResponse,
        username: String,
-        privacyAgreementAccepted: Bool
+        privacyAgreementAccepted: Bool,
+        selectedAccount: AccountSwitchAccount
    ) {
        let token = response.token.trimmingCharacters(in: .whitespacesAndNewlines)
        guard !token.isEmpty else { return }
@ -20,7 +21,98 @@ enum AuthSessionHelper {
        AppStore.shared.saveToken(token)
        AppStore.shared.lastLoginUsername = username
        AppStore.shared.privacyAgreementAccepted = privacyAgreementAccepted
+        applyAccountSession(from: selectedAccount, in: response)

        NotificationCenter.default.post(name: NotificationName.userDidLogin, object: nil)
    }
+
+    /// 账号切换完成后更新会话，不触发根页面重建。
+    static func applyAccountSwitch(
+        with response: V9AuthResponse,
+        account: AccountSwitchAccount
+    ) {
+        let token = response.token.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !token.isEmpty else { return }
+
+        AppStore.shared.saveToken(token)
+        applyAccountSession(from: account, in: response)
+        NotificationCenter.default.post(name: NotificationName.accountDidSwitch, object: nil)
+    }
+
+    /// 将 v9 响应中的角色与账号展示信息写入 AppStore。
+    static func applyAccountSession(from account: AccountSwitchAccount, in response: V9AuthResponse) {
+        AppStore.shared.applyAccount(account)
+
+        if let scenicUser = response.scenicUsers.first(where: { matches($0, account: account) }) {
+            applyScenicUser(scenicUser)
+            return
+        }
+        if let storeUser = response.storeUsers.first(where: { matches($0, account: account) }) {
+            applyStoreUser(storeUser)
+        }
+    }
+
+    /// 从 v9 响应中解析当前账号实体，优先 `isCurrent`。
+    static func resolveCurrentAccount(from response: V9AuthResponse) -> AccountSwitchAccount? {
+        let accounts = response.accounts.filter { $0.businessUserId > 0 }
+        if let current = accounts.first(where: \.isCurrent) {
+            return current
+        }
+        return accounts.first
+    }
+
+    private static func applyScenicUser(_ user: V9ScenicUser) {
+        AppStore.shared.userId = String(user.businessUserId)
+        AppStore.shared.accountType = V9ScenicUser.accountTypeValue
+        AppStore.shared.accountDisplayName = firstNonEmpty(
+            user.scenicName, user.nickname, user.realName, user.username
+        )
+        AppStore.shared.userName = firstNonEmpty(user.nickname, user.username, user.realName)
+        AppStore.shared.realName = firstNonEmpty(user.realName, user.nickname, user.username)
+        AppStore.shared.phone = user.phone
+        AppStore.shared.currentScenicId = user.scenicId
+        AppStore.shared.currentScenicName = user.scenicName
+        AppStore.shared.currentStoreId = 0
+        if !user.appRoleCode.isEmpty {
+            AppStore.shared.roleCode = user.appRoleCode
+        }
+        if !user.appRoleName.isEmpty {
+            AppStore.shared.roleName = user.appRoleName
+        }
+    }
+
+    private static func applyStoreUser(_ user: V9StoreUser) {
+        AppStore.shared.userId = String(user.businessUserId)
+        AppStore.shared.accountType = V9StoreUser.accountTypeValue
+        AppStore.shared.accountDisplayName = firstNonEmpty(
+            user.storeName, user.scenicName, user.realName, user.userName, user.username
+        )
+        AppStore.shared.userName = firstNonEmpty(user.userName, user.username, user.realName)
+        AppStore.shared.realName = firstNonEmpty(user.realName, user.userName, user.username)
+        AppStore.shared.phone = user.phone
+        AppStore.shared.avatar = user.avatar
+        AppStore.shared.currentScenicId = user.scenicId
+        AppStore.shared.currentScenicName = user.scenicName
+        AppStore.shared.currentStoreId = user.storeId
+        if !user.appRoleCode.isEmpty {
+            AppStore.shared.roleCode = user.appRoleCode
+        }
+        if !user.appRoleName.isEmpty {
+            AppStore.shared.roleName = user.appRoleName
+        }
+    }
+
+    private static func matches(_ user: V9ScenicUser, account: AccountSwitchAccount) -> Bool {
+        user.businessUserId == account.businessUserId
+            || account.id == "\(V9ScenicUser.accountTypeValue)_\(user.businessUserId)"
+    }
+
+    private static func matches(_ user: V9StoreUser, account: AccountSwitchAccount) -> Bool {
+        user.businessUserId == account.businessUserId
+            || account.id == "\(V9StoreUser.accountTypeValue)_\(user.businessUserId)"
+    }
+
+    private static func firstNonEmpty(_ values: String...) -> String {
+        values.first { !$0.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty } ?? ""
+    }
 }
--- a/suixinkan/Features/Auth/Models/AppRoleCode.swift
+++ b/suixinkan/Features/Auth/Models/AppRoleCode.swift
@ -0,0 +1,88 @@
+//
+//  AppRoleCode.swift
+//  suixinkan
+//
+
+import Foundation
+
+/// 业务角色编码，与 Android `AppRoleCode` 对齐。
+enum AppRoleCode: String, CaseIterable, Equatable {
+    case driver = "driver"
+    case floristBuilder = "florist_builder"
+    case clerk = "clerk"
+    case liveStream = "live_stream"
+    case frontDesk = "front_desk"
+    case makeupArtist = "makeup_artist"
+    case photographerAssistant = "photographer_assistant"
+    case assistantManager = "assistant_manager"
+    case scenicOperation = "scenic_operation"
+    case scenicAdmin = "scenic_admin"
+    case scenicCS = "scenic_cs"
+    case editor = "editor"
+    case storeAdmin = "store_admin"
+    case photographer = "photographer"
+
+    var displayName: String {
+        switch self {
+        case .driver: "司机"
+        case .floristBuilder: "搭建花艺师"
+        case .clerk: "店员"
+        case .liveStream: "直播"
+        case .frontDesk: "前台"
+        case .makeupArtist: "化妆师"
+        case .photographerAssistant: "摄影师助理"
+        case .assistantManager: "副店长"
+        case .scenicOperation: "景区运营"
+        case .scenicAdmin: "景区管理员"
+        case .scenicCS: "飞手"
+        case .editor: "剪辑师"
+        case .storeAdmin: "店铺管理员"
+        case .photographer: "摄影师"
+        }
+    }
+
+    var isPhotographer: Bool {
+        self == .photographer
+    }
+
+    /// 从后端 role_code 解析角色。
+    static func fromCode(_ code: String?) -> AppRoleCode? {
+        let normalized = code?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        guard !normalized.isEmpty else { return nil }
+        return AppRoleCode(rawValue: normalized)
+    }
+
+    /// 从旧版 role_id 推断角色。
+    static func fromLegacyRoleId(_ roleId: Int) -> AppRoleCode? {
+        switch roleId {
+        case 41: .photographer
+        case 46: .storeAdmin
+        case 47: .editor
+        case 52: .scenicCS
+        case 53: .scenicAdmin
+        case 54: .scenicOperation
+        default: nil
+        }
+    }
+
+    /// 从 role_name 文本推断角色，避免「摄影师助理」误判为摄影师。
+    static func fromRoleName(_ roleName: String?) -> AppRoleCode? {
+        let name = roleName?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        guard !name.isEmpty else { return nil }
+        if name.contains("摄影师助理") { return .photographerAssistant }
+        if name.contains("副店长") { return .assistantManager }
+        if name.contains("搭建花艺") || name.contains("花艺师") { return .floristBuilder }
+        if name.contains("店铺管理") || name.contains("店长") { return .storeAdmin }
+        if name.contains("景区管理") { return .scenicAdmin }
+        if name.contains("景区运营") { return .scenicOperation }
+        if name.contains("景区客服") || name.contains("飞手") { return .scenicCS }
+        if name.contains("剪辑") { return .editor }
+        if name.contains("化妆师") { return .makeupArtist }
+        if name.contains("摄影师") { return .photographer }
+        if name.contains("司机") { return .driver }
+        if name.contains("店员") { return .clerk }
+        if name.contains("直播") { return .liveStream }
+        if name.contains("前台") { return .frontDesk }
+        return AppRoleCode.allCases.first { name.contains($0.displayName) }
+    }
+}
--- a/suixinkan/Features/Auth/Models/AuthModels.swift
+++ b/suixinkan/Features/Auth/Models/AuthModels.swift
@ -55,7 +55,7 @@ enum LoginValidationError: Equatable {

 /// 登录结果实体，区分已完成登录和需要用户选择账号两种情况。
 enum LoginResolution {
-    case completed(V9AuthResponse)
+    case completed(V9AuthResponse, AccountSwitchAccount)
    case needsAccountSelection(AccountSelectionPayload)
 }

@ -201,6 +201,8 @@ struct V9ScenicUser: Decodable, Equatable {
    let phone: String
    let scenicId: Int
    let scenicName: String
+    let appRoleCode: String
+    let appRoleName: String
    let isCurrent: Bool

    var businessUserId: Int {
@ -241,6 +243,8 @@ struct V9ScenicUser: Decodable, Equatable {
        case phone
        case scenicId = "scenic_id"
        case scenicName = "scenic_name"
+        case appRoleCode = "app_role_code"
+        case appRoleName = "app_role_name"
        case isCurrent = "is_current"
    }

@ -257,6 +261,8 @@ struct V9ScenicUser: Decodable, Equatable {
        phone = try container.decodeLossyString(forKey: .phone)
        scenicId = try container.decodeLossyInt(forKey: .scenicId) ?? 0
        scenicName = try container.decodeLossyString(forKey: .scenicName)
+        appRoleCode = try container.decodeLossyString(forKey: .appRoleCode)
+        appRoleName = try container.decodeLossyString(forKey: .appRoleName)
        isCurrent = try container.decodeLossyBool(forKey: .isCurrent) ?? false
    }
 }
@ -278,6 +284,8 @@ struct V9StoreUser: Decodable, Equatable {
    let scenicName: String
    let storeId: Int
    let storeName: String
+    let appRoleCode: String
+    let appRoleName: String
    let isCurrent: Bool

    var businessUserId: Int {
@ -320,6 +328,8 @@ struct V9StoreUser: Decodable, Equatable {
        case scenicName = "scenic_name"
        case storeId = "store_id"
        case storeName = "store_name"
+        case appRoleCode = "app_role_code"
+        case appRoleName = "app_role_name"
        case isCurrent = "is_current"
    }

@ -338,6 +348,8 @@ struct V9StoreUser: Decodable, Equatable {
        scenicName = try container.decodeLossyString(forKey: .scenicName)
        storeId = try container.decodeLossyInt(forKey: .storeId) ?? 0
        storeName = try container.decodeLossyString(forKey: .storeName)
+        appRoleCode = try container.decodeLossyString(forKey: .appRoleCode)
+        appRoleName = try container.decodeLossyString(forKey: .appRoleName)
        isCurrent = try container.decodeLossyBool(forKey: .isCurrent) ?? false
    }
 }