feat(settlement): redesign factory/partner/store statement bills

Add WineryBill/StoreBill tables, partner review-send-confirm flow, daily/monthly cron, and admin multi-select confirm with status filters. Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-22 17:25:49 +08:00
parent b534a569f8
commit b392c28787
22 changed files with 1549 additions and 543 deletions
@@ -62,9 +62,11 @@ export const CITY_STATUS_LABELS: Record<string, string> = {
 };

 export const PARTNER_BILL_STATUS_LABELS: Record<string, string> = {
-  DRAFT: '草稿',
-  CONFIRMED: '已确认',
-  PAID: '已结算',
+  PENDING_REVIEW: '待审核',
+  AWAITING_CONFIRM: '待合伙人确认',
+  UNPAID: '未打款',
+  PAID: '已打款',
+  REJECTED: '已驳回',
 };

 export const MEDIA_TYPE_LABELS: Record<string, string> = {
@@ -40,9 +40,16 @@ export const HQ_OPERATION_ACTION_OPTIONS = [
  { value: 'TICKET_REJECT', label: '工单驳回' },
  { value: 'STORE_PAYOUT_CONFIRM', label: '门店打款确认' },
  { value: 'STORE_PAYOUT_BATCH_CONFIRM', label: '批量门店打款' },
+  { value: 'STORE_BILL_CONFIRM', label: '门店对账单确认打款' },
+  { value: 'STORE_BILL_BATCH_CONFIRM', label: '批量门店对账单打款' },
  { value: 'PARTNER_BILL_GENERATE', label: '生成合伙人账单' },
+  { value: 'PARTNER_BILL_SEND', label: '发送合伙人账单' },
+  { value: 'PARTNER_BILL_BATCH_SEND', label: '批量发送合伙人账单' },
  { value: 'PARTNER_BILL_CONFIRM', label: '确认合伙人账单' },
  { value: 'PARTNER_BILL_MARK_PAID', label: '合伙人账单结算' },
+  { value: 'PARTNER_BILL_BATCH_MARK_PAID', label: '批量合伙人账单结算' },
+  { value: 'WINERY_BILL_CONFIRM', label: '酒厂对账单确认打款' },
+  { value: 'WINERY_BILL_BATCH_CONFIRM', label: '批量酒厂对账单打款' },
 ] as const;

 export const HQ_OPERATION_ACTION_LABELS: Record<string, string> = Object.fromEntries(
@@ -38,15 +38,17 @@ type Row = {
 type PartnerOption = { id: string; companyName: string; phone?: string };

 const STATUS_LABELS: Record<string, string> = {
-  DRAFT: '待合伙人确认',
-  CONFIRMED: '待打款审核',
+  PENDING_REVIEW: '待审核',
+  AWAITING_CONFIRM: '待合伙人确认',
+  UNPAID: '未打款',
  PAID: '已打款',
  REJECTED: '已驳回',
 };

 const STATUS_COLORS: Record<string, string> = {
-  DRAFT: 'default',
-  CONFIRMED: 'orange',
+  PENDING_REVIEW: 'gold',
+  AWAITING_CONFIRM: 'blue',
+  UNPAID: 'red',
  PAID: 'green',
  REJECTED: 'red',
 };
@@ -74,6 +76,7 @@ export default function PartnerBillsPage() {
  const [rejectTarget, setRejectTarget] = useState<Row | null>(null);
  const [rejectForm] = Form.useForm();
  const [rejecting, setRejecting] = useState(false);
+  const [selectedKeys, setSelectedKeys] = useState<React.Key[]>([]);

  useEffect(() => {
    void request<Paginated<PartnerOption>>(`/admin/partners?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
@@ -81,10 +84,10 @@ export default function PartnerBillsPage() {
      .catch(() => {});
  }, []);

-  async function generateBill(values: { partnerId?: string; month: Dayjs; all?: boolean }) {
+  async function generateBill(values: { partnerId?: string; month: Dayjs }) {
    const year = values.month.year();
    const month = values.month.month() + 1;
-    if (values.all || !values.partnerId) {
+    if (!values.partnerId) {
      const result = await request<{ success: number; failed: number; total: number }>(
        '/admin/partner-bills/generate-all',
        { method: 'POST', body: JSON.stringify({ year, month }) },
@@ -95,31 +98,71 @@ export default function PartnerBillsPage() {
        method: 'POST',
        body: JSON.stringify({ partnerId: values.partnerId, year, month }),
      });
-      message.success('账单已生成');
+      message.success('账单已生成（待审核）');
    }
    setGenOpen(false);
    reload();
  }

-  async function confirmBill(id: string) {
-    await request(`/admin/partner-bills/${id}/confirm`, { method: 'POST' });
-    message.success('已代确认，进入待打款审核');
-    reload();
+  function sendBills(ids: string[]) {
+    Modal.confirm({
+      title: '发送给合伙人？',
+      content: `将发送 ${ids.length} 笔账单到合伙人端，状态变为「待合伙人确认」。`,
+      okText: '确认发送',
+      cancelText: '取消',
+      onOk: async () => {
+        if (ids.length === 1) {
+          await request(`/admin/partner-bills/${ids[0]}/send`, { method: 'POST' });
+        } else {
+          await request('/admin/partner-bills/batch-send', {
+            method: 'POST',
+            body: JSON.stringify({ ids }),
+          });
+        }
+        message.success('已发送');
+        setSelectedKeys([]);
+        reload();
+      },
+    });
  }

-  async function markPaid(id: string) {
-    await request(`/admin/partner-bills/${id}/mark-paid`, {
-      method: 'POST',
-      body: JSON.stringify({ paymentRef: `PAY-${Date.now()}` }),
+  function markPaid(ids: string[], amountHint?: number) {
+    Modal.confirm({
+      title: '确认打款？',
+      content: `将标记 ${ids.length} 笔账单为已打款${amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。`,
+      okText: '确认打款',
+      cancelText: '取消',
+      onOk: async () => {
+        if (ids.length === 1) {
+          await request(`/admin/partner-bills/${ids[0]}/mark-paid`, {
+            method: 'POST',
+            body: JSON.stringify({ paymentRef: `PAY-${Date.now()}` }),
+          });
+        } else {
+          await request('/admin/partner-bills/batch-mark-paid', {
+            method: 'POST',
+            body: JSON.stringify({ ids }),
+          });
+        }
+        message.success('已标记打款');
+        setSelectedKeys([]);
+        reload();
+      },
    });
-    message.success('已通过并标记打款');
-    reload();
  }

  function openReject(row: Row) {
-    setRejectTarget(row);
-    rejectForm.resetFields();
-    setRejectOpen(true);
+    Modal.confirm({
+      title: '驳回该账单？',
+      content: '驳回后合伙人需重新等待总部发送。请在下一步填写理由。',
+      okText: '继续填写理由',
+      cancelText: '取消',
+      onOk: () => {
+        setRejectTarget(row);
+        rejectForm.resetFields();
+        setRejectOpen(true);
+      },
+    });
  }

  async function submitReject(values: { reason: string }) {
@@ -130,7 +173,7 @@ export default function PartnerBillsPage() {
        method: 'POST',
        body: JSON.stringify({ reason: values.reason.trim() }),
      });
-      message.success('已驳回打款申请');
+      message.success('已驳回');
      setRejectOpen(false);
      setRejectTarget(null);
      reload();
@@ -158,6 +201,10 @@ export default function PartnerBillsPage() {

  const summary = data?.summary;
  const partnerName = (r: Row) => r.partner?.companyName || r.partnerAccount?.companyName || '—';
+  const selectedRows = (data?.items ?? []).filter((r) => selectedKeys.includes(r.id));
+  const canSend = selectedRows.filter((r) => r.status === 'PENDING_REVIEW' || r.status === 'REJECTED');
+  const canPay = selectedRows.filter((r) => r.status === 'UNPAID');
+  const payAmount = canPay.reduce((s, r) => s + Number(r.totalAmount), 0);

  const columns: ColumnsType<Row> = [
    { title: '账单号', dataIndex: 'billNo', width: 180, ellipsis: true },
@@ -194,7 +241,7 @@ export default function PartnerBillsPage() {
    {
      title: '状态',
      dataIndex: 'status',
-      width: 120,
+      width: 130,
      render: (s, row) => (
        <Space direction="vertical" size={0}>
          <Tag color={STATUS_COLORS[s] || 'default'}>{STATUS_LABELS[s] || s}</Tag>
@@ -212,21 +259,26 @@ export default function PartnerBillsPage() {
      fixed: 'right',
      render: (_, row) => (
        <Space size={0} wrap>
-          {row.status === 'DRAFT' && (
-            <Button type="link" size="small" onClick={() => void confirmBill(row.id)}>
-              代确认
+          {(row.status === 'PENDING_REVIEW' || row.status === 'REJECTED') && (
+            <Button type="link" size="small" onClick={() => sendBills([row.id])}>
+              发送
            </Button>
          )}
-          {row.status === 'CONFIRMED' && (
+          {row.status === 'UNPAID' && (
            <>
-              <Button type="link" size="small" onClick={() => void markPaid(row.id)}>
-                通过打款
+              <Button type="link" size="small" onClick={() => markPaid([row.id], Number(row.totalAmount))}>
+                确认打款
              </Button>
              <Button type="link" size="small" danger onClick={() => openReject(row)}>
                驳回
              </Button>
            </>
          )}
+          {row.status === 'AWAITING_CONFIRM' && (
+            <Button type="link" size="small" danger onClick={() => openReject(row)}>
+              驳回
+            </Button>
+          )}
        </Space>
      ),
    },
@@ -239,7 +291,7 @@ export default function PartnerBillsPage() {
          合伙人账单
        </Typography.Title>
        <Typography.Text type="secondary">
-          T+30 结算：合伙人确认并申请打款后，总部在此审核通过或驳回（驳回须填写理由）
+          每月 1 日 8:00 自动生成上月账单（待审核）→ 发送合伙人确认 → 未打款 → 已打款
        </Typography.Text>
      </Space>

@@ -287,7 +339,7 @@ export default function PartnerBillsPage() {
        <Form.Item name="status" label="状态">
          <Select
            allowClear
-            style={{ width: 140 }}
+            style={{ width: 150 }}
            options={Object.entries(STATUS_LABELS).map(([value, label]) => ({ value, label }))}
          />
        </Form.Item>
@@ -317,6 +369,20 @@ export default function PartnerBillsPage() {
            导出 Excel
          </Button>
        </Form.Item>
+        <Form.Item>
+          <Button disabled={!canSend.length} onClick={() => sendBills(canSend.map((r) => r.id))}>
+            批量发送 ({canSend.length})
+          </Button>
+        </Form.Item>
+        <Form.Item>
+          <Button
+            type="primary"
+            disabled={!canPay.length}
+            onClick={() => markPaid(canPay.map((r) => r.id), payAmount)}
+          >
+            批量打款 ({canPay.length})
+          </Button>
+        </Form.Item>
      </Form>

      <Table
@@ -325,6 +391,10 @@ export default function PartnerBillsPage() {
        loading={loading}
        columns={columns}
        dataSource={data?.items ?? []}
+        rowSelection={{
+          selectedRowKeys: selectedKeys,
+          onChange: setSelectedKeys,
+        }}
        scroll={{ x: 1280 }}
        pagination={{
          current: page,
@@ -338,7 +408,7 @@ export default function PartnerBillsPage() {
        }}
      />

-      <Modal title="生成合伙人账单（T+30）" open={genOpen} onCancel={() => setGenOpen(false)} footer={null}>
+      <Modal title="生成合伙人账单" open={genOpen} onCancel={() => setGenOpen(false)} footer={null}>
        <Form
          form={genForm}
          layout="vertical"
@@ -361,7 +431,7 @@ export default function PartnerBillsPage() {
            />
          </Form.Item>
          <Button type="primary" htmlType="submit" block>
-            生成
+            生成（待审核）
          </Button>
        </Form>
      </Modal>
@@ -378,8 +448,6 @@ export default function PartnerBillsPage() {
      >
        <Typography.Paragraph type="secondary" style={{ marginBottom: 12 }}>
          账单 {rejectTarget?.billNo} · {rejectTarget ? partnerName(rejectTarget) : ''}
-          <br />
-          驳回理由将展示在合伙人 H5 账单页。
        </Typography.Paragraph>
        <Form form={rejectForm} layout="vertical" onFinish={(v) => void submitReject(v)}>
          <Form.Item
@@ -390,7 +458,7 @@ export default function PartnerBillsPage() {
              { max: 500, message: '不超过 500 字' },
            ]}
          >
-            <Input.TextArea rows={4} placeholder="请说明驳回原因，便于合伙人核对后重新申请" maxLength={500} showCount />
+            <Input.TextArea rows={4} placeholder="请说明驳回原因" maxLength={500} showCount />
          </Form.Item>
          <Button type="primary" danger htmlType="submit" block loading={rejecting}>
            确认驳回
@@ -6,6 +6,7 @@ import {
  Descriptions,
  Drawer,
  Form,
+  Modal,
  Select,
  Space,
  Statistic,
@@ -23,26 +24,26 @@ import { useAdminList } from '../lib/useAdminList';

 type Row = {
  id: string;
+  billNo: string;
+  billDate: string;
+  redeemCount: number;
  redeemAmount: number;
-  payoutAmount: number;
  settlementRate: number;
+  payoutAmount: number;
  status: string;
-  expectedPayAt: string;
-  paidAt?: string;
-  createdAt: string;
+  paidAt?: string | null;
  store?: { id: string; name: string; cityName: string; phone?: string };
-  redeemRecord?: { redeemNo: string; amount?: number; createdAt?: string };
 };

 type StoreOption = { id: string; name: string; phone: string };

-const PAYOUT_STATUS_LABELS: Record<string, string> = {
-  PENDING: '待打款',
+const STATUS_LABELS: Record<string, string> = {
+  UNPAID: '未打款',
  PAID: '已打款',
 };

-const PAYOUT_STATUS_COLORS: Record<string, string> = {
-  PENDING: 'orange',
+const STATUS_COLORS: Record<string, string> = {
+  UNPAID: 'red',
  PAID: 'green',
 };

@@ -51,7 +52,7 @@ export default function StoreBillsPage() {
  const [filters, setFilters] = useState<Record<string, string>>({});
  const [stores, setStores] = useState<StoreOption[]>([]);
  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<Row>(
-    '/admin/store-payouts',
+    '/admin/store-bills',
    () => {
      const qs = new URLSearchParams();
      if (filters.status) qs.set('status', filters.status);
@@ -65,6 +66,8 @@ export default function StoreBillsPage() {
  const [detail, setDetail] = useState<Record<string, unknown> | null>(null);
  const [drawerOpen, setDrawerOpen] = useState(false);
  const [exporting, setExporting] = useState(false);
+  const [selectedKeys, setSelectedKeys] = useState<React.Key[]>([]);
+  const [batchLoading, setBatchLoading] = useState(false);

  useEffect(() => {
    void request<Paginated<StoreOption>>(`/admin/stores?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
@@ -72,13 +75,37 @@ export default function StoreBillsPage() {
      .catch(() => {});
  }, []);

-  async function confirmPayout(id: string) {
-    await request(`/admin/store-payouts/${id}/confirm`, {
-      method: 'POST',
-      body: JSON.stringify({ remark: '财务确认打款' }),
+  function confirmPay(ids: string[], amountHint?: number) {
+    Modal.confirm({
+      title: '确认打款？',
+      content: `将确认 ${ids.length} 笔门店对账单${amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。此操作不可撤销。`,
+      okText: '确认打款',
+      cancelText: '取消',
+      onOk: async () => {
+        if (ids.length === 1) {
+          await request(`/admin/store-bills/${ids[0]}/confirm`, { method: 'POST' });
+        } else {
+          setBatchLoading(true);
+          try {
+            await request('/admin/store-bills/batch-confirm', {
+              method: 'POST',
+              body: JSON.stringify({ ids }),
+            });
+          } finally {
+            setBatchLoading(false);
+          }
+        }
+        message.success('已确认打款');
+        setSelectedKeys([]);
+        reload();
+      },
    });
-    message.success('已确认打款');
-    reload();
+  }
+
+  async function openDetail(id: string) {
+    const d = await request<Record<string, unknown>>(`/admin/store-bills/${id}`);
+    setDetail(d);
+    setDrawerOpen(true);
  }

  async function exportExcel() {
@@ -89,10 +116,8 @@ export default function StoreBillsPage() {
      if (filters.storeId) qs.set('storeId', filters.storeId);
      if (filters.dateFrom) qs.set('dateFrom', filters.dateFrom);
      if (filters.dateTo) qs.set('dateTo', filters.dateTo);
-      const result = await request<{ csv: string; count: number }>(
-        `/admin/store-payouts/export?${qs}`,
-      );
-      downloadExcelCsv(result.csv, `门店账单_${filters.dateFrom || 'all'}_${filters.dateTo || 'all'}.csv`);
+      const result = await request<{ csv: string; count: number }>(`/admin/store-bills/export?${qs}`);
+      downloadExcelCsv(result.csv, `门店对账单_${filters.dateFrom || 'all'}_${filters.dateTo || 'all'}.csv`);
      message.success(`已导出 ${result.count} 条`);
    } finally {
      setExporting(false);
@@ -100,62 +125,56 @@ export default function StoreBillsPage() {
  }

  const summary = data?.summary;
+  const selectedRows = (data?.items ?? []).filter((r) => selectedKeys.includes(r.id));
+  const selectedAmount = selectedRows.reduce((s, r) => s + Number(r.payoutAmount), 0);

  const columns: ColumnsType<Row> = [
+    { title: '账单号', dataIndex: 'billNo', width: 170, ellipsis: true },
    {
-      title: '核销日期',
+      title: '账单日',
+      dataIndex: 'billDate',
      width: 110,
-      render: (_, r) =>
-        (r.redeemRecord?.createdAt || r.createdAt || '').toString().slice(0, 10) || '—',
+      render: (v) => String(v || '').slice(0, 10),
    },
    { title: '门店', dataIndex: ['store', 'name'], width: 140, ellipsis: true },
    { title: '登录手机', dataIndex: ['store', 'phone'], width: 120, render: (v) => v || '—' },
    { title: '城市', dataIndex: ['store', 'cityName'], width: 90 },
+    { title: '核销笔数', dataIndex: 'redeemCount', width: 90 },
    {
-      title: '核销单号',
-      dataIndex: ['redeemRecord', 'redeemNo'],
-      width: 160,
-      ellipsis: true,
-      render: (v) => v || '—',
+      title: '核销金额',
+      dataIndex: 'redeemAmount',
+      width: 110,
+      render: (v) => `¥${Number(v).toFixed(2)}`,
    },
-    { title: '核销面额', dataIndex: 'redeemAmount', width: 100, render: (v) => `¥${v}` },
    {
-      title: '核销比例',
+      title: '结算比例',
      dataIndex: 'settlementRate',
      width: 90,
-      render: (v) => (v != null ? `${Math.round(Number(v) * 100)}%` : '—'),
+      render: (v) => `${Math.round(Number(v) * 100)}%`,
    },
    {
-      title: '应付门店',
+      title: '应付金额',
      dataIndex: 'payoutAmount',
-      width: 100,
-      render: (v) => `¥${v}`,
+      width: 110,
+      render: (v) => `¥${Number(v).toFixed(2)}`,
    },
    {
-      title: '打款状态',
+      title: '状态',
      dataIndex: 'status',
-      width: 100,
-      render: (s) => <Tag color={PAYOUT_STATUS_COLORS[s] || 'default'}>{PAYOUT_STATUS_LABELS[s] || s}</Tag>,
+      width: 90,
+      render: (s) => <Tag color={STATUS_COLORS[s] || 'default'}>{STATUS_LABELS[s] || s}</Tag>,
    },
-    { title: '预计打款(T+1)', dataIndex: 'expectedPayAt', width: 160, render: fmtTime },
    {
      title: '操作',
-      width: 140,
+      width: 160,
      fixed: 'right',
      render: (_, row) => (
        <Space size={0}>
-          <Button
-            type="link"
-            size="small"
-            onClick={async () => {
-              setDetail(await request(`/admin/store-payouts/${row.id}`));
-              setDrawerOpen(true);
-            }}
-          >
-            详情
+          <Button type="link" size="small" onClick={() => void openDetail(row.id)}>
+            明细
          </Button>
-          {row.status === 'PENDING' && (
-            <Button type="link" size="small" onClick={() => void confirmPayout(row.id)}>
+          {row.status === 'UNPAID' && (
+            <Button type="link" size="small" onClick={() => confirmPay([row.id], Number(row.payoutAmount))}>
              确认打款
            </Button>
          )}
@@ -168,19 +187,19 @@ export default function StoreBillsPage() {
    <div>
      <Space direction="vertical" size={0} style={{ marginBottom: 16 }}>
        <Typography.Title level={4} style={{ margin: 0 }}>
-          门店账单
+          门店对账单
        </Typography.Title>
        <Typography.Text type="secondary">
-          T+1 结算：按日列出门店核销订单，应付 = 核销面额 × 门店核销比例
+          按核销日汇总（每日 8:00 自动出账）；未打款红色、已打款绿色
        </Typography.Text>
      </Space>

      {summary && (
        <Card size="small" style={{ marginBottom: 16 }}>
          <Space size="large" wrap>
-            <Statistic title="明细笔数" value={summary.count} />
-            <Statistic title="核销面额合计" value={summary.redeemAmount ?? 0} prefix="¥" precision={2} />
-            <Statistic title="应付门店合计" value={summary.payoutAmount ?? summary.totalAmount} prefix="¥" precision={2} />
+            <Statistic title="账单数" value={summary.count} />
+            <Statistic title="核销金额合计" value={summary.redeemAmount ?? 0} prefix="¥" precision={2} />
+            <Statistic title="应付合计" value={summary.payoutAmount ?? 0} prefix="¥" precision={2} />
          </Space>
        </Card>
      )}
@@ -189,16 +208,12 @@ export default function StoreBillsPage() {
        form={form}
        layout="inline"
        style={{ marginBottom: 16 }}
-        onFinish={(v: {
-          storeId?: string;
-          status?: string;
-          dateRange?: [Dayjs, Dayjs];
-        }) => {
+        onFinish={(v: { storeId?: string; status?: string; range?: [Dayjs, Dayjs] }) => {
          setFilters({
            storeId: v.storeId || '',
            status: v.status || '',
-            dateFrom: v.dateRange?.[0]?.format('YYYY-MM-DD') || '',
-            dateTo: v.dateRange?.[1]?.format('YYYY-MM-DD') || '',
+            dateFrom: v.range?.[0] ? v.range[0].format('YYYY-MM-DD') : '',
+            dateTo: v.range?.[1] ? v.range[1].format('YYYY-MM-DD') : '',
          });
          setPage(1);
        }}
@@ -210,21 +225,17 @@ export default function StoreBillsPage() {
            placeholder="全部门店"
            style={{ width: 200 }}
            optionFilterProp="label"
-            options={stores.map((s) => ({
-              value: s.id,
-              label: `${s.name}（${s.phone}）`,
-            }))}
+            options={stores.map((s) => ({ value: s.id, label: s.name || s.phone || s.id }))}
          />
        </Form.Item>
-        <Form.Item name="status" label="打款状态">
+        <Form.Item name="status" label="状态">
          <Select
            allowClear
            style={{ width: 120 }}
-            placeholder="全部"
-            options={Object.entries(PAYOUT_STATUS_LABELS).map(([value, label]) => ({ value, label }))}
+            options={Object.entries(STATUS_LABELS).map(([value, label]) => ({ value, label }))}
          />
        </Form.Item>
-        <Form.Item name="dateRange" label="核销日期">
+        <Form.Item name="range" label="账单日">
          <DatePicker.RangePicker />
        </Form.Item>
        <Form.Item>
@@ -248,6 +259,16 @@ export default function StoreBillsPage() {
            导出 Excel
          </Button>
        </Form.Item>
+        <Form.Item>
+          <Button
+            type="primary"
+            disabled={!selectedKeys.length}
+            loading={batchLoading}
+            onClick={() => confirmPay(selectedKeys.map(String), selectedAmount)}
+          >
+            批量确认打款 ({selectedKeys.length})
+          </Button>
+        </Form.Item>
      </Form>

      <Table
@@ -256,7 +277,12 @@ export default function StoreBillsPage() {
        loading={loading}
        columns={columns}
        dataSource={data?.items ?? []}
-        scroll={{ x: 1300 }}
+        rowSelection={{
+          selectedRowKeys: selectedKeys,
+          onChange: setSelectedKeys,
+          getCheckboxProps: (r) => ({ disabled: r.status !== 'UNPAID' }),
+        }}
+        scroll={{ x: 1200 }}
        pagination={{
          current: page,
          pageSize,
@@ -269,28 +295,44 @@ export default function StoreBillsPage() {
        }}
      />

-      <Drawer title="账单详情" width={520} open={drawerOpen} onClose={() => setDrawerOpen(false)}>
+      <Drawer title="门店对账单明细" open={drawerOpen} onClose={() => setDrawerOpen(false)} width={520}>
        {detail && (
-          <Descriptions column={1} bordered size="small">
-            <Descriptions.Item label="门店">
-              {String((detail.store as { name?: string })?.name ?? '—')}
-            </Descriptions.Item>
-            <Descriptions.Item label="核销单号">
-              {String((detail.redeemRecord as { redeemNo?: string })?.redeemNo ?? '—')}
-            </Descriptions.Item>
-            <Descriptions.Item label="核销面额">¥{String(detail.redeemAmount)}</Descriptions.Item>
-            <Descriptions.Item label="应付金额">¥{String(detail.payoutAmount)}</Descriptions.Item>
-            <Descriptions.Item label="结算比例">
-              {detail.settlementRate ? `${Math.round(Number(detail.settlementRate) * 100)}%` : '—'}
-            </Descriptions.Item>
-            <Descriptions.Item label="状态">
-              {PAYOUT_STATUS_LABELS[String(detail.status)] || String(detail.status)}
-            </Descriptions.Item>
-            <Descriptions.Item label="预计打款">{fmtTime(String(detail.expectedPayAt))}</Descriptions.Item>
-            <Descriptions.Item label="实际打款">
-              {detail.paidAt ? fmtTime(String(detail.paidAt)) : '—'}
-            </Descriptions.Item>
-          </Descriptions>
+          <>
+            <Descriptions column={1} size="small" bordered>
+              <Descriptions.Item label="账单号">{String(detail.billNo)}</Descriptions.Item>
+              <Descriptions.Item label="账单日">{String(detail.billDate || '').slice(0, 10)}</Descriptions.Item>
+              <Descriptions.Item label="应付">¥{Number(detail.payoutAmount ?? 0).toFixed(2)}</Descriptions.Item>
+              <Descriptions.Item label="状态">{STATUS_LABELS[String(detail.status)] || String(detail.status)}</Descriptions.Item>
+              <Descriptions.Item label="打款时间">
+                {detail.paidAt ? fmtTime(String(detail.paidAt)) : '—'}
+              </Descriptions.Item>
+            </Descriptions>
+            <Typography.Title level={5} style={{ marginTop: 16 }}>
+              核销明细
+            </Typography.Title>
+            <Table
+              size="small"
+              rowKey="id"
+              pagination={false}
+              dataSource={(detail.payouts as Array<Record<string, unknown>>) || []}
+              columns={[
+                {
+                  title: '核销单号',
+                  render: (_, r) => String((r.redeemRecord as { redeemNo?: string })?.redeemNo || '—'),
+                },
+                {
+                  title: '金额',
+                  dataIndex: 'payoutAmount',
+                  render: (v) => `¥${Number(v).toFixed(2)}`,
+                },
+                {
+                  title: '状态',
+                  dataIndex: 'status',
+                  render: (s) => (s === 'PAID' ? '已打款' : '未打款'),
+                },
+              ]}
+            />
+          </>
        )}
      </Drawer>
    </div>
@@ -3,7 +3,10 @@ import {
  Button,
  Card,
  DatePicker,
+  Descriptions,
+  Drawer,
  Form,
+  Modal,
  Select,
  Space,
  Statistic,
@@ -21,17 +24,34 @@ import { request } from '../lib/api';
 import { useAdminList } from '../lib/useAdminList';

 type Row = {
-  orderId: string;
-  orderNo: string;
-  deliveryType: string;
-  cityName?: string;
-  receiverCity?: string;
-  payAmount: number;
+  id: string;
+  billNo: string;
+  billDate: string;
+  orderCount: number;
+  orderAmount: number;
  wineryRate: number;
  wineryAmount: number;
+  status: string;
+  paidAt?: string | null;
+};
+
+type BillItem = {
+  id: string;
+  orderNo: string;
+  deliveryType: string;
+  payAmount: number;
+  wineryAmount: number;
  paidAt: string;
-  productName?: string;
-  quantity?: number;
+};
+
+const STATUS_LABELS: Record<string, string> = {
+  UNPAID: '未打款',
+  PAID: '已打款',
+};
+
+const STATUS_COLORS: Record<string, string> = {
+  UNPAID: 'red',
+  PAID: 'green',
 };

 const DELIVERY_LABELS: Record<string, string> = {
@@ -42,29 +62,64 @@ const DELIVERY_LABELS: Record<string, string> = {
 export default function WineryBillsPage() {
  const [form] = Form.useForm();
  const [filters, setFilters] = useState<Record<string, string>>({});
-  const { data, loading, page, pageSize, setPage, setPageSize } = useAdminList<Row>(
+  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<Row>(
    '/admin/winery-bills',
    () => {
      const qs = new URLSearchParams();
+      if (filters.status) qs.set('status', filters.status);
      if (filters.year) qs.set('year', filters.year);
      if (filters.month) qs.set('month', filters.month);
-      if (filters.deliveryType) qs.set('deliveryType', filters.deliveryType);
+      if (filters.dateFrom) qs.set('dateFrom', filters.dateFrom);
+      if (filters.dateTo) qs.set('dateTo', filters.dateTo);
      return qs;
    },
    [filters],
  );
  const [exporting, setExporting] = useState(false);
+  const [selectedKeys, setSelectedKeys] = useState<React.Key[]>([]);
+  const [detail, setDetail] = useState<(Row & { items?: BillItem[] }) | null>(null);
+  const [drawerOpen, setDrawerOpen] = useState(false);
+
+  function confirmPay(ids: string[], amountHint?: number) {
+    Modal.confirm({
+      title: '确认打款？',
+      content: `将确认 ${ids.length} 笔酒厂对账单${amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。此操作不可撤销。`,
+      okText: '确认打款',
+      cancelText: '取消',
+      onOk: async () => {
+        if (ids.length === 1) {
+          await request(`/admin/winery-bills/${ids[0]}/confirm`, { method: 'POST' });
+        } else {
+          await request('/admin/winery-bills/batch-confirm', {
+            method: 'POST',
+            body: JSON.stringify({ ids }),
+          });
+        }
+        message.success('已确认打款');
+        setSelectedKeys([]);
+        reload();
+      },
+    });
+  }
+
+  async function openDetail(id: string) {
+    const d = await request<Row & { items?: BillItem[] }>(`/admin/winery-bills/${id}`);
+    setDetail(d);
+    setDrawerOpen(true);
+  }

  async function exportExcel() {
    setExporting(true);
    try {
      const qs = new URLSearchParams();
+      if (filters.status) qs.set('status', filters.status);
      if (filters.year) qs.set('year', filters.year);
      if (filters.month) qs.set('month', filters.month);
-      if (filters.deliveryType) qs.set('deliveryType', filters.deliveryType);
+      if (filters.dateFrom) qs.set('dateFrom', filters.dateFrom);
+      if (filters.dateTo) qs.set('dateTo', filters.dateTo);
      const result = await request<{ csv: string; count: number }>(`/admin/winery-bills/export?${qs}`);
      const suffix = filters.year && filters.month ? `${filters.year}-${filters.month}` : 'all';
-      downloadExcelCsv(result.csv, `酒厂账单_${suffix}.csv`);
+      downloadExcelCsv(result.csv, `酒厂对账单_${suffix}.csv`);
      message.success(`已导出 ${result.count} 条`);
    } finally {
      setExporting(false);
@@ -73,23 +128,22 @@ export default function WineryBillsPage() {

  const summary = data?.summary;
  const ratePct = Math.round(WINERY_SETTLEMENT_RATE * 100);
+  const selectedRows = (data?.items ?? []).filter((r) => selectedKeys.includes(r.id));
+  const selectedAmount = selectedRows.reduce((s, r) => s + Number(r.wineryAmount), 0);

  const columns: ColumnsType<Row> = [
-    { title: '订单号', dataIndex: 'orderNo', width: 180, ellipsis: true },
+    { title: '账单号', dataIndex: 'billNo', width: 170, ellipsis: true },
    {
-      title: '配送类型',
-      dataIndex: 'deliveryType',
-      width: 90,
-      render: (v) => <Tag>{DELIVERY_LABELS[v] || v}</Tag>,
-    },
-    { title: '开城城市', dataIndex: 'cityName', width: 100, render: (v) => v || '—' },
-    { title: '收货城市', dataIndex: 'receiverCity', width: 100, render: (v) => v || '—' },
-    { title: '商品', dataIndex: 'productName', width: 140, ellipsis: true },
-    { title: '数量', dataIndex: 'quantity', width: 70 },
-    {
-      title: '酒单实付',
-      dataIndex: 'payAmount',
+      title: '账单日',
+      dataIndex: 'billDate',
      width: 110,
+      render: (v) => String(v || '').slice(0, 10),
+    },
+    { title: '订单数', dataIndex: 'orderCount', width: 80 },
+    {
+      title: '酒单实付合计',
+      dataIndex: 'orderAmount',
+      width: 120,
      render: (v) => `¥${Number(v).toFixed(2)}`,
    },
    {
@@ -105,10 +159,27 @@ export default function WineryBillsPage() {
      render: (v) => `¥${Number(v).toFixed(2)}`,
    },
    {
-      title: '支付时间',
-      dataIndex: 'paidAt',
-      width: 170,
-      render: (v) => (v ? fmtTime(v) : '—'),
+      title: '状态',
+      dataIndex: 'status',
+      width: 90,
+      render: (s) => <Tag color={STATUS_COLORS[s] || 'default'}>{STATUS_LABELS[s] || s}</Tag>,
+    },
+    {
+      title: '操作',
+      width: 160,
+      fixed: 'right',
+      render: (_, row) => (
+        <Space size={0}>
+          <Button type="link" size="small" onClick={() => void openDetail(row.id)}>
+            明细
+          </Button>
+          {row.status === 'UNPAID' && (
+            <Button type="link" size="small" onClick={() => confirmPay([row.id], Number(row.wineryAmount))}>
+              确认打款
+            </Button>
+          )}
+        </Space>
+      ),
    },
  ];

@@ -116,19 +187,19 @@ export default function WineryBillsPage() {
    <div>
      <Space direction="vertical" size={0} style={{ marginBottom: 16 }}>
        <Typography.Title level={4} style={{ margin: 0 }}>
-          酒厂账单
+          酒厂对账单
        </Typography.Title>
        <Typography.Text type="secondary">
-          T+30 结算：按自然月列出同城/跨城已付酒单，应付 = 酒单实付 × {ratePct}%（暂定）
+          每日 8:00 汇总昨日已付订单（实付 × {ratePct}%）；未打款红色、已打款绿色，可展开订单明细
        </Typography.Text>
      </Space>

      {summary && (
        <Card size="small" style={{ marginBottom: 16 }}>
          <Space size="large" wrap>
-            <Statistic title="酒单数" value={summary.count} />
+            <Statistic title="账单数" value={summary.count} />
            <Statistic title="酒单实付合计" value={summary.orderAmount ?? 0} prefix="¥" precision={2} />
-            <Statistic title="酒厂应付合计" value={summary.wineryAmount ?? summary.totalAmount} prefix="¥" precision={2} />
+            <Statistic title="酒厂应付合计" value={summary.wineryAmount ?? 0} prefix="¥" precision={2} />
          </Space>
        </Card>
      )}
@@ -137,28 +208,30 @@ export default function WineryBillsPage() {
        form={form}
        layout="inline"
        style={{ marginBottom: 16 }}
-        onFinish={(v: { month?: Dayjs; deliveryType?: string }) => {
+        onFinish={(v: { status?: string; month?: Dayjs; range?: [Dayjs, Dayjs] }) => {
          setFilters({
+            status: v.status || '',
            year: v.month ? String(v.month.year()) : '',
            month: v.month ? String(v.month.month() + 1) : '',
-            deliveryType: v.deliveryType || '',
+            dateFrom: v.range?.[0] ? v.range[0].format('YYYY-MM-DD') : '',
+            dateTo: v.range?.[1] ? v.range[1].format('YYYY-MM-DD') : '',
          });
          setPage(1);
        }}
      >
-        <Form.Item name="month" label="账期月">
-          <DatePicker picker="month" />
-        </Form.Item>
-        <Form.Item name="deliveryType" label="配送类型">
+        <Form.Item name="status" label="状态">
          <Select
            allowClear
            style={{ width: 120 }}
-            options={[
-              { value: 'LOCAL', label: '同城' },
-              { value: 'CROSS_CITY', label: '跨城' },
-            ]}
+            options={Object.entries(STATUS_LABELS).map(([value, label]) => ({ value, label }))}
          />
        </Form.Item>
+        <Form.Item name="month" label="账期月">
+          <DatePicker picker="month" />
+        </Form.Item>
+        <Form.Item name="range" label="账单日">
+          <DatePicker.RangePicker />
+        </Form.Item>
        <Form.Item>
          <Button type="primary" htmlType="submit">
            查询
@@ -180,15 +253,29 @@ export default function WineryBillsPage() {
            导出 Excel
          </Button>
        </Form.Item>
+        <Form.Item>
+          <Button
+            type="primary"
+            disabled={!selectedKeys.length}
+            onClick={() => confirmPay(selectedKeys.map(String), selectedAmount)}
+          >
+            批量确认打款 ({selectedKeys.length})
+          </Button>
+        </Form.Item>
      </Form>

      <Table
-        rowKey="orderId"
+        rowKey="id"
        className="admin-table-nowrap"
        loading={loading}
        columns={columns}
        dataSource={data?.items ?? []}
-        scroll={{ x: 1200 }}
+        rowSelection={{
+          selectedRowKeys: selectedKeys,
+          onChange: setSelectedKeys,
+          getCheckboxProps: (r) => ({ disabled: r.status !== 'UNPAID' }),
+        }}
+        scroll={{ x: 1100 }}
        pagination={{
          current: page,
          pageSize,
@@ -200,6 +287,56 @@ export default function WineryBillsPage() {
          },
        }}
      />
+
+      <Drawer title="酒厂对账单明细" open={drawerOpen} onClose={() => setDrawerOpen(false)} width={640}>
+        {detail && (
+          <>
+            <Descriptions column={1} size="small" bordered>
+              <Descriptions.Item label="账单号">{detail.billNo}</Descriptions.Item>
+              <Descriptions.Item label="账单日">{String(detail.billDate).slice(0, 10)}</Descriptions.Item>
+              <Descriptions.Item label="酒厂应付">¥{Number(detail.wineryAmount).toFixed(2)}</Descriptions.Item>
+              <Descriptions.Item label="状态">{STATUS_LABELS[detail.status] || detail.status}</Descriptions.Item>
+              <Descriptions.Item label="打款时间">{detail.paidAt ? fmtTime(detail.paidAt) : '—'}</Descriptions.Item>
+            </Descriptions>
+            <Typography.Title level={5} style={{ marginTop: 16 }}>
+              订单明细
+            </Typography.Title>
+            <Table
+              size="small"
+              rowKey="id"
+              pagination={false}
+              dataSource={detail.items ?? []}
+              columns={[
+                { title: '订单号', dataIndex: 'orderNo', ellipsis: true },
+                {
+                  title: '配送',
+                  dataIndex: 'deliveryType',
+                  width: 70,
+                  render: (v) => DELIVERY_LABELS[v] || v,
+                },
+                {
+                  title: '实付',
+                  dataIndex: 'payAmount',
+                  width: 90,
+                  render: (v) => `¥${Number(v).toFixed(2)}`,
+                },
+                {
+                  title: '酒厂应付',
+                  dataIndex: 'wineryAmount',
+                  width: 90,
+                  render: (v) => `¥${Number(v).toFixed(2)}`,
+                },
+                {
+                  title: '支付时间',
+                  dataIndex: 'paidAt',
+                  width: 150,
+                  render: (v) => (v ? fmtTime(v) : '—'),
+                },
+              ]}
+            />
+          </>
+        )}
+      </Drawer>
    </div>
  );
 }