From 6c87b72ce438a2e981e66fef9d3c748cbb0d015e Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 23 Jun 2026 11:31:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prescription/components/prescription-order-utils.ts | 4 +++- admin/src/views/consumer/prescription/order_list_h5.vue | 2 ++ server/app/adminapi/logic/tcm/PrescriptionOrderLogic.php | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/admin/src/views/consumer/prescription/components/prescription-order-utils.ts b/admin/src/views/consumer/prescription/components/prescription-order-utils.ts index 0602f327..018a0bce 100644 --- a/admin/src/views/consumer/prescription/components/prescription-order-utils.ts +++ b/admin/src/views/consumer/prescription/components/prescription-order-utils.ts @@ -142,17 +142,19 @@ export function logActionText(act: string) { return m[act] || act } -/** 支付单来源/方式:企微对外收款、付呗等创建链路 + 支付方式回退 */ +/** 支付单来源/方式:企微对外收款、付呗、快递代收等创建链路 + 支付方式回退 */ export function formatPayOrderSource(row: { payment_method?: unknown; create_type?: unknown }) { const createType = String(row?.create_type || '') if (createType === 'wechat_work') return '企业微信对外收款' if (createType === 'fubei') return '付呗' + if (createType === 'express_cod') return '快递代收' const paymentMethod = String(row?.payment_method || '') const methodMap: Record = { alipay: '支付宝', wechat: '微信', wechat_work: '企业微信', fubei: '付呗', + express_cod: '快递代收', manual: '手动确认到账' } if (paymentMethod && methodMap[paymentMethod]) { diff --git a/admin/src/views/consumer/prescription/order_list_h5.vue b/admin/src/views/consumer/prescription/order_list_h5.vue index b2021e4b..c7a4afc6 100644 --- a/admin/src/views/consumer/prescription/order_list_h5.vue +++ b/admin/src/views/consumer/prescription/order_list_h5.vue @@ -4104,12 +4104,14 @@ function formatPayOrderSource(row: { payment_method?: unknown; create_type?: unk const createType = String(row?.create_type || '') if (createType === 'wechat_work') return '企业微信对外收款' if (createType === 'fubei') return '付呗' + if (createType === 'express_cod') return '快递代收' const paymentMethod = String(row?.payment_method || '') const methodMap: Record = { alipay: '支付宝', wechat: '微信', wechat_work: '企业微信', fubei: '付呗', + express_cod: '快递代收', manual: '手动确认到账' } if (paymentMethod && methodMap[paymentMethod]) { diff --git a/server/app/adminapi/logic/tcm/PrescriptionOrderLogic.php b/server/app/adminapi/logic/tcm/PrescriptionOrderLogic.php index 83bab5a4..ca10e174 100755 --- a/server/app/adminapi/logic/tcm/PrescriptionOrderLogic.php +++ b/server/app/adminapi/logic/tcm/PrescriptionOrderLogic.php @@ -3214,12 +3214,16 @@ class PrescriptionOrderLogic if ($createType === 'fubei') { return '付呗'; } + if ($createType === 'express_cod') { + return '快递代收'; + } $paymentMethod = trim((string) ($row['payment_method'] ?? '')); $methodMap = [ 'alipay' => '支付宝', 'wechat' => '微信', 'wechat_work' => '企业微信', 'fubei' => '付呗', + 'express_cod' => '快递代收', 'manual' => '手动确认到账', ]; if ($paymentMethod !== '' && isset($methodMap[$paymentMethod])) {