feat(trade): 仓配可调配履约与三分支推单

同城有仓按仓库绑定承运商自动推单或自管填单，无仓/跨城走总部快递；新增仓配注册表、FulfillmentService 及三端运单追踪。

Co-authored-by: Cursor <cursoragent@cursor.com>

apps/admin-web/src/App.tsx

@@ -18,6 +18,7 @@ import HqAccountsPage from './pages/HqAccountsPage';
 import CitiesPage from './pages/CitiesPage';
 import CityPartnersPage from './pages/CityPartnersPage';
 import CityWarehousesPage from './pages/CityWarehousesPage';
+import FulfillmentProvidersPage from './pages/FulfillmentProvidersPage';
 import StoreMediaPage from './pages/StoreMediaPage';
 import PromoCodesPage from './pages/PromoCodesPage';
 import PromoCodeDetailLayout from './pages/promo/PromoCodeDetailLayout';
@@ -74,6 +75,7 @@ export default function App() {
         <Route path="/cities" element={<CitiesPage />} />
         <Route path="/city-partners" element={<CityPartnersPage />} />
         <Route path="/city-warehouses" element={<CityWarehousesPage />} />
+        <Route path="/fulfillment-providers" element={<FulfillmentProvidersPage />} />
         <Route path="/partner-accounts" element={<Navigate to="/city-partners" replace />} />
         <Route path="/benefit/coupons" element={<BenefitCouponsPage />} />
         <Route path="/benefit/ledgers" element={<BenefitLedgersPage />} />

apps/admin-web/src/layouts/AdminLayout.tsx

@@ -56,6 +56,7 @@ const MENU_ITEMS: MenuProps['items'] = [
       { key: '/cities', label: '城市' },
       { key: '/city-partners', label: '城市合伙人' },
       { key: '/city-warehouses', label: '仓库' },
+      { key: '/fulfillment-providers', label: '仓配管理' },
     ],
   },
   {

apps/admin-web/src/pages/CityWarehousesPage.tsx

@@ -6,6 +6,7 @@ import {
   Descriptions,
   Form,
   Input,
+  InputNumber,
   Modal,
   Popconfirm,
   Select,
@@ -17,10 +18,13 @@ import {
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import {
+  WAREHOUSE_FULFILLMENT_MODE_LABELS,
   WAREHOUSE_MANAGER_LABELS,
   WAREHOUSE_STATUS_LABELS,
+  WarehouseFulfillmentMode,
   WarehouseManagerType,
   WarehouseStatus,
+  type FulfillmentProviderDto,
 } from '@dukang/shared-types';
 import { request, type Paginated } from '../lib/api';
 import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
@@ -39,6 +43,13 @@ type Row = {
   partnerAccountId: string | null;
   partnerCompanyName?: string | null;
   status: string;
+  fulfillmentMode?: string;
+  fulfillmentProviderId?: string | null;
+  fulfillmentProviderName?: string | null;
+  manualCarrierLabel?: string | null;
+  manualQueryUrlTemplate?: string | null;
+  lng?: number | null;
+  lat?: number | null;
   createdAt: string;
 };
 
@@ -48,6 +59,54 @@ type PartnerOption = { id: string; companyName: string };
 const MANAGER_OPTIONS = Object.entries(WAREHOUSE_MANAGER_LABELS).map(([value, label]) => ({ value, label }));
 const STATUS_OPTIONS = Object.entries(WAREHOUSE_STATUS_LABELS).map(([value, label]) => ({ value, label }));
 
+const FULFILLMENT_MODE_OPTIONS = Object.entries(WAREHOUSE_FULFILLMENT_MODE_LABELS).map(([value, label]) => ({
+  value,
+  label,
+}));
+
+function FulfillmentFields({
+  mode,
+  providerOptions,
+}: {
+  mode: WarehouseFulfillmentMode;
+  providerOptions: FulfillmentProviderDto[];
+}) {
+  return (
+    <>
+      {mode === WarehouseFulfillmentMode.API_AUTO && (
+        <Form.Item name="fulfillmentProviderId" label="仓配承运商" rules={[{ required: true }]}>
+          <Select
+            placeholder={providerOptions.length ? '选择已注册承运商' : '请先在仓配管理注册'}
+            options={providerOptions.map((p) => ({ value: p.id, label: `${p.name} (${p.code})` }))}
+          />
+        </Form.Item>
+      )}
+      {mode === WarehouseFulfillmentMode.MANUAL && (
+        <>
+          <Form.Item name="manualCarrierLabel" label="默认承运商名称">
+            <Input placeholder="如 顺丰速运" />
+          </Form.Item>
+          <Form.Item
+            name="manualQueryUrlTemplate"
+            label="物流查询链接模板"
+            extra="可用 {trackingNo} 占位符"
+          >
+            <Input placeholder="https://example.com/track?no={trackingNo}" />
+          </Form.Item>
+        </>
+      )}
+      <Space>
+        <Form.Item name="lng" label="经度">
+          <InputNumber step={0.001} placeholder="API推单寄件坐标" />
+        </Form.Item>
+        <Form.Item name="lat" label="纬度">
+          <InputNumber step={0.001} />
+        </Form.Item>
+      </Space>
+    </>
+  );
+}
+
 export default function CityWarehousesPage() {
   const [filterForm] = Form.useForm();
   const [createForm] = Form.useForm();
@@ -73,6 +132,13 @@ export default function CityWarehousesPage() {
   const [createManagerType, setCreateManagerType] = useState<WarehouseManagerType>(WarehouseManagerType.HQ);
   const [editManagerType, setEditManagerType] = useState<WarehouseManagerType>(WarehouseManagerType.HQ);
   const [createCityId, setCreateCityId] = useState<string | undefined>();
+  const [createFulfillmentMode, setCreateFulfillmentMode] = useState<WarehouseFulfillmentMode>(
+    WarehouseFulfillmentMode.MANUAL,
+  );
+  const [editFulfillmentMode, setEditFulfillmentMode] = useState<WarehouseFulfillmentMode>(
+    WarehouseFulfillmentMode.MANUAL,
+  );
+  const [providerOptions, setProviderOptions] = useState<FulfillmentProviderDto[]>([]);
 
   const loadCities = useCallback(async () => {
     const res = await request<Paginated<CityOption>>(`/admin/cities?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`);
@@ -88,6 +154,9 @@ export default function CityWarehousesPage() {
 
   useEffect(() => {
     void loadCities();
+    void request<FulfillmentProviderDto[]>('/admin/fulfillment-providers/active-api')
+      .then(setProviderOptions)
+      .catch(() => {});
   }, [loadCities]);
 
   async function openEdit(row: Row) {
@@ -102,7 +171,14 @@ export default function CityWarehousesPage() {
       managerType: row.managerType,
       partnerAccountId: row.partnerAccountId,
       status: row.status,
+      fulfillmentMode: row.fulfillmentMode ?? WarehouseFulfillmentMode.MANUAL,
+      fulfillmentProviderId: row.fulfillmentProviderId ?? undefined,
+      manualCarrierLabel: row.manualCarrierLabel ?? undefined,
+      manualQueryUrlTemplate: row.manualQueryUrlTemplate ?? undefined,
+      lng: row.lng ?? undefined,
+      lat: row.lat ?? undefined,
     });
+    setEditFulfillmentMode((row.fulfillmentMode as WarehouseFulfillmentMode) ?? WarehouseFulfillmentMode.MANUAL);
     setEditOpen(true);
   }
 
@@ -149,6 +225,14 @@ export default function CityWarehousesPage() {
           '—'
         ),
     },
+    {
+      title: '履约',
+      width: 120,
+      render: (_, row) =>
+        row.fulfillmentMode === 'API_AUTO'
+          ? row.fulfillmentProviderName || 'API'
+          : WAREHOUSE_FULFILLMENT_MODE_LABELS[WarehouseFulfillmentMode.MANUAL],
+    },
     {
       title: '状态',
       dataIndex: 'status',
@@ -341,6 +425,13 @@ export default function CityWarehousesPage() {
           <Form.Item name="status" label="状态" initialValue={WarehouseStatus.ACTIVE}>
             <Select options={STATUS_OPTIONS} />
           </Form.Item>
+          <Form.Item name="fulfillmentMode" label="履约方式" initialValue={WarehouseFulfillmentMode.MANUAL}>
+            <Select
+              options={FULFILLMENT_MODE_OPTIONS}
+              onChange={(v) => setCreateFulfillmentMode(v)}
+            />
+          </Form.Item>
+          <FulfillmentFields mode={createFulfillmentMode} providerOptions={providerOptions} />
         </Form>
       </Modal>
 
@@ -399,6 +490,13 @@ export default function CityWarehousesPage() {
           <Form.Item name="status" label="状态">
             <Select options={STATUS_OPTIONS} />
           </Form.Item>
+          <Form.Item name="fulfillmentMode" label="履约方式">
+            <Select
+              options={FULFILLMENT_MODE_OPTIONS}
+              onChange={(v) => setEditFulfillmentMode(v)}
+            />
+          </Form.Item>
+          <FulfillmentFields mode={editFulfillmentMode} providerOptions={providerOptions} />
         </Form>
       </Modal>
     </div>

apps/admin-web/src/pages/FulfillmentProvidersPage.tsx

@@ -0,0 +1,196 @@
+import { useCallback, useEffect, useState } from 'react';
+import {
+  Button,
+  Form,
+  Input,
+  Modal,
+  Select,
+  Space,
+  Table,
+  Tag,
+  Typography,
+  message,
+} from 'antd';
+import type { ColumnsType } from 'antd/es/table';
+import {
+  FULFILLMENT_PROVIDER_STATUS_LABELS,
+  FULFILLMENT_PROVIDER_TYPE_LABELS,
+  FulfillmentProviderStatus,
+  FulfillmentProviderType,
+  type FulfillmentProviderDto,
+} from '@dukang/shared-types';
+import { request } from '../lib/api';
+import { fmtTime } from '../lib/constants';
+
+const TYPE_OPTIONS = Object.entries(FULFILLMENT_PROVIDER_TYPE_LABELS).map(([value, label]) => ({
+  value,
+  label,
+}));
+const STATUS_OPTIONS = Object.entries(FULFILLMENT_PROVIDER_STATUS_LABELS).map(([value, label]) => ({
+  value,
+  label,
+}));
+
+export default function FulfillmentProvidersPage() {
+  const [rows, setRows] = useState<FulfillmentProviderDto[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [open, setOpen] = useState(false);
+  const [editRow, setEditRow] = useState<FulfillmentProviderDto | null>(null);
+  const [form] = Form.useForm();
+
+  const load = useCallback(async () => {
+    setLoading(true);
+    try {
+      const res = await request<FulfillmentProviderDto[]>('/admin/fulfillment-providers');
+      setRows(res);
+    } finally {
+      setLoading(false);
+    }
+  }, []);
+
+  useEffect(() => {
+    void load();
+  }, [load]);
+
+  function openCreate() {
+    setEditRow(null);
+    form.resetFields();
+    form.setFieldsValue({
+      type: FulfillmentProviderType.API,
+      status: FulfillmentProviderStatus.ACTIVE,
+      capabilitiesJson: JSON.stringify(
+        { createShipment: true, getTrack: true, callback: true },
+        null,
+        2,
+      ),
+    });
+    setOpen(true);
+  }
+
+  function openEdit(row: FulfillmentProviderDto) {
+    setEditRow(row);
+    form.setFieldsValue({
+      code: row.code,
+      name: row.name,
+      type: row.type,
+      status: row.status,
+      capabilitiesJson: row.capabilities ? JSON.stringify(row.capabilities, null, 2) : '',
+      configJson: '',
+    });
+    setOpen(true);
+  }
+
+  async function submit() {
+    const v = await form.validateFields();
+    if (editRow) {
+      await request(`/admin/fulfillment-providers/${editRow.id}`, {
+        method: 'PUT',
+        body: JSON.stringify({
+          name: v.name,
+          type: v.type,
+          status: v.status,
+          configJson: v.configJson || undefined,
+          capabilitiesJson: v.capabilitiesJson || undefined,
+        }),
+      });
+      message.success('已更新');
+    } else {
+      await request('/admin/fulfillment-providers', {
+        method: 'POST',
+        body: JSON.stringify(v),
+      });
+      message.success('已创建');
+    }
+    setOpen(false);
+    void load();
+  }
+
+  const columns: ColumnsType<FulfillmentProviderDto> = [
+    { title: '编码', dataIndex: 'code', width: 100 },
+    { title: '名称', dataIndex: 'name' },
+    {
+      title: '类型',
+      dataIndex: 'type',
+      render: (v) => FULFILLMENT_PROVIDER_TYPE_LABELS[v as FulfillmentProviderType] || v,
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      render: (v) => (
+        <Tag color={v === 'ACTIVE' ? 'green' : 'default'}>
+          {FULFILLMENT_PROVIDER_STATUS_LABELS[v as FulfillmentProviderStatus] || v}
+        </Tag>
+      ),
+    },
+    {
+      title: '能力',
+      render: (_, row) => {
+        const caps = row.capabilities;
+        if (!caps) return '—';
+        return Object.entries(caps)
+          .filter(([, on]) => on)
+          .map(([k]) => k)
+          .join('、') || '—';
+      },
+    },
+    { title: '更新时间', dataIndex: 'updatedAt', width: 170, render: fmtTime },
+    {
+      title: '操作',
+      width: 80,
+      render: (_, row) => (
+        <Button type="link" size="small" onClick={() => openEdit(row)}>
+          编辑
+        </Button>
+      ),
+    },
+  ];
+
+  return (
+    <div>
+      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+        <div>
+          <Typography.Title level={4} style={{ margin: 0 }}>
+            仓配管理
+          </Typography.Title>
+          <Typography.Text type="secondary">
+            注册第三方履约接口后，仓库设置中方可选择对应承运商
+          </Typography.Text>
+        </div>
+        <Button type="primary" onClick={openCreate}>
+          注册承运商
+        </Button>
+      </Space>
+
+      <Table rowKey="id" loading={loading} columns={columns} dataSource={rows} pagination={false} />
+
+      <Modal
+        title={editRow ? '编辑承运商' : '注册承运商'}
+        open={open}
+        onCancel={() => setOpen(false)}
+        onOk={() => void submit()}
+        width={560}
+      >
+        <Form form={form} layout="vertical">
+          <Form.Item name="code" label="编码" rules={[{ required: true }]}>
+            <Input disabled={Boolean(editRow)} placeholder="如 XFX、JD、SF" />
+          </Form.Item>
+          <Form.Item name="name" label="名称" rules={[{ required: true }]}>
+            <Input placeholder="如 小飞侠、京东物流" />
+          </Form.Item>
+          <Form.Item name="type" label="类型" rules={[{ required: true }]}>
+            <Select options={TYPE_OPTIONS} />
+          </Form.Item>
+          <Form.Item name="status" label="状态" rules={[{ required: true }]}>
+            <Select options={STATUS_OPTIONS} />
+          </Form.Item>
+          <Form.Item name="configJson" label="凭证配置 JSON（可选）">
+            <Input.TextArea rows={3} placeholder="API 密钥等，仅存服务端" />
+          </Form.Item>
+          <Form.Item name="capabilitiesJson" label="能力配置 JSON">
+            <Input.TextArea rows={4} />
+          </Form.Item>
+        </Form>
+      </Modal>
+    </div>
+  );
+}

apps/admin-web/src/pages/OrdersPage.tsx

@@ -51,6 +51,8 @@ type OrderDetail = AdminOrderRow & {
   productAmount?: number;
   freightAmount?: number;
   benefitAmount?: number;
+  deliveryType?: string;
+  fulfillmentWarehouseId?: string | null;
   paidAt?: string | null;
   payExpireAt?: string | null;
   items?: Array<Record<string, unknown>>;
@@ -63,6 +65,7 @@ type OrderDetail = AdminOrderRow & {
 export default function OrdersPage() {
   const [form] = Form.useForm();
   const [shipForm] = Form.useForm();
+  const [logisticsForm] = Form.useForm();
   const [data, setData] = useState<Paginated<AdminOrderRow> | null>(null);
   const [loading, setLoading] = useState(false);
   const [page, setPage] = useState(1);
@@ -74,6 +77,7 @@ export default function OrdersPage() {
   const [batchDeleting, setBatchDeleting] = useState(false);
   const [shipDefaults, setShipDefaults] = useState<ShipDefaults | null>(null);
   const [shipping, setShipping] = useState(false);
+  const [logisticsShipping, setLogisticsShipping] = useState(false);
 
   const selectedOrders = useMemo(
     () => (data?.items ?? []).filter((row) => selectedRowKeys.includes(row.id)),
@@ -143,6 +147,25 @@ export default function OrdersPage() {
     }
   }
 
+  async function submitLogisticsShip() {
+    if (!detail) return;
+    const values = await logisticsForm.validateFields();
+    setLogisticsShipping(true);
+    try {
+      const res = await request<OrderDetail>(`/admin/orders/${detail.id}/logistics-ship`, {
+        method: 'POST',
+        body: JSON.stringify(values),
+      });
+      message.success('快递单已录入');
+      setDetail(res);
+      void load();
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '填单失败');
+    } finally {
+      setLogisticsShipping(false);
+    }
+  }
+
   async function confirmBatchDelete() {
     if (!selectedRowKeys.length) return;
     setBatchDeleting(true);
@@ -324,16 +347,55 @@ export default function OrdersPage() {
             {detail.delivery && (
               <Descriptions column={1} bordered size="small" title="配送" style={{ marginTop: 16 }}>
                 <Descriptions.Item label="快递公司">
-                  {DELIVERY_PROVIDER_LABELS[detail.delivery.provider] || detail.delivery.provider}
+                  {detail.delivery.logisticsCompany ||
+                    DELIVERY_PROVIDER_LABELS[detail.delivery.provider] ||
+                    detail.delivery.provider}
                 </Descriptions.Item>
                 <Descriptions.Item label="运单号">{detail.delivery.trackingNo || '—'}</Descriptions.Item>
                 <Descriptions.Item label="三方单号">{detail.delivery.providerOrderNo || '—'}</Descriptions.Item>
+                {detail.delivery.manualQueryUrl && (
+                  <Descriptions.Item label="查询链接">
+                    <a href={detail.delivery.manualQueryUrl} target="_blank" rel="noreferrer">
+                      打开物流查询
+                    </a>
+                  </Descriptions.Item>
+                )}
               </Descriptions>
             )}
 
             {['PENDING_SHIP', 'OUT_WAREHOUSE'].includes(detail.status) && !detail.delivery?.trackingNo && (
               <div style={{ marginTop: 16 }}>
-                <Typography.Title level={5}>发货</Typography.Title>
+                {(detail.deliveryType === 'CROSS_CITY' || !detail.fulfillmentWarehouseId) && (
+                  <>
+                    <Typography.Title level={5}>总部快递填单</Typography.Title>
+                    <Typography.Paragraph type="secondary" style={{ fontSize: 12 }}>
+                      适用于跨城订单或同城无仓订单
+                    </Typography.Paragraph>
+                    <Form form={logisticsForm} layout="vertical" size="small">
+                      <Form.Item name="logisticsCompany" label="快递公司" rules={[{ required: true }]}>
+                        <Input placeholder="如 顺丰速运、京东物流" />
+                      </Form.Item>
+                      <Form.Item name="trackingNo" label="运单号" rules={[{ required: true }]}>
+                        <Input />
+                      </Form.Item>
+                      <Form.Item name="manualQueryUrl" label="物流查询链接（可选）">
+                        <Input placeholder="https://..." />
+                      </Form.Item>
+                      <Button type="primary" loading={logisticsShipping} onClick={() => void submitLogisticsShip()}>
+                        提交快递单
+                      </Button>
+                    </Form>
+                  </>
+                )}
+
+                {detail.fulfillmentWarehouseId && (
+                  <>
+                    <Typography.Title level={5} style={{ marginTop: 16 }}>
+                      仓配小飞侠重试
+                    </Typography.Title>
+                    <Typography.Paragraph type="secondary" style={{ fontSize: 12 }}>
+                      仓配订单通常支付后自动推单；失败时可手动重试
+                    </Typography.Paragraph>
                 <Form form={shipForm} layout="vertical" size="small">
                   <Form.Item name="provider" label="快递公司" rules={[{ required: true }]}>
                     <Select
@@ -389,6 +451,8 @@ export default function OrdersPage() {
                     调用小飞侠发货
                   </Button>
                 </Form>
+                  </>
+                )}
               </div>
             )}
 

apps/h5-partner/src/pages/OrderListPage.tsx

@@ -41,6 +41,8 @@ export default function OrderListPage({ tabRoot = false }: OrderListPageProps) {
   const [dateFilter, setDateFilter] = useState<DateFilter>('today');
   const [statusFilter, setStatusFilter] = useState<StatusFilter>('ALL');
   const [shippingId, setShippingId] = useState<string | null>(null);
+  const [shipForm, setShipForm] = useState({ logisticsCompany: '', trackingNo: '', manualQueryUrl: '' });
+  const [shipModalId, setShipModalId] = useState<string | null>(null);
 
   useEffect(() => {
     document.title = '订单管理';
@@ -64,14 +66,27 @@ export default function OrderListPage({ tabRoot = false }: OrderListPageProps) {
   async function handleShip(orderId: string, e: React.MouseEvent) {
     e.preventDefault();
     e.stopPropagation();
-    setShippingId(orderId);
+    setShipModalId(orderId);
+    setShipForm({ logisticsCompany: '', trackingNo: '', manualQueryUrl: '' });
+  }
+
+  async function submitManualShip() {
+    if (!shipModalId) return;
+    if (!shipForm.logisticsCompany.trim() || !shipForm.trackingNo.trim()) {
+      window.alert('请填写快递公司和运单号');
+      return;
+    }
+    setShippingId(shipModalId);
     try {
-      await request('PARTNER_H5', `/partner/orders/${orderId}/mock-advance-delivery`, {
+      await request('PARTNER_H5', `/partner/orders/${shipModalId}/manual-ship`, {
         method: 'POST',
-        body: JSON.stringify({ targetStatus: 'OUT_WAREHOUSE' }),
+        body: JSON.stringify(shipForm),
       });
+      setShipModalId(null);
       const next = await request<{ list: Array<Record<string, unknown>> }>('PARTNER_H5', '/partner/orders');
       setData(next);
+    } catch (err) {
+      window.alert(err instanceof Error ? err.message : '发货失败');
     } finally {
       setShippingId(null);
     }
@@ -137,14 +152,14 @@ export default function OrderListPage({ tabRoot = false }: OrderListPageProps) {
                     <p className="line-2-clamp">{String(o.receiverAddress || '收货地址')}</p>
                   </div>
                 </Link>
-                {canShip(String(o.status)) && (
+                {canShip(String(o.status)) && !(o.delivery as { trackingNo?: string } | undefined)?.trackingNo && (
                   <button
                     type="button"
                     className="partner-order-ship-btn"
                     disabled={shippingId === orderId}
                     onClick={(e) => void handleShip(orderId, e)}
                   >
-                    {shippingId === orderId ? '发货中…' : '确认发货'}
+                    填写运单
                   </button>
                 )}
               </div>
@@ -162,6 +177,50 @@ export default function OrderListPage({ tabRoot = false }: OrderListPageProps) {
           <p className="text-muted body-md text-center">权益记录 preV1 占位</p>
         </div>
       )}
+
+      {shipModalId && (
+        <div className="partner-ship-modal-backdrop" role="presentation" onClick={() => setShipModalId(null)}>
+          <div className="partner-ship-modal" role="dialog" onClick={(e) => e.stopPropagation()}>
+            <h3 className="headline-md">填写运单</h3>
+            <label className="partner-ship-field">
+              <span>快递公司</span>
+              <input
+                value={shipForm.logisticsCompany}
+                onChange={(e) => setShipForm((f) => ({ ...f, logisticsCompany: e.target.value }))}
+                placeholder="如 顺丰速运"
+              />
+            </label>
+            <label className="partner-ship-field">
+              <span>运单号</span>
+              <input
+                value={shipForm.trackingNo}
+                onChange={(e) => setShipForm((f) => ({ ...f, trackingNo: e.target.value }))}
+              />
+            </label>
+            <label className="partner-ship-field">
+              <span>查询链接（可选）</span>
+              <input
+                value={shipForm.manualQueryUrl}
+                onChange={(e) => setShipForm((f) => ({ ...f, manualQueryUrl: e.target.value }))}
+                placeholder="https://..."
+              />
+            </label>
+            <div className="partner-ship-actions">
+              <button type="button" className="partner-btn-secondary" onClick={() => setShipModalId(null)}>
+                取消
+              </button>
+              <button
+                type="button"
+                className="partner-btn-primary"
+                disabled={shippingId === shipModalId}
+                onClick={() => void submitManualShip()}
+              >
+                {shippingId === shipModalId ? '提交中…' : '确认发货'}
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
     </div>
   );
 }

apps/h5-partner/src/styles.css

@@ -3129,6 +3129,50 @@ body {
   justify-content: center;
 }
 
+.partner-ship-modal-backdrop {
+  position: fixed;
+  inset: 0;
+  z-index: 200;
+  background: rgba(0, 0, 0, 0.45);
+  display: flex;
+  align-items: flex-end;
+  justify-content: center;
+  padding: 16px;
+}
+
+.partner-ship-modal {
+  width: 100%;
+  max-width: 420px;
+  background: #fff;
+  border-radius: var(--radius-lg) var(--radius-lg) 0 0;
+  padding: 20px;
+}
+
+.partner-ship-field {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  margin-top: 12px;
+  font-size: 13px;
+}
+
+.partner-ship-field input {
+  padding: 10px 12px;
+  border: 1px solid var(--color-outline-variant);
+  border-radius: var(--radius-sm);
+}
+
+.partner-ship-actions {
+  display: flex;
+  gap: 12px;
+  margin-top: 20px;
+}
+
+.partner-ship-actions .partner-btn-secondary,
+.partner-ship-actions .partner-btn-primary {
+  flex: 1;
+}
+
 /* 微信 H5 系统标题已展示：隐藏页内重复标题，保留返回键与操作区 */
 .app-page-title {
   display: none !important;

apps/h5-user/src/pages/OrderDetailPage.tsx

@@ -18,6 +18,15 @@ type OrderItem = {
 
 type OrderDelivery = {
   provider?: string;
+  trackingNo?: string;
+  logisticsCompany?: string;
+  manualQueryUrl?: string;
+  providerOrderNo?: string;
+};
+
+type TrackNode = {
+  trackInfo?: string;
+  createdAt?: string;
 };
 
 type OrderPayment = {
@@ -101,8 +110,10 @@ function progressActiveIndex(status: string) {
   }
 }
 
-function deliveryProviderLabel(provider?: string) {
-  if (!provider || provider === 'MOCK' || provider === 'XIAOFEIXIA') return '小飞侠配送';
+function deliveryProviderLabel(provider?: string, company?: string) {
+  if (company) return company;
+  if (!provider || provider === 'MOCK' || provider === 'XFX' || provider === 'XIAOFEIXIA') return '小飞侠配送';
+  if (provider === 'LOGISTICS') return '快递配送';
   return provider;
 }
 
@@ -124,13 +135,27 @@ export default function OrderDetailPage() {
   const [copyHint, setCopyHint] = useState('');
   const [shareToast, setShareToast] = useState('');
   const [confirming, setConfirming] = useState(false);
+  const [trackNodes, setTrackNodes] = useState<TrackNode[]>([]);
 
   const isReship = order?.orderType === 'RESHIPMENT';
 
+  async function loadTrack() {
+    if (!id) return;
+    try {
+      const data = await request<{ nodes?: TrackNode[] }>('USER_H5', `/trade/orders/${id}/track`);
+      setTrackNodes(data.nodes ?? []);
+    } catch {
+      setTrackNodes([]);
+    }
+  }
+
   async function loadOrder() {
     if (!id) return;
     const data = await request<Order>('USER_H5', `/trade/orders/${id}`);
     setOrder(data);
+    if (data.delivery?.trackingNo || data.delivery?.provider === 'XFX') {
+      void loadTrack();
+    }
   }
 
   useEffect(() => {
@@ -353,11 +378,49 @@ export default function OrderDetailPage() {
             </div>
             <div className="order-detail-kv">
               <span>配送方式</span>
-              <span>{deliveryProviderLabel(order.delivery?.provider)}</span>
+              <span>
+                {deliveryProviderLabel(order.delivery?.provider, order.delivery?.logisticsCompany)}
+              </span>
             </div>
+            {order.delivery?.trackingNo && (
+              <div className="order-detail-kv">
+                <span>运单号</span>
+                <span>{order.delivery.trackingNo}</span>
+              </div>
+            )}
+            {order.delivery?.manualQueryUrl && (
+              <div className="order-detail-kv">
+                <span>物流查询</span>
+                <a
+                  href={order.delivery.manualQueryUrl}
+                  target="_blank"
+                  rel="noreferrer"
+                  className="order-detail-link"
+                >
+                  查看物流
+                </a>
+              </div>
+            )}
           </div>
         </section>
 
+        {trackNodes.length > 0 && (
+          <section className="order-detail-card">
+            <h3 className="order-detail-card-title">
+              <span className="material-symbols-outlined">timeline</span>
+              物流动态
+            </h3>
+            <div className="order-detail-kv-list order-detail-kv-list--bordered">
+              {trackNodes.map((node, index) => (
+                <div key={`${node.trackInfo}-${index}`} className="order-detail-kv">
+                  <span>{node.createdAt ? formatDateTime(node.createdAt) : '—'}</span>
+                  <span>{node.trackInfo || '—'}</span>
+                </div>
+              ))}
+            </div>
+          </section>
+        )}
+
         {!isReship && (
           <section className="order-detail-card">
             <h3 className="order-detail-card-title">