feat(订单列表): 添加关联订单组件并优化订阅显示

添加 RelatedOrders 组件用于统一展示关联订单和订阅信息
在订单列表中增加订阅标签显示
移除未使用的 request 导入
This commit is contained in:
tikkhun 2025-11-21 11:27:07 +08:00
parent a1e8e81407
commit 22ecfba0e5
3 changed files with 76 additions and 20 deletions

View File

@ -0,0 +1,55 @@
import React from 'react';
import { Empty, Tag } from 'antd';
import dayjs from 'dayjs';
import relativeTime from 'dayjs/plugin/relativeTime';
dayjs.extend(relativeTime);
/**
* RelatedOrders
* /
* 便
*/
const RelatedOrders: React.FC<{ data?: any[] }> = ({ data = [] }) => {
const rows = (Array.isArray(data) ? data : []).map((it: any) => {
const isSubscription = !!it?.externalSubscriptionId || !!it?.billing_period || !!it?.line_items;
const number = isSubscription ? `#${it?.externalSubscriptionId || it?.id}` : `#${it?.externalOrderId || it?.id}`;
const relationship = isSubscription ? 'Subscription' : 'Order';
const dateRaw = it?.start_date || it?.date_created || it?.createdAt || it?.updatedAt;
const dateText = dateRaw ? dayjs(dateRaw).fromNow() : '-';
const status = (isSubscription ? it?.status : it?.orderStatus) || '-';
const statusLower = String(status).toLowerCase();
const color = statusLower === 'active' ? 'green' : statusLower === 'cancelled' ? 'red' : 'default';
const totalNum = Number(it?.total || 0);
const totalText = isSubscription ? `$${totalNum.toFixed(2)} / ${it?.billing_period || 'period'}` : `$${totalNum.toFixed(2)}`;
return { key: `${isSubscription ? 'sub' : 'order'}-${it?.id}`, number, relationship, dateText, status, color, totalText };
});
if (rows.length === 0) return <Empty description="暂无关联" />;
return (
<div style={{ width: '100%' }}>
{/* 表头(英文文案,符合国际化默认英文的要求) */}
<div style={{ display: 'grid', gridTemplateColumns: '1.5fr 1fr 1fr 1fr 1fr', padding: '8px 0', fontWeight: 600 }}>
<div></div>
<div></div>
<div></div>
<div></div>
<div></div>
</div>
<div>
{rows.map((r) => (
<div key={r.key} style={{ display: 'grid', gridTemplateColumns: '1.5fr 1fr 1fr 1fr 1fr', padding: '6px 0', borderTop: '1px solid #f0f0f0' }}>
<div><a>{r.number}</a></div>
<div>{r.relationship}</div>
<div style={{ color: '#1677ff' }}>{r.dateText}</div>
<div><Tag color={r.color}>{r.status}</Tag></div>
<div>{r.totalText}</div>
</div>
))}
</div>
</div>
);
};
export default RelatedOrders;

View File

@ -77,9 +77,10 @@ import {
Space, Space,
Tabs, Tabs,
TabsProps, TabsProps,
Tag,
} from 'antd'; } from 'antd';
import Item from 'antd/es/list/Item'; import Item from 'antd/es/list/Item';
import dayjs from 'dayjs'; import RelatedOrders from './RelatedOrders';
import React, { useMemo, useRef, useState } from 'react'; import React, { useMemo, useRef, useState } from 'react';
import { printPDF } from '@/utils/util'; import { printPDF } from '@/utils/util';
@ -172,9 +173,16 @@ const ListPage: React.FC = () => {
hideInTable: true, hideInTable: true,
valueType: 'dateRange', valueType: 'dateRange',
}, },
{ {
title: '订单号', title: '订阅',
dataIndex: 'externalOrderId', dataIndex: 'isSubscription',
hideInSearch: true,
render: (_, record) => {
const related = Array.isArray((record as any)?.related) ? (record as any).related : [];
const isSub = related.some((it) => it?.externalSubscriptionId || it?.billing_period || it?.line_items);
return <Tag color={isSub ? 'green' : 'default'}>{isSub ? '是' : '否'}</Tag>;
},
}, },
{ {
title: '站点', title: '站点',
@ -885,6 +893,7 @@ const Detail: React.FC<{
); );
}} }}
/> />
{/* 原始订单 */}
<ProDescriptions.Item <ProDescriptions.Item
label="原始订单" label="原始订单"
span={3} span={3}
@ -900,22 +909,15 @@ const Detail: React.FC<{
); );
}} }}
/> />
{/* TODO 显示 related order */} {/* 显示 related order */}
<ProDescriptions.Item <ProDescriptions.Item
label="关联订单" label="关联"
span={3} span={3}
render={(_, record) => { render={(_, record) => {
return ( return <RelatedOrders data={record?.related} />;
<ul> }}
{record?.related?.map((item: any) => ( />
<li key={item.id}> {/* 订单内容 */}
{JSON.stringify(item)}
</li>
))}
</ul>
);
}}
/>
<ProDescriptions.Item <ProDescriptions.Item
label="订单内容" label="订单内容"
span={3} span={3}

View File

@ -6,7 +6,6 @@ import { App, Tag, Button, Drawer, List } from 'antd';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { ordercontrollerGetorders } from '@/servers/api/order'; import { ordercontrollerGetorders } from '@/servers/api/order';
import { sitecontrollerAll } from '@/servers/api/site'; import { sitecontrollerAll } from '@/servers/api/site';
import { request } from 'umi';
interface OrderItemRow { interface OrderItemRow {
id: number; id: number;