feat(ops): partner proxy order list and HQ order delete
CI / verify (pull_request) Has been cancelled

Add partner-facing proxy order list/detail; unlock SUPER_ADMIN order delete with cascade cleanup and type filter.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
2026-07-31 10:10:39 +08:00
parent 51f2b5fbfa
commit 8d6c0f9ac0
16 changed files with 523 additions and 8 deletions
+87 -1
View File
@@ -1,4 +1,5 @@
import { useCallback, useEffect, useMemo, useState } from 'react';
import { Link } from 'react-router-dom';
import {
Alert,
Button,
@@ -175,6 +176,7 @@ export default function OrdersPage() {
const [selectedRowKeys, setSelectedRowKeys] = useState<string[]>([]);
const [batchDeleteOpen, setBatchDeleteOpen] = useState(false);
const [batchDeleting, setBatchDeleting] = useState(false);
const [deletingId, setDeletingId] = useState<string | null>(null);
const [shipDefaults, setShipDefaults] = useState<ShipDefaults | null>(null);
const [shipping, setShipping] = useState(false);
const [logisticsShipping, setLogisticsShipping] = useState(false);
@@ -217,6 +219,7 @@ export default function OrdersPage() {
const qs = new URLSearchParams({ page: String(page), pageSize: String(pageSize) });
if (values.orderNo) qs.set('orderNo', values.orderNo);
if (values.status) qs.set('status', values.status);
if (values.orderType) qs.set('orderType', values.orderType);
if (values.cityId) qs.set('cityId', values.cityId);
if (values.receiverPhone) qs.set('receiverPhone', values.receiverPhone);
if (values.fulfillmentHold) qs.set('fulfillmentHold', 'true');
@@ -389,6 +392,43 @@ export default function OrdersPage() {
}
}
function askDeleteOrder(id: string, orderNo?: string) {
Modal.confirm({
title: '确认删除订单?',
content: (
<div>
<p>{orderNo ? ` ${orderNo}` : ''} </p>
<p style={{ color: 'var(--ant-color-error)', marginBottom: 0 }}>线</p>
</div>
),
okText: '确认删除',
okType: 'danger',
cancelText: '取消',
onOk: () => deleteOrder(id),
});
}
async function deleteOrder(id: string) {
setDeletingId(id);
try {
const res = await request<{ deleted: number; message: string }>(`/admin/orders/${id}`, {
method: 'DELETE',
});
message.success(res.message || '订单已删除');
if (detail?.id === id) {
setDrawerOpen(false);
setDetail(null);
}
setSelectedRowKeys((prev) => prev.filter((k) => k !== id));
void load();
} catch (e) {
message.error(e instanceof Error ? e.message : '删除失败');
throw e;
} finally {
setDeletingId(null);
}
}
const columns: ColumnsType<AdminOrderRow> = [
{ title: '订单号', dataIndex: 'orderNo', width: 180 },
{
@@ -455,7 +495,7 @@ export default function OrdersPage() {
},
{
title: '操作',
width: 140,
width: 180,
fixed: 'right',
render: (_, row) => (
<Space size={0}>
@@ -467,6 +507,17 @@ export default function OrdersPage() {
</Button>
)}
{canDeleteOrders && (
<Button
type="link"
size="small"
danger
loading={deletingId === row.id}
onClick={() => askDeleteOrder(row.id, row.orderNo)}
>
</Button>
)}
</Space>
),
},
@@ -493,6 +544,21 @@ export default function OrdersPage() {
) : null}
</Space>
</Space>
{!canDeleteOrders && profile ? (
<Alert
type="info"
showIcon
style={{ marginBottom: 16 }}
message="当前账号无「删除订单」权限"
description={
<span>
<Link to="/hq-permissions"></Link>
</span>
}
/>
) : null}
<Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={() => { setPage(1); void load(); }}>
<Form.Item name="orderNo" label="订单号">
<Input placeholder="DK..." allowClear />
@@ -500,6 +566,17 @@ export default function OrdersPage() {
<Form.Item name="status" label="状态">
<Select allowClear style={{ width: 120 }} options={Object.entries(ORDER_STATUS_LABELS).map(([value, label]) => ({ value, label }))} />
</Form.Item>
<Form.Item name="orderType" label="类型">
<Select
allowClear
style={{ width: 120 }}
placeholder="全部"
options={[
{ value: 'NORMAL', label: '普通订单' },
{ value: 'PROXY', label: '代下单' },
]}
/>
</Form.Item>
<Form.Item name="cityId" label="城市">
<Select
allowClear
@@ -563,6 +640,15 @@ export default function OrdersPage() {
</Button>
)}
{canDeleteOrders && (
<Button
danger
loading={deletingId === detail.id}
onClick={() => askDeleteOrder(detail.id, detail.orderNo)}
>
</Button>
)}
<Typography.Text type="secondary"></Typography.Text>
<Select
value={detail.status}
+4
View File
@@ -16,6 +16,8 @@ import SettlementPage from './pages/SettlementPage';
import WeeklyReportPage from './pages/WeeklyReportPage';
import ProxyOrderPage from './pages/ProxyOrderPage';
import ProxyOrderProductsPage from './pages/ProxyOrderProductsPage';
import ProxyOrderListPage from './pages/ProxyOrderListPage';
import ProxyOrderDetailPage from './pages/ProxyOrderDetailPage';
import StaffListPage from './pages/StaffListPage';
import StaffCreatePage from './pages/StaffCreatePage';
import LeaderboardPage from './pages/LeaderboardPage';
@@ -33,6 +35,8 @@ function PrimaryRoutes() {
<Route path="/center/settlement" element={<SettlementPage />} />
<Route path="/center/staff" element={<StaffListPage />} />
<Route path="/center/staff/new" element={<StaffCreatePage />} />
<Route path="/center/proxy-orders" element={<ProxyOrderListPage />} />
<Route path="/center/proxy-orders/:id" element={<ProxyOrderDetailPage />} />
<Route path="/proxy-order" element={<ProxyOrderPage />} />
<Route path="/proxy-order/products" element={<ProxyOrderProductsPage />} />
<Route path="/reports/weekly" element={<WeeklyReportPage />} />
+9
View File
@@ -219,6 +219,15 @@ export default function CenterPage({ variant = 'primary', roleLabel }: CenterPag
<span className="material-symbols-outlined text-muted">chevron_right</span>
</div>
</Link>
<Link to="/center/proxy-orders" className="partner-menu-item">
<div className="partner-menu-item-left">
<div className="partner-menu-icon">
<span className="material-symbols-outlined">receipt_long</span>
</div>
<span className="body-md" style={{ fontSize: 16 }}></span>
</div>
<span className="material-symbols-outlined text-muted">chevron_right</span>
</Link>
<Link to="/stores?audit=pending" className="partner-menu-item">
<div className="partner-menu-item-left">
<div className="partner-menu-icon">
@@ -0,0 +1,117 @@
import { useEffect, useState } from 'react';
import { useNavigate, useParams } from 'react-router-dom';
import PageHeader from '@dukang/shared-ui/PageHeader';
import type { PartnerProxyOrderListItem } from '@dukang/shared-types';
import { request } from '../lib/api';
function fmtMoney(n: number) {
return n.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
}
function fmtTime(value: string | undefined) {
if (!value) return '—';
const d = new Date(value);
if (Number.isNaN(d.getTime())) return value;
const pad = (n: number) => String(n).padStart(2, '0');
return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`;
}
function deliveryLabel(order: PartnerProxyOrderListItem) {
const t = String(order.deliveryType || '').toUpperCase();
if (t === 'ON_SITE_PICKUP') return '现场提货';
if (t === 'CROSS_CITY') return '跨城配送';
if (t === 'LOCAL') return '同城配送';
return '线下代下单';
}
export default function ProxyOrderDetailPage() {
const { id } = useParams();
const navigate = useNavigate();
const [order, setOrder] = useState<PartnerProxyOrderListItem | null>(null);
const [error, setError] = useState('');
useEffect(() => {
document.title = '代下单详情';
}, []);
useEffect(() => {
if (!id) return;
void request<PartnerProxyOrderListItem>('PARTNER_H5', `/partner/proxy-orders/${id}`)
.then(setOrder)
.catch((e) => setError(e instanceof Error ? e.message : '加载失败'));
}, [id]);
const img = order?.imageResource?.url || '';
return (
<div className="page-no-tab partner-orders-page">
<PageHeader title="代下单详情" onBack={() => navigate('/center/proxy-orders')} />
{error && (
<p className="partner-form-error" role="alert" style={{ margin: '16px 20px' }}>
{error}
</p>
)}
{!order && !error && <p className="label-md text-muted" style={{ margin: 20 }}></p>}
{order && (
<div style={{ padding: '0 16px 32px' }}>
<div className="partner-order-card" style={{ pointerEvents: 'none' }}>
<div className="partner-order-card-top">
<span className="label-md text-muted">NO. {order.orderNo}</span>
<span className="label-md" style={{ color: 'var(--color-success-green)', fontWeight: 600 }}>
</span>
</div>
<div className="partner-order-product">
<div
className="partner-order-product-img"
style={{
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
overflow: 'hidden',
background: img ? `center/cover no-repeat url(${img})` : undefined,
}}
>
{!img && <span className="material-symbols-outlined text-muted">liquor</span>}
</div>
<div style={{ flex: 1, minWidth: 0 }}>
<h3 className="headline-md">{order.productName || '杜康好酒'}</h3>
{order.productSpec && (
<p className="label-md text-muted" style={{ marginTop: 4 }}>
{order.productSpec}
</p>
)}
<p className="body-md" style={{ marginTop: 8 }}>
×{order.quantity} · ¥{fmtMoney(Number(order.payAmount || 0))}
</p>
<p className="label-md text-muted" style={{ marginTop: 4 }}>
¥{fmtMoney(Number(order.benefitAmount || 0))}
</p>
</div>
</div>
</div>
<section className="partner-form-card" style={{ marginTop: 12 }}>
<h3 className="headline-md" style={{ marginBottom: 12 }}></h3>
<p className="body-md">{order.receiverName || '—'}</p>
<p className="body-md" style={{ marginTop: 8 }}>{order.receiverPhone || '—'}</p>
<p className="body-md" style={{ marginTop: 8 }}>
{order.receiverAddress || (String(order.deliveryType).toUpperCase() === 'ON_SITE_PICKUP' ? '现场提货' : '—')}
</p>
</section>
<section className="partner-form-card" style={{ marginTop: 12 }}>
<h3 className="headline-md" style={{ marginBottom: 12 }}></h3>
<p className="body-md">{deliveryLabel(order)}</p>
<p className="body-md" style={{ marginTop: 8 }}>{fmtTime(order.createdAt)}</p>
<p className="body-md" style={{ marginTop: 8 }}>线</p>
<p className="body-md" style={{ marginTop: 8 }}></p>
</section>
</div>
)}
</div>
);
}
@@ -0,0 +1,142 @@
import { useCallback, useEffect, useState, type FormEvent } from 'react';
import { Link, useNavigate } from 'react-router-dom';
import PageHeader from '@dukang/shared-ui/PageHeader';
import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
import type { PartnerProxyOrderListItem, PartnerProxyOrderListResponse } from '@dukang/shared-types';
import { isLoggedIn, request } from '../lib/api';
function fmtMoney(n: number) {
return n.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
}
function fmtTime(value: string | undefined) {
if (!value) return '—';
const d = new Date(value);
if (Number.isNaN(d.getTime())) return value;
const pad = (n: number) => String(n).padStart(2, '0');
return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`;
}
function deliveryLabel(item: PartnerProxyOrderListItem) {
const t = String(item.deliveryType || '').toUpperCase();
if (t === 'ON_SITE_PICKUP') return '现场提货';
if (t === 'CROSS_CITY') return '跨城配送';
if (t === 'LOCAL') return '同城配送';
return '线下代下单';
}
function coverUrl(item: PartnerProxyOrderListItem) {
return item.imageResource?.url || '';
}
export default function ProxyOrderListPage() {
const navigate = useNavigate();
const [list, setList] = useState<PartnerProxyOrderListItem[]>([]);
const [total, setTotal] = useState(0);
const [keyword, setKeyword] = useState('');
const [q, setQ] = useState('');
const [loading, setLoading] = useState(true);
const loadList = useCallback(() => {
if (!isLoggedIn()) {
navigate('/login');
return Promise.resolve();
}
setLoading(true);
const params = new URLSearchParams({ page: '1', pageSize: '50' });
if (q.trim()) params.set('keyword', q.trim());
return request<PartnerProxyOrderListResponse>('PARTNER_H5', `/partner/proxy-orders?${params}`)
.then((res) => {
setList(Array.isArray(res.list) ? res.list : []);
setTotal(Number(res.total) || 0);
})
.catch(() => {
setList([]);
setTotal(0);
})
.finally(() => setLoading(false));
}, [navigate, q]);
useEffect(() => {
document.title = '代下单列表';
}, []);
useEffect(() => {
void loadList();
}, [loadList]);
function submitSearch(e: FormEvent) {
e.preventDefault();
setQ(keyword.trim());
}
return (
<PullToRefresh onRefresh={loadList} className="page-no-tab partner-orders-page">
<PageHeader title="代下单列表" onBack={() => navigate('/center')} />
<div style={{ padding: '0 20px 12px' }}>
<form className="partner-search" onSubmit={submitSearch}>
<span className="material-symbols-outlined">search</span>
<input
placeholder="订单号 / 手机号 / 姓名 / 商品"
value={keyword}
onChange={(e) => setKeyword(e.target.value)}
/>
</form>
<p className="label-md text-muted" style={{ marginTop: 8 }}>
{loading ? '加载中…' : `${total} 笔代下单`}
</p>
</div>
<div style={{ padding: '0 16px 24px' }}>
{!loading && list.length === 0 && <div className="empty"></div>}
{list.map((o) => {
const orderId = String(o.id);
const img = coverUrl(o);
return (
<Link key={orderId} to={`/center/proxy-orders/${orderId}`} className="partner-order-card" style={{ marginBottom: 12 }}>
<div className="partner-order-card-top">
<span className="label-md text-muted">NO. {o.orderNo}</span>
<span className="label-md" style={{ color: 'var(--color-success-green)', fontWeight: 600 }}>
</span>
</div>
<div className="partner-order-product">
<div
className="partner-order-product-img"
style={{
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
overflow: 'hidden',
background: img ? `center/cover no-repeat url(${img})` : undefined,
}}
>
{!img && <span className="material-symbols-outlined text-muted">liquor</span>}
</div>
<div style={{ flex: 1, minWidth: 0 }}>
<h3 className="headline-md line-2-clamp">{o.productName || '杜康好酒'}</h3>
<p className="text-variant body-md" style={{ marginTop: 4 }}>
×{o.quantity} · ¥{fmtMoney(Number(o.payAmount || 0))}
</p>
<p className="label-md text-muted" style={{ marginTop: 4 }}>
{deliveryLabel(o)} · {fmtTime(o.createdAt)}
</p>
</div>
</div>
<div className="partner-order-address">
<span className="material-symbols-outlined" style={{ fontSize: 18 }}>person</span>
<p className="line-2-clamp">
{o.receiverName || '客户'}
{o.receiverPhone ? ` · ${o.receiverPhone}` : ''}
{o.receiverAddress ? ` · ${o.receiverAddress}` : ''}
</p>
</div>
</Link>
);
})}
</div>
</PullToRefresh>
);
}
+1 -1
View File
@@ -188,7 +188,7 @@ export default function ProxyOrderPage() {
});
toastSuccess(`代下单成功:${order.orderNo}`);
clearProxyOrderDraft();
navigate(`/orders/${order.id}`);
navigate(`/center/proxy-orders/${order.id}`);
} catch (e) {
setMsg(e instanceof Error ? e.message : '下单失败');
} finally {