From 8466477894307b0627949a76ed945f7d41693aa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Tue, 29 Sep 2026 11:32:11 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E8=AE=A2=E5=8D=95=E4=B8=AD=E5=8F=B0):=20?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B4=BB=E5=8A=A8=E7=B1=BB=E5=9E=8B=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E4=BA=A4=E6=98=93=E6=A8=A1=E5=BC=8F=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/services/order/OrderCenterServices.php | 14 ++++++++++++++ .../admin/src/pages/order/orderCenter/index.vue | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/backend/app/services/order/OrderCenterServices.php b/backend/app/services/order/OrderCenterServices.php index e1df219e1..9a9481628 100644 --- a/backend/app/services/order/OrderCenterServices.php +++ b/backend/app/services/order/OrderCenterServices.php @@ -17,6 +17,7 @@ use crmeb\basic\BaseService; use crmeb\trade\order\type\OrderTypeRegistry; use crmeb\trade\order\type\OrderTypeAdapterInterface; use crmeb\trade\order\type\OrderCenterSyncInterface; +use crmeb\trade\mode\TradeModeRegistry; use crmeb\trade\product\ProductTypeRegistry; use crmeb\utils\SnowflakeIdGenerator; use app\dao\driver\pay\PayChannelDao; @@ -2377,6 +2378,19 @@ class OrderCenterServices extends BaseService implements OrderCenterSyncInterfac $item['refund_status_text'] = OrderCenter::$refundStatusMap[$item['refund_status']] ?? '未知'; // 支付方式 $item['pay_type_name'] = $this->getPayTypeName($item['pay_type']); + // 活动类型含义文案：normal 非活动显示空，其他从交易模式注册中心取标签，未注册的兜底原始值 + $activityType = (string)($item['activity_type'] ?? ''); + $item['activity_type_text'] = ''; + if ($activityType && $activityType !== 'normal') { + try { + $tradeModeRegistry = app()->make(TradeModeRegistry::class); + $item['activity_type_text'] = $tradeModeRegistry->has($activityType) + ? $tradeModeRegistry->get($activityType)->getLabel() + : $activityType; + } catch (\Throwable $e) { + $item['activity_type_text'] = $activityType; + } + } // 订单扩展信息 $item['extra_info'] = $this->parseExtraInfo($item['extra_info']); $item['business_status'] = $item['extra_info']['business_status'] ?? null; diff --git a/frontend/admin/src/pages/order/orderCenter/index.vue b/frontend/admin/src/pages/order/orderCenter/index.vue index 6a25fefe8..f5af0a870 100644 --- a/frontend/admin/src/pages/order/orderCenter/index.vue +++ b/frontend/admin/src/pages/order/orderCenter/index.vue @@ -170,7 +170,7 @@