From c47b11928b00131e28ef8467e562f913ddb80f0a Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Sat, 24 Oct 2026 18:06:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=94=A8=E6=88=B7=E8=AF=A6=E6=83=85):=20?=
 =?UTF-8?q?=E6=B6=88=E8=B4=B9=E8=AE=B0=E5=BD=95=E6=94=B9=E7=BB=91=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E4=B8=AD=E5=8F=B0=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E8=AE=A2=E5=8D=95=E5=8F=B7/=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E4=BA=BA=E7=A9=BA=E7=99=BD=E4=B8=8E=E6=97=B6=E9=97=B4=E6=88=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../services/order/OrderCenterServices.php    | 11 +++++++--
 .../pages/user/list/handle/userDetails.vue    | 23 +++++++++++++++----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/backend/app/services/order/OrderCenterServices.php b/backend/app/services/order/OrderCenterServices.php
index e5a15e9bd..ee705ad7e 100644
--- a/backend/app/services/order/OrderCenterServices.php
+++ b/backend/app/services/order/OrderCenterServices.php
@@ -2927,13 +2927,20 @@ class OrderCenterServices extends BaseService implements OrderCenterSyncInterfac
     public function getUserList(int $uid, array $where = [], int $page = 1, int $limit = 20): array
     {
         $where['uid'] = $uid;
-        $count = $this->dao->count($where, false);
-        $list = $this->dao->selectList($where, '*', $page, $limit, 'id desc', [], false);
+        // 已删除订单不进用户消费记录（与订单中台列表口径一致）
+        $where['is_del'] = 0;
+        $where['is_system_del'] = 0;
+        // uid/is_del/is_system_del 无搜索器，须走字段过滤：search=false 时 count 会丢弃非搜索器条件导致总数虚高
+        $count = $this->dao->count($where, true);
+        $list = $this->dao->selectList($where, '*', $page, $limit, 'id desc', [], true);
         foreach ($list as &$item) {
             $item['pay_type_name'] = $this->getPayTypeName($item['pay_type'] ?? '');
             $item['status_text'] = \app\model\order\OrderCenter::$statusMap[$item['status_code'] ?? ''] ?? '未知';
             $item['pay_status_text'] = \app\model\order\OrderCenter::$payStatusMap[$item['pay_status'] ?? 0] ?? '未知';
             $item['refund_status_text'] = \app\model\order\OrderCenter::$refundStatusMap[$item['refund_status'] ?? 0] ?? '未知';
+            // 解析扩展信息并提取收货人，供用户消费记录展示（与订单中台列表口径一致）
+            $item['extra_info'] = $this->parseExtraInfo($item['extra_info']);
+            $item['contact_name'] = $item['extra_info']['contact']['name'] ?? '';
         }
         return compact('list', 'count');
     }
diff --git a/frontend/admin/src/pages/user/list/handle/userDetails.vue b/frontend/admin/src/pages/user/list/handle/userDetails.vue
index 2576aef4e..988bc233e 100644
--- a/frontend/admin/src/pages/user/list/handle/userDetails.vue
+++ b/frontend/admin/src/pages/user/list/handle/userDetails.vue
@@ -37,7 +37,12 @@
               >
                 <el-table-column :label="item.title" min-width="120" v-for="(item, index) in columns" :key="index">
                   <template #default="scope">
-                    <template v-if="item.key">
+                    <template v-if="item.format === 'time'">
+                      <div>
+                        <span>{{ scope.row[item.key] ? timeFormat(scope.row[item.key]) : '--' }}</span>
+                      </div>
+                    </template>
+                    <template v-else-if="item.key">
                       <div>
                         <span>{{ scope.row[item.key] }}</span>
                       </div>
@@ -75,11 +80,20 @@
 import { nextTick, ref } from 'vue';
 import { ElMessage } from 'element-plus';
 import { detailsApi, infoApi } from '@/api/user';
+import { formatDate } from '@/utils/validate';
 import userInfo from './userInfo';
 import userEditForm from './userEditForm';
 
 defineOptions({ name: 'userDetails' });
 
+// 秒级时间戳转 yyyy-MM-dd hh:mm（与用户模块 tableExpand 口径一致）
+function timeFormat(time) {
+  if (time) {
+    return formatDate(new Date(time * 1000), 'yyyy-MM-dd hh:mm');
+  }
+  return '--';
+}
+
 const isEdit = ref(false);
 const theme2 = ref('light');
 const list = [
@@ -170,13 +184,13 @@ function changeType() {
           case 'order':
             columns.value = [
               {
-                title: '订单ID',
-                key: 'order_id',
+                title: '订单号',
+                key: 'order_no',
                 minWidth: 160,
               },
               {
                 title: '收货人',
-                key: 'real_name',
+                key: 'contact_name',
                 minWidth: 100,
               },
               {
@@ -192,6 +206,7 @@ function changeType() {
               {
                 title: '交易完成时间',
                 key: 'pay_time',
+                format: 'time',
                 minWidth: 120,
               },
             ];