diff --git a/pages/order/orderDetail.js b/pages/order/orderDetail.js index 3a00476..26f6164 100644 --- a/pages/order/orderDetail.js +++ b/pages/order/orderDetail.js @@ -19,10 +19,19 @@ const STATUS_DESC_MAP = { cancelled: '订单已取消' } +// 取消与 status 解耦:展示状态优先取 cancelStatus +function resolveDisplayStatus(order) { + const cancelStatus = order?.cancelStatus || 'none' + if (cancelStatus === 'cancelled') return 'cancelled' + if (cancelStatus === 'requested') return 'cancel_requested' + return order?.status || 'pending' +} + const PAYMENT_STATUS_MAP = { unpaid: '未支付', partial: '部分支付', paid: '已支付', + refunding: '退款中', refunded: '已退款' } @@ -33,6 +42,12 @@ const PAYMENT_METHOD_MAP = { offline_transfer: '线下转账' } +// 支付渠道:用户下单时的选择,历史订单缺失按线下解释 +const PAY_CHANNEL_MAP = { + online_wechat: '微信支付', + offline: '线下支付' +} + function formatDate(timestamp) { if (!timestamp) return '' const date = new Date(timestamp) @@ -72,6 +87,9 @@ Page({ updatetimeText: '', paymentStatusText: '', paymentMethodText: '', + payChannelText: '', + showQueryRefundBtn: false, + queryingRefund: false, attendantSexText: '', sexRequirementText: '', // 操作按钮配置 @@ -121,7 +139,8 @@ Page({ }, applyOrderData(order) { - const status = order.status || 'pending' + const cancelStatus = order.cancelStatus || 'none' + const status = resolveDisplayStatus(order) const attendant = order.attendant || {} const schedule = order.schedule || {} const payment = order.payment || {} @@ -135,6 +154,7 @@ Page({ healthProfileId: order.healthProfileId || '', statusText: STATUS_MAP[status] || status, statusDesc: STATUS_DESC_MAP[status] || '', + statusClass: status, attendantFirstChar: (attendant.name || '?')[0], scheduleDateText: formatDate(schedule.date), scheduleStartTimeText: schedule.startTime || '', @@ -143,15 +163,20 @@ Page({ updatetimeText: formatDateTime(meta.updatetime), paymentStatusText: PAYMENT_STATUS_MAP[payment.status] || payment.status || '未支付', paymentMethodText: PAYMENT_METHOD_MAP[payment.method] || '', + payChannelText: PAY_CHANNEL_MAP[payment.payChannel || 'offline'] || '', + // 退款回调丢失时由管理端主动查退款补写终态 + showQueryRefundBtn: payment.status === 'refunding', + queryingRefund: false, attendantSexText: attendant.sex === 'male' ? '男' : attendant.sex === 'female' ? '女' : '', sexRequirementText: escort.sexRequirement === 'male' ? '要求男陪诊' : escort.sexRequirement === 'female' ? '要求女陪诊' : '不限', // 操作按钮(任何状态下均可编辑订单信息) showEditBtn: true, - showConfirmBtn: status === 'pending', - showCancelBtn: status === 'pending' || status === 'confirmed' || status === 'cancel_requested', - cancelBtnText: status === 'cancel_requested' ? '同意取消' : '取消订单', - showStartBtn: status === 'confirmed', - showCompleteBtn: status === 'in_progress' + showConfirmBtn: cancelStatus === 'none' && status === 'pending', + showCancelBtn: cancelStatus === 'requested' + || (cancelStatus === 'none' && (status === 'pending' || status === 'confirmed')), + cancelBtnText: cancelStatus === 'requested' ? '同意取消' : '取消订单', + showStartBtn: cancelStatus === 'none' && status === 'confirmed', + showCompleteBtn: cancelStatus === 'none' && status === 'in_progress' }) }, @@ -240,6 +265,33 @@ Page({ }) }, + // 主动查询退款结果:退款回调丢失时补写终态 + async onQueryRefund() { + if (this.data.queryingRefund) return + this.setData({ queryingRefund: true }) + wx.showLoading({ title: '查询中...' }) + try { + const res = await API.escort.queryRefund(this.data.orderId) + wx.hideLoading() + if (res.code !== 0) { + wx.showToast({ title: res.msg || '查询失败', icon: 'none' }) + return + } + const status = res.data?.refund?.status + wx.showToast({ + title: status === 'success' ? '退款已成功' : '查询完成', + icon: status === 'success' ? 'success' : 'none' + }) + this.loadOrderDetail(this.data.orderId) + } catch (err) { + wx.hideLoading() + console.error('查询退款结果失败', err) + wx.showToast({ title: '网络错误', icon: 'none' }) + } finally { + this.setData({ queryingRefund: false }) + } + }, + async updateStatus(newStatus) { wx.showLoading({ title: '处理中...' }) try { diff --git a/pages/order/orderDetail.wxml b/pages/order/orderDetail.wxml index 25c178d..23f4535 100644 --- a/pages/order/orderDetail.wxml +++ b/pages/order/orderDetail.wxml @@ -7,7 +7,7 @@ - + {{statusText}} {{statusDesc}} @@ -125,6 +125,10 @@ 支付状态 {{paymentStatusText}} + + 支付渠道 + {{payChannelText}} + 支付方式 {{paymentMethodText}} @@ -171,7 +175,8 @@ - + + 查询退款结果 编辑订单 {{cancelBtnText}} 确认订单 diff --git a/pages/order/orderEdit.js b/pages/order/orderEdit.js index c763b71..869ff6a 100644 --- a/pages/order/orderEdit.js +++ b/pages/order/orderEdit.js @@ -39,6 +39,8 @@ Page({ // 支付方式选项与回显标签 methodOptions: METHOD_OPTIONS, methodLabel: '', + // 存在未支付流水时金额锁定:需先关单/取消后再改价 + amountLocked: false, today: '', submitting: false }, @@ -177,7 +179,11 @@ Page({ } const sexLabel = p.sex === 'male' ? '男' : (p.sex === 'female' ? '女' : '') const age = calcAge(p.birth) + this.originalTotalFee = Number(order.payment && order.payment.totalFee) || 0 + const amountLocked = (order.payment?.status || 'unpaid') === 'unpaid' + && !!order.payment?.paymentRecordId this.setData({ + amountLocked, // 有关联档案时交由 patient-info 按 ID 加载(不读缓存,以档案最新数据为准) profileId: order.healthProfileId || '', // 无关联档案时用订单 patient 快照兜底展示姓名/性别/年龄/电话; @@ -463,6 +469,13 @@ Page({ * 编辑模式:保存修改 */ updateOrder(form) { + if (this.data.amountLocked) { + const nextTotalFee = form.payment.totalFee ? Number(form.payment.totalFee) : 0 + if (nextTotalFee !== (this.originalTotalFee || 0)) { + return wx.showToast({ title: '存在未支付流水,请先关闭后再修改金额', icon: 'none' }) + } + } + const payload = { 'hospital.province': form.hospital.province, 'hospital.name': form.hospital.name, diff --git a/pages/order/orderEdit.less b/pages/order/orderEdit.less index a3faa11..4846e1d 100644 --- a/pages/order/orderEdit.less +++ b/pages/order/orderEdit.less @@ -323,6 +323,13 @@ page { color: #1a1a2e; } +.field-tip { + display: block; + margin-top: 8rpx; + font-size: 24rpx; + color: #e6a23c; +} + .submit-btn { margin-top: 16rpx; height: 96rpx; diff --git a/pages/order/orderEdit.wxml b/pages/order/orderEdit.wxml index 6838ff6..fc8afbd 100644 --- a/pages/order/orderEdit.wxml +++ b/pages/order/orderEdit.wxml @@ -103,7 +103,8 @@ 费用(元) - + + 存在未支付流水,金额已锁定 diff --git a/utils/api.js b/utils/api.js index 8229222..68c8796 100644 --- a/utils/api.js +++ b/utils/api.js @@ -21,6 +21,8 @@ const API = { updateRecord: (id, data) => request.put(`/health/escort-record/${id}`, data), updateStatus: (id, data) => request.patch(`/health/escort-record/${id}/status`, data), deleteRecord: (id) => request.delete(`/health/escort-record/${id}`), + // 退款回调丢失时的人工兜底:主动查询微信退款结果并补写终态 + queryRefund: (id) => request.post(`/health/escort-record/${id}/refund/query`), }, healthProfile: {