style: 统一中文标点符号为英文格式并清理合并冲突标记
This commit is contained in:
tikkhun
parent
9c5caa1aea
commit
73ed015680
|
|
@ -7,8 +7,6 @@ import dayjs from 'dayjs';
|
|||
import { ordercontrollerGetordersales } from '@/servers/api/order';
|
||||
import { sitecontrollerAll } from '@/servers/api/site';
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
// 列表行数据结构(订单商品聚合)
|
||||
interface OrderItemAggRow {
|
||||
externalProductId: number; // 商品ID(来自 WooCommerce 产品ID)
|
||||
|
|
@ -20,46 +18,13 @@ interface OrderItemAggRow {
|
|||
secondOrderCount: number; // 客户第二次购买次数(该商品)
|
||||
thirdOrderCount: number; // 客户第三次购买次数(该商品)
|
||||
moreThirdOrderCount: number; // 客户超过三次购买次数(该商品)
|
||||
=======
|
||||
// 列表行数据结构（订单商品聚合）
|
||||
=======
|
||||
// 列表行数据结构(订单商品聚合)
|
||||
>>>>>>> 3ac2724 (style: 统一中文标点符号为英文格式)
|
||||
interface OrderItemAggRow {
|
||||
externalProductId: number; // 商品ID(来自 WooCommerce 产品ID)
|
||||
externalVariationId: number; // 变体ID(来自 WooCommerce 变体ID)
|
||||
name: string; // 商品名称
|
||||
<<<<<<< HEAD
|
||||
totalQuantity: number; // 总售出数量（时间范围内）
|
||||
totalOrders: number; // 涉及订单数（去重）
|
||||
firstOrderCount: number; // 客户首单次数（该商品）
|
||||
secondOrderCount: number; // 客户第二次购买次数（该商品）
|
||||
thirdOrderCount: number; // 客户第三次购买次数（该商品）
|
||||
moreThirdOrderCount: number; // 客户超过三次购买次数（该商品）
|
||||
>>>>>>> 90ea0f5 (feat(订单): 添加关联订单显示功能并创建订单商品和订阅订单页面)
|
||||
=======
|
||||
totalQuantity: number; // 总售出数量(时间范围内)
|
||||
totalOrders: number; // 涉及订单数(去重)
|
||||
firstOrderCount: number; // 客户首单次数(该商品)
|
||||
secondOrderCount: number; // 客户第二次购买次数(该商品)
|
||||
thirdOrderCount: number; // 客户第三次购买次数(该商品)
|
||||
moreThirdOrderCount: number; // 客户超过三次购买次数(该商品)
|
||||
>>>>>>> 3ac2724 (style: 统一中文标点符号为英文格式)
|
||||
}
|
||||
|
||||
const OrderItemsPage: React.FC = () => {
|
||||
const actionRef = useRef<ActionType>();
|
||||
const { message } = App.useApp();
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
// 列配置(中文标题，符合当前项目风格；显示英文默认语言可后续走国际化)
|
||||
=======
|
||||
// 列配置（中文标题，符合当前项目风格；显示英文默认语言可后续走国际化）
|
||||
>>>>>>> 90ea0f5 (feat(订单): 添加关联订单显示功能并创建订单商品和订阅订单页面)
|
||||
=======
|
||||
// 列配置(中文标题，符合当前项目风格；显示英文默认语言可后续走国际化)
|
||||
>>>>>>> 3ac2724 (style: 统一中文标点符号为英文格式)
|
||||
const columns: ProColumns<OrderItemAggRow>[] = [
|
||||
{
|
||||
title: '商品名称',
|
||||
|
|
@ -120,15 +85,7 @@ const OrderItemsPage: React.FC = () => {
|
|||
dataIndex: 'siteId',
|
||||
valueType: 'select',
|
||||
request: async () => {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
// 拉取站点列表(后台 /site/all)
|
||||
=======
|
||||
// 拉取站点列表（后台 /site/all）
|
||||
>>>>>>> 90ea0f5 (feat(订单): 添加关联订单显示功能并创建订单商品和订阅订单页面)
|
||||
=======
|
||||
// 拉取站点列表(后台 /site/all)
|
||||
>>>>>>> 3ac2724 (style: 统一中文标点符号为英文格式)
|
||||
const { data = [] } = await sitecontrollerAll();
|
||||
return (data || []).map((item: any) => ({ label: item.siteName, value: item.id }));
|
||||
},
|
||||
|
|
@ -146,28 +103,12 @@ const OrderItemsPage: React.FC = () => {
|
|||
},
|
||||
];
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
// 表格请求方法:调用 /order/getOrderSales 接口并设置 isSource=true 获取订单项聚合
|
||||
=======
|
||||
// 表格请求方法：调用 /order/getOrderSales 接口并设置 isSource=true 获取订单项聚合
|
||||
>>>>>>> 90ea0f5 (feat(订单): 添加关联订单显示功能并创建订单商品和订阅订单页面)
|
||||
=======
|
||||
// 表格请求方法:调用 /order/getOrderSales 接口并设置 isSource=true 获取订单项聚合
|
||||
>>>>>>> 3ac2724 (style: 统一中文标点符号为英文格式)
|
||||
const request: ProTableProps<OrderItemAggRow>['request'] = async (params:any) => {
|
||||
try {
|
||||
const { current = 1, pageSize = 10, siteId, name } = params as any;
|
||||
const [startDate, endDate] = (params as any).dateRange || [];
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
// 调用后端接口(isSource=true 表示按订单项聚合)
|
||||
=======
|
||||
// 调用后端接口（isSource=true 表示按订单项聚合）
|
||||
>>>>>>> 90ea0f5 (feat(订单): 添加关联订单显示功能并创建订单商品和订阅订单页面)
|
||||
=======
|
||||
// 调用后端接口(isSource=true 表示按订单项聚合)
|
||||
>>>>>>> 3ac2724 (style: 统一中文标点符号为英文格式)
|
||||
const resp = await ordercontrollerGetordersales({
|
||||
current,
|
||||
pageSize,
|
||||
|
|
|
|||
|
|
@ -80,19 +80,7 @@ import {
|
|||
Tag,
|
||||
} from 'antd';
|
||||
import Item from 'antd/es/list/Item';
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
import RelatedOrders from '../../Subscription/Orders/RelatedOrders';
|
||||
=======
|
||||
import RelatedOrders from './RelatedOrders';
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 43be89b (feat(订单列表): 添加关联订单组件并优化订阅显示)
|
||||
=======
|
||||
import OrderDetailDrawer from './OrderDetailDrawer';
|
||||
>>>>>>> 1f4128f (refactor(订单): 抽离订单详情抽屉为独立组件并复用)
|
||||
=======
|
||||
import RelatedOrders from '../../Subscription/Orders/RelatedOrders';
|
||||
>>>>>>> d98e843 (refactor(订单): 重构订单详情抽屉组件并移动相关文件)
|
||||
import React, { useMemo, useRef, useState } from 'react';
|
||||
import { printPDF } from '@/utils/util';
|
||||
|
||||
|
|
@ -914,40 +902,13 @@ const Detail: React.FC<{
|
|||
<ul>
|
||||
{record?.items?.map((item: any) => (
|
||||
<li key={item.id}>
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
{item.name}:{item.quantity}
|
||||
=======
|
||||
{item.name}：{item.quantity}
|
||||
=======
|
||||
{item.name}:{item.quantity}
|
||||
>>>>>>> 3ac2724 (style: 统一中文标点符号为英文格式)
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
);
|
||||
}}
|
||||
/>
|
||||
<<<<<<< HEAD
|
||||
{/* TODO 显示 related order */}
|
||||
<ProDescriptions.Item
|
||||
label="关联订单"
|
||||
span={3}
|
||||
render={(_, record) => {
|
||||
return (
|
||||
<ul>
|
||||
{record?.related?.map((item: any) => (
|
||||
<li key={item.id}>
|
||||
{JSON.stringify(item)}
|
||||
>>>>>>> 90ea0f5 (feat(订单): 添加关联订单显示功能并创建订单商品和订阅订单页面)
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
);
|
||||
}}
|
||||
/>
|
||||
=======
|
||||
>>>>>>> 43be89b (feat(订单列表): 添加关联订单组件并优化订阅显示)
|
||||
{/* 显示 related order */}
|
||||
<ProDescriptions.Item
|
||||
label="关联"
|
||||
|
|
|
|||
|
|
@ -35,14 +35,6 @@ const ListPage: React.FC = () => {
|
|||
// 表格操作引用:用于在同步后触发表格刷新
|
||||
const actionRef = useRef<ActionType>();
|
||||
const { message } = App.useApp();
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
// 关联订单抽屉状态
|
||||
const [drawerOpen, setDrawerOpen] = useState(false);
|
||||
const [drawerTitle, setDrawerTitle] = useState('详情');
|
||||
const [relatedOrders, setRelatedOrders] = useState<any[]>([]);
|
||||
>>>>>>> 90ea0f5 (feat(订单): 添加关联订单显示功能并创建订单商品和订阅订单页面)
|
||||
|
||||
// 关联订单抽屉状态
|
||||
const [drawerOpen, setDrawerOpen] = useState(false);
|
||||
|
|
@ -152,30 +144,14 @@ const ListPage: React.FC = () => {
|
|||
message.warning('该订阅缺少父订单号');
|
||||
return;
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
// 通过父订单号查询关联订单(模糊匹配)
|
||||
=======
|
||||
// 通过父订单号查询关联订单（模糊匹配）
|
||||
>>>>>>> 90ea0f5 (feat(订单): 添加关联订单显示功能并创建订单商品和订阅订单页面)
|
||||
=======
|
||||
// 通过父订单号查询关联订单(模糊匹配)
|
||||
>>>>>>> 3ac2724 (style: 统一中文标点符号为英文格式)
|
||||
const resp = await request('/order/getOrderByNumber', {
|
||||
method: 'POST',
|
||||
data: { number: parentNumber },
|
||||
});
|
||||
const { success, data, message: errMsg } = resp as any;
|
||||
if (!success) throw new Error(errMsg || '获取失败');
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
// 仅保留与父订单号完全一致的订单(避免模糊匹配误入)
|
||||
=======
|
||||
// 仅保留与父订单号完全一致的订单（避免模糊匹配误入）
|
||||
>>>>>>> 90ea0f5 (feat(订单): 添加关联订单显示功能并创建订单商品和订阅订单页面)
|
||||
=======
|
||||
// 仅保留与父订单号完全一致的订单(避免模糊匹配误入)
|
||||
>>>>>>> 3ac2724 (style: 统一中文标点符号为英文格式)
|
||||
const candidates: any[] = (Array.isArray(data) ? data : []).filter(
|
||||
(c: any) => String(c?.externalOrderId) === parentNumber
|
||||
);
|
||||
|
|
@ -240,15 +216,7 @@ const ListPage: React.FC = () => {
|
|||
// 工具栏:订阅同步入口
|
||||
toolBarRender={() => [<SyncForm key="sync" tableRef={actionRef} />]}
|
||||
/>
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
{/* 关联订单抽屉:展示订单号、关系、时间、状态与金额 */}
|
||||
=======
|
||||
{/* 关联订单抽屉：展示订单号、关系、时间、状态与金额 */}
|
||||
>>>>>>> 90ea0f5 (feat(订单): 添加关联订单显示功能并创建订单商品和订阅订单页面)
|
||||
=======
|
||||
{/* 关联订单抽屉:展示订单号、关系、时间、状态与金额 */}
|
||||
>>>>>>> 3ac2724 (style: 统一中文标点符号为英文格式)
|
||||
<Drawer
|
||||
open={drawerOpen}
|
||||
title={drawerTitle}
|
||||
|
|
@ -262,15 +230,7 @@ const ListPage: React.FC = () => {
|
|||
<List.Item>
|
||||
<List.Item.Meta
|
||||
title={`#${item?.externalOrderId || '-'}`}
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
description={`关系:${item?.relationship || '-'}，站点:${item?.siteName || '-'}`}
|
||||
=======
|
||||
description={`关系：${item?.relationship || '-'}，站点：${item?.siteName || '-'}`}
|
||||
>>>>>>> 90ea0f5 (feat(订单): 添加关联订单显示功能并创建订单商品和订阅订单页面)
|
||||
=======
|
||||
description={`关系:${item?.relationship || '-'}，站点:${item?.siteName || '-'}`}
|
||||
>>>>>>> 3ac2724 (style: 统一中文标点符号为英文格式)
|
||||
/>
|
||||
<div style={{ display: 'flex', gap: 12, alignItems: 'center' }}>
|
||||
<span>{item?.date_created ? dayjs(item.date_created).format('YYYY-MM-DD HH:mm') : '-'}</span>
|
||||
|
|
|
|||
Loading…
Reference in New Issue