Add scenic selection and cooperation order flows aligned with Android.
Upgrade scenic picker with search, location sorting, permission apply/status, and blocking home dialog; add cooperation order module and order source picker improvements with unit tests. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@ -0,0 +1,101 @@
|
||||
//
|
||||
// BindAcquirerViewModel.swift
|
||||
// suixinkan
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
/// 接受邀请 / 绑定获客员 ViewModel,对齐 Android `BindAcquirerViewModel`。
|
||||
final class BindAcquirerViewModel {
|
||||
|
||||
private(set) var inviteInfo: SaleUserInviteInfoResponse?
|
||||
private(set) var isLoading = false
|
||||
private(set) var isAlreadyBound = false
|
||||
private(set) var commissionRateDraft = ""
|
||||
|
||||
var onStateChange: (() -> Void)?
|
||||
var onShowMessage: ((String) -> Void)?
|
||||
var onBindSuccess: (() -> Void)?
|
||||
var onShouldPop: (() -> Void)?
|
||||
|
||||
private var saleUserId = 0
|
||||
|
||||
func initSaleUserId(_ id: Int) {
|
||||
guard saleUserId != id || (inviteInfo == nil && !isAlreadyBound) else { return }
|
||||
saleUserId = id
|
||||
isAlreadyBound = false
|
||||
commissionRateDraft = ""
|
||||
inviteInfo = nil
|
||||
notifyStateChange()
|
||||
}
|
||||
|
||||
func updateCommissionRateDraft(_ text: String) {
|
||||
commissionRateDraft = String(text.filter(\.isNumber).prefix(3))
|
||||
notifyStateChange()
|
||||
}
|
||||
|
||||
func loadInviteInfo(api: OrderAPI) async {
|
||||
guard saleUserId > 0 else {
|
||||
onShowMessage?("获客员信息无效")
|
||||
onShouldPop?()
|
||||
return
|
||||
}
|
||||
isLoading = true
|
||||
notifyStateChange()
|
||||
do {
|
||||
let data = try await api.saleUserInviteInfo(saleUserId: String(saleUserId))
|
||||
let resolvedSaleUserId = data.saleUserId > 0 ? data.saleUserId : saleUserId
|
||||
inviteInfo = SaleUserInviteInfoResponse(
|
||||
saleUserId: resolvedSaleUserId,
|
||||
isBound: data.isBound,
|
||||
photographerName: data.photographerName,
|
||||
photographerPhone: data.photographerPhone,
|
||||
salerName: data.salerName,
|
||||
salerPhone: data.salerPhone,
|
||||
shareCode: data.shareCode,
|
||||
subtitle: data.subtitle,
|
||||
title: data.title
|
||||
)
|
||||
if data.isBound {
|
||||
isAlreadyBound = true
|
||||
}
|
||||
} catch {
|
||||
handleBindError(error.localizedDescription.isEmpty ? "获取邀请信息失败" : error.localizedDescription)
|
||||
}
|
||||
isLoading = false
|
||||
notifyStateChange()
|
||||
}
|
||||
|
||||
func acceptBind(api: OrderAPI) async {
|
||||
guard saleUserId > 0, !isAlreadyBound else { return }
|
||||
guard let commissionRate = Int(commissionRateDraft.trimmingCharacters(in: .whitespacesAndNewlines)) else {
|
||||
onShowMessage?("请输入分账比例")
|
||||
return
|
||||
}
|
||||
guard (0...100).contains(commissionRate) else {
|
||||
onShowMessage?("分账比例需在0到100之间")
|
||||
return
|
||||
}
|
||||
do {
|
||||
try await api.saleUserAcceptBind(saleUserId: saleUserId, commissionRate: commissionRate)
|
||||
onShowMessage?("绑定成功")
|
||||
onBindSuccess?()
|
||||
} catch {
|
||||
handleBindError(error.localizedDescription.isEmpty ? "绑定失败" : error.localizedDescription)
|
||||
}
|
||||
}
|
||||
|
||||
private func handleBindError(_ message: String) {
|
||||
onShowMessage?(message)
|
||||
if message.contains("已绑定") {
|
||||
isAlreadyBound = true
|
||||
notifyStateChange()
|
||||
return
|
||||
}
|
||||
onShouldPop?()
|
||||
}
|
||||
|
||||
private func notifyStateChange() {
|
||||
onStateChange?()
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,213 @@
|
||||
//
|
||||
// CooperationAcquirerViewModel.swift
|
||||
// suixinkan
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
/// 合作获客员 ViewModel,对齐 Android `CooperationAcquirerViewModel`。
|
||||
final class CooperationAcquirerViewModel {
|
||||
|
||||
private(set) var acquirers: [CooperativeSalerEntity] = []
|
||||
private(set) var isRefreshing = false
|
||||
private(set) var remarkEditingAcquirer: CooperativeSalerEntity?
|
||||
private(set) var remarkDraft = ""
|
||||
private(set) var commissionEditingAcquirer: CooperativeSalerEntity?
|
||||
private(set) var commissionRateDraft = ""
|
||||
private(set) var commissionSmsCodeDraft = ""
|
||||
private(set) var commissionSmsCountdown = 0
|
||||
|
||||
var onStateChange: (() -> Void)?
|
||||
var onShowMessage: ((String) -> Void)?
|
||||
var onNavigateBindAcquirer: ((Int) -> Void)?
|
||||
|
||||
private let appStore: AppStore
|
||||
private var commissionSmsTimerTask: Task<Void, Never>?
|
||||
|
||||
init(appStore: AppStore = .shared) {
|
||||
self.appStore = appStore
|
||||
}
|
||||
|
||||
deinit {
|
||||
commissionSmsTimerTask?.cancel()
|
||||
}
|
||||
|
||||
func loadAcquirers(api: OrderAPI, initial: Bool = false) async {
|
||||
if initial { isRefreshing = false }
|
||||
let storeId = appStore.currentStoreId
|
||||
let storeIdParam = storeId > 0 ? String(storeId) : nil
|
||||
do {
|
||||
let response = try await api.cooperativeSalers(storeId: storeIdParam, pageSize: "20")
|
||||
acquirers = response.list
|
||||
} catch {
|
||||
onShowMessage?(error.localizedDescription)
|
||||
}
|
||||
isRefreshing = false
|
||||
notifyStateChange()
|
||||
}
|
||||
|
||||
func refresh(api: OrderAPI) async {
|
||||
isRefreshing = true
|
||||
notifyStateChange()
|
||||
await loadAcquirers(api: api, initial: false)
|
||||
}
|
||||
|
||||
func startEditRemark(_ acquirer: CooperativeSalerEntity) {
|
||||
remarkEditingAcquirer = acquirer
|
||||
remarkDraft = acquirer.photogRemarkName
|
||||
notifyStateChange()
|
||||
}
|
||||
|
||||
func updateRemarkDraft(_ text: String) {
|
||||
remarkDraft = String(text.prefix(CooperationOrderFeature.remarkNameMaxLength))
|
||||
notifyStateChange()
|
||||
}
|
||||
|
||||
func dismissRemarkDialog() {
|
||||
remarkEditingAcquirer = nil
|
||||
remarkDraft = ""
|
||||
notifyStateChange()
|
||||
}
|
||||
|
||||
func saveRemark(api: OrderAPI) async {
|
||||
guard let acquirer = remarkEditingAcquirer else { return }
|
||||
let saleUserId = acquirer.saleUserId
|
||||
guard saleUserId > 0 else { return }
|
||||
let trimmedRemark = remarkDraft.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
if let message = CooperationOrderFeature.remarkNameValidationMessage(remarkDraft) {
|
||||
onShowMessage?(message)
|
||||
return
|
||||
}
|
||||
dismissRemarkDialog()
|
||||
do {
|
||||
try await api.saleUserUpdateRemark(saleUserId: saleUserId, photogRemarkName: trimmedRemark)
|
||||
acquirers = acquirers.map { item in
|
||||
item.saleUserId == saleUserId ? item.withRemarkName(trimmedRemark) : item
|
||||
}
|
||||
onShowMessage?("备注已保存")
|
||||
notifyStateChange()
|
||||
} catch {
|
||||
onShowMessage?(error.localizedDescription)
|
||||
}
|
||||
}
|
||||
|
||||
func startEditCommissionRate(_ acquirer: CooperativeSalerEntity) {
|
||||
stopCommissionSmsTimer()
|
||||
commissionEditingAcquirer = acquirer
|
||||
commissionRateDraft = String(acquirer.commissionRate)
|
||||
commissionSmsCodeDraft = ""
|
||||
notifyStateChange()
|
||||
}
|
||||
|
||||
func updateCommissionRateDraft(_ text: String) {
|
||||
commissionRateDraft = String(text.filter(\.isNumber).prefix(3))
|
||||
notifyStateChange()
|
||||
}
|
||||
|
||||
func updateCommissionSmsCodeDraft(_ text: String) {
|
||||
commissionSmsCodeDraft = String(text.filter(\.isNumber).prefix(6))
|
||||
notifyStateChange()
|
||||
}
|
||||
|
||||
func dismissCommissionRateDialog() {
|
||||
commissionEditingAcquirer = nil
|
||||
commissionRateDraft = ""
|
||||
commissionSmsCodeDraft = ""
|
||||
stopCommissionSmsTimer()
|
||||
notifyStateChange()
|
||||
}
|
||||
|
||||
func requestCommissionSmsCode(api: OrderAPI) async {
|
||||
guard let acquirer = commissionEditingAcquirer else { return }
|
||||
if commissionSmsCountdown > 0 {
|
||||
onShowMessage?("请在倒计时结束后重新获取")
|
||||
return
|
||||
}
|
||||
let phone = acquirer.salerPhone.isEmpty ? acquirer.displayPhone : acquirer.salerPhone
|
||||
let trimmedPhone = phone.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
guard !trimmedPhone.isEmpty else {
|
||||
onShowMessage?("获客员手机号为空")
|
||||
return
|
||||
}
|
||||
do {
|
||||
try await api.saleUserCommissionRateSendSmsCode(phone: trimmedPhone)
|
||||
startCommissionSmsTimer()
|
||||
onShowMessage?("验证码已发送")
|
||||
} catch {
|
||||
onShowMessage?(error.localizedDescription)
|
||||
}
|
||||
}
|
||||
|
||||
func saveCommissionRate(api: OrderAPI) async {
|
||||
guard let acquirer = commissionEditingAcquirer else { return }
|
||||
let saleUserId = acquirer.saleUserId
|
||||
guard saleUserId > 0 else { return }
|
||||
guard let commissionRate = Int(commissionRateDraft.trimmingCharacters(in: .whitespacesAndNewlines)) else {
|
||||
onShowMessage?("请输入分成比例")
|
||||
return
|
||||
}
|
||||
guard (0...100).contains(commissionRate) else {
|
||||
onShowMessage?("分成比例需在0到100之间")
|
||||
return
|
||||
}
|
||||
let smsCode = commissionSmsCodeDraft.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
guard !smsCode.isEmpty else {
|
||||
onShowMessage?("请输入验证码")
|
||||
return
|
||||
}
|
||||
do {
|
||||
let updated = try await api.saleUserUpdateCommissionRate(
|
||||
saleUserId: saleUserId,
|
||||
commissionRate: commissionRate,
|
||||
smsCode: smsCode
|
||||
)
|
||||
dismissCommissionRateDialog()
|
||||
if updated.saleUserId > 0 {
|
||||
acquirers = acquirers.map { item in
|
||||
item.saleUserId == updated.saleUserId ? updated : item
|
||||
}
|
||||
} else {
|
||||
await loadAcquirers(api: api, initial: false)
|
||||
}
|
||||
onShowMessage?("分成比例已修改")
|
||||
notifyStateChange()
|
||||
} catch {
|
||||
onShowMessage?(error.localizedDescription)
|
||||
}
|
||||
}
|
||||
|
||||
func processScanResult(_ scanResult: String) {
|
||||
guard let saleUserId = SaleUserQrParser.parseSaleUserId(scanResult), saleUserId > 0 else {
|
||||
onShowMessage?("请扫描正确的获客员二维码")
|
||||
return
|
||||
}
|
||||
onNavigateBindAcquirer?(saleUserId)
|
||||
}
|
||||
|
||||
private func startCommissionSmsTimer() {
|
||||
commissionSmsTimerTask?.cancel()
|
||||
commissionSmsTimerTask = Task { [weak self] in
|
||||
guard let self else { return }
|
||||
for second in stride(from: 60, through: 1, by: -1) {
|
||||
if Task.isCancelled { return }
|
||||
commissionSmsCountdown = second
|
||||
notifyStateChange()
|
||||
try? await Task.sleep(nanoseconds: 1_000_000_000)
|
||||
}
|
||||
if !Task.isCancelled {
|
||||
commissionSmsCountdown = 0
|
||||
notifyStateChange()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func stopCommissionSmsTimer() {
|
||||
commissionSmsTimerTask?.cancel()
|
||||
commissionSmsTimerTask = nil
|
||||
commissionSmsCountdown = 0
|
||||
}
|
||||
|
||||
private func notifyStateChange() {
|
||||
onStateChange?()
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,129 @@
|
||||
//
|
||||
// CooperationOrderListViewModel.swift
|
||||
// suixinkan
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
/// 合作订单列表 ViewModel,对齐 Android `CooperationOrderListViewModel`。
|
||||
final class CooperationOrderListViewModel {
|
||||
|
||||
private(set) var selectedTab = 0
|
||||
private(set) var searchText = ""
|
||||
private(set) var leads: [ReferralLeadEntity] = []
|
||||
private(set) var orders: [AcquisitionOrderEntity] = []
|
||||
private(set) var isRefreshing = false
|
||||
private(set) var isLoadingMore = false
|
||||
private(set) var canLoadMore = false
|
||||
|
||||
var onStateChange: (() -> Void)?
|
||||
var onShowMessage: ((String) -> Void)?
|
||||
|
||||
private let pageSize = 10
|
||||
private var leadsPage = 1
|
||||
private var ordersPage = 1
|
||||
private var leadsTotal = 0
|
||||
private var ordersTotal = 0
|
||||
|
||||
func onTabSelected(_ index: Int) {
|
||||
guard selectedTab != index else { return }
|
||||
selectedTab = index
|
||||
notifyStateChange()
|
||||
}
|
||||
|
||||
func onSearchTextChange(_ text: String) {
|
||||
searchText = text
|
||||
notifyStateChange()
|
||||
}
|
||||
|
||||
func refreshCurrentTab(api: OrderAPI) async {
|
||||
if selectedTab == 0 {
|
||||
await refreshLeads(api: api)
|
||||
} else {
|
||||
await refreshAcquisitionOrders(api: api)
|
||||
}
|
||||
}
|
||||
|
||||
func refreshLeads(api: OrderAPI) async {
|
||||
leadsPage = 1
|
||||
isRefreshing = true
|
||||
isLoadingMore = false
|
||||
notifyStateChange()
|
||||
await loadLeads(api: api)
|
||||
}
|
||||
|
||||
func refreshAcquisitionOrders(api: OrderAPI) async {
|
||||
ordersPage = 1
|
||||
isRefreshing = true
|
||||
isLoadingMore = false
|
||||
notifyStateChange()
|
||||
await loadAcquisitionOrders(api: api)
|
||||
}
|
||||
|
||||
func loadMore(api: OrderAPI) async {
|
||||
guard !isRefreshing, !isLoadingMore, canLoadMore else { return }
|
||||
isLoadingMore = true
|
||||
notifyStateChange()
|
||||
if selectedTab == 0 {
|
||||
leadsPage += 1
|
||||
await loadLeads(api: api)
|
||||
} else {
|
||||
ordersPage += 1
|
||||
await loadAcquisitionOrders(api: api)
|
||||
}
|
||||
}
|
||||
|
||||
func shouldLoadMore(at index: Int) -> Bool {
|
||||
guard canLoadMore, !isRefreshing, !isLoadingMore else { return false }
|
||||
let count = selectedTab == 0 ? leads.count : orders.count
|
||||
return index >= max(0, count - 3)
|
||||
}
|
||||
|
||||
private func loadLeads(api: OrderAPI) async {
|
||||
do {
|
||||
let response = try await api.referralLeads(
|
||||
page: String(leadsPage),
|
||||
pageSize: String(pageSize)
|
||||
)
|
||||
leadsTotal = response.total
|
||||
if leadsPage == 1 {
|
||||
leads = response.list
|
||||
} else {
|
||||
leads.append(contentsOf: response.list)
|
||||
}
|
||||
canLoadMore = leads.count < leadsTotal
|
||||
} catch {
|
||||
onShowMessage?(error.localizedDescription)
|
||||
}
|
||||
isRefreshing = false
|
||||
isLoadingMore = false
|
||||
notifyStateChange()
|
||||
}
|
||||
|
||||
private func loadAcquisitionOrders(api: OrderAPI) async {
|
||||
let keyword = searchText.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
do {
|
||||
let response = try await api.acquisitionOrders(
|
||||
keyword: keyword.isEmpty ? nil : keyword,
|
||||
page: String(ordersPage),
|
||||
pageSize: String(pageSize)
|
||||
)
|
||||
ordersTotal = response.total
|
||||
if ordersPage == 1 {
|
||||
orders = response.list
|
||||
} else {
|
||||
orders.append(contentsOf: response.list)
|
||||
}
|
||||
canLoadMore = orders.count < ordersTotal
|
||||
} catch {
|
||||
onShowMessage?(error.localizedDescription)
|
||||
}
|
||||
isRefreshing = false
|
||||
isLoadingMore = false
|
||||
notifyStateChange()
|
||||
}
|
||||
|
||||
private func notifyStateChange() {
|
||||
onStateChange?()
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user