lujiuyin/suixinkan_ios_new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync order detail and scanner verification

Browse Source
This commit is contained in:
汉秋
2026-06-22 17:03:27 +08:00
parent 0b83a73509
commit c2652b83c4
15 changed files with 1456 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
suixinkan/Features/Orders/ViewModels/OrdersViewModel.swift
View File

@ -39,12 +39,12 @@ final class OrdersViewModel {
}
/// 根据当前子入口刷新对应列表。
func reload(api: OrderServing, scenicId: Int?, roleId: Int?, showLoading: Bool = true) async throws {
func reload(api: OrderServing, scenicId: Int?, storeId: Int? = nil, roleId: Int?, showLoading: Bool = true) async throws {
switch selectedEntry {
case .storeOrders:
try await reloadStoreOrders(api: api, scenicId: scenicId, roleId: roleId, showLoading: showLoading)
case .verificationOrders:
try await reloadWriteOffOrders(api: api, scenicId: scenicId, showLoading: showLoading)
try await reloadWriteOffOrders(api: api, scenicId: scenicId, storeId: storeId, showLoading: showLoading)
}
}
@ -103,7 +103,7 @@ final class OrdersViewModel {
}
/// 刷新核销订单列表，缺少景区时清空旧数据。
func reloadWriteOffOrders(api: OrderServing, scenicId: Int?, showLoading: Bool = true) async throws {
func reloadWriteOffOrders(api: OrderServing, scenicId: Int?, storeId: Int? = nil, showLoading: Bool = true) async throws {
guard let scenicId else {
writeOffOrders = []
writeOffTotal = 0
@ -115,7 +115,7 @@ final class OrdersViewModel {
if showLoading { loading = true }
defer { if showLoading { loading = false } }
let result = try await api.writeOffList(scenicId: scenicId, page: 1, pageSize: pageSize)
let result = try await api.writeOffList(scenicId: scenicId, storeId: storeId, page: 1, pageSize: pageSize)
writeOffOrders = result.list
writeOffTotal = result.total
writeOffPage = 1
@ -123,13 +123,13 @@ final class OrdersViewModel {
}
/// 加载核销订单下一页。
func loadMoreWriteOffOrders(api: OrderServing, scenicId: Int?) async throws {
func loadMoreWriteOffOrders(api: OrderServing, scenicId: Int?, storeId: Int? = nil) async throws {
guard !loadingMore, writeOffHasMore, let scenicId else { return }
loadingMore = true
defer { loadingMore = false }
let nextPage = writeOffPage + 1
let result = try await api.writeOffList(scenicId: scenicId, page: nextPage, pageSize: pageSize)
let result = try await api.writeOffList(scenicId: scenicId, storeId: storeId, page: nextPage, pageSize: pageSize)
writeOffOrders.append(contentsOf: result.list)
writeOffTotal = result.total
writeOffPage = nextPage
@ -137,7 +137,7 @@ final class OrdersViewModel {
}
/// 手动核销订单，并在成功后刷新核销列表。
func verify(api: OrderServing, scenicId: Int, orderNumber: String) async throws {
func verify(api: OrderServing, scenicId: Int, storeId: Int? = nil, orderNumber: String) async throws {
guard !isVerifying else { return }
isVerifying = true
@ -148,13 +148,31 @@ final class OrdersViewModel {
}
try await api.writeOff(orderNumber: orderNumber)
let refreshed = try await api.writeOffList(scenicId: scenicId, page: 1, pageSize: pageSize)
let refreshed = try await api.writeOffList(scenicId: scenicId, storeId: storeId, page: 1, pageSize: pageSize)
writeOffOrders = refreshed.list
writeOffTotal = refreshed.total
writeOffPage = 1
writeOffHasMore = writeOffOrders.count < refreshed.total && !refreshed.list.isEmpty
}
/// 解析扫码结果并返回当前核销列表中的匹配订单。
func matchedWriteOffOrder(for rawCode: String) -> (orderNumber: String, matched: WriteOffOrderItem?)? {
guard let orderNumber = OrderNumberParser.parse(rawCode) else {
return nil
}
let matched = writeOffOrders.first {
$0.orderNumber.caseInsensitiveCompare(orderNumber) == .orderedSame
}
return (matched?.orderNumber ?? orderNumber, matched)
}
/// 根据订单号查找当前核销列表中的订单。
func writeOffOrder(matching orderNumber: String) -> WriteOffOrderItem? {
writeOffOrders.first {
$0.orderNumber.caseInsensitiveCompare(orderNumber) == .orderedSame
}
}
/// 用于测试重复提交场景的内部状态设置。
func markVerifyingForTests(orderNumber: String) {
isVerifying = true