huangzhenbao/medical-mall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加展示选择

Browse Source
This commit is contained in:
huangzhenbao
2026-06-12 10:16:27 +08:00
parent 389c22c627
commit 81f3e1d3b6
28 changed files with 5983 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
api/delivery.uts
View File

@@ -628,6 +628,22 @@ function mapRpcOrderItemCompat(item: any): DeliveryOrderType {
order.merchantName = rpcStrCompat(item, ['merchantName', 'merchant_name'])
order.deliveryStaffId = rpcStrCompat(item, ['deliveryStaffId', 'current_staff_id', 'assigned_to'])
order.deliveryStaffName = rpcStrCompat(item, ['deliveryStaffName', 'delivery_staff_name'])
// 提取接单人员信息（从 statusLog 中找 accepted 状态的记录）
order.acceptedBy = ''
order.acceptedByName = ''
const statusLog = order.statusLog
for (let i = 0; i < statusLog.length; i++) {
if (statusLog[i].toStatus == 'accepted' || statusLog[i].toStatus == 'pending_accept') {
order.acceptedBy = statusLog[i].operatorId != '' ? statusLog[i].operatorId : order.deliveryStaffId
order.acceptedByName = statusLog[i].operatorRole != '' ? statusLog[i].operatorRole : order.deliveryStaffName
break
}
}
// 如果 statusLog 中没有，尝试直接从 RPC 字段获取
if (order.acceptedBy == '') {
order.acceptedBy = rpcStrCompat(item, ['acceptedBy', 'accepted_by', 'accepted_staff_id'])
order.acceptedByName = rpcStrCompat(item, ['acceptedByName', 'accepted_staff_name', 'accepted_by_name'])
}
order.acceptTime = rpcStrCompat(item, ['acceptTime', 'accepted_at'])
order.departTime = rpcStrCompat(item, ['departTime', 'departed_at'])
order.arriveTime = rpcStrCompat(item, ['arriveTime', 'arrived_at'])