merge(dev): v4.0.8 客服卡片主包落地与微信内保存海报

merge(dev_jacy): v4.0.8 客服卡片主包落地与微信内保存海报
feat(mini): v4.0.8 客服卡片主包落地、定位误报修复，合伙人微信内预览保存海报
2026-09-01 15:24:31 +08:00 · 2026-09-01 15:24:19 +08:00 · 2026-09-01 15:23:52 +08:00 · 2026-09-01 15:12:48 +08:00 · 2026-09-01 15:12:28 +08:00 · 2026-09-01 15:12:10 +08:00
82 changed files with 2719 additions and 282 deletions
@@ -3,8 +3,10 @@
  <head>
    <meta charset="UTF-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="robots" content="noindex, nofollow, noarchive" />
+    <meta name="robots" content="noindex, nofollow, noarchive, nosnippet" />
-    <title>杜康好客 · HQ 管理后台</title>
+    <meta name="baiduspider" content="noindex, nofollow, noarchive, nosnippet" />
    <meta name="googlebot" content="noindex, nofollow, noarchive, nosnippet" />
    <title>管理后台</title>
  </head>
  <body>
    <div id="root"></div>
@@ -0,0 +1 @@
 1aacdfe9dcc03f68e4dd855f8c4c8f33
@@ -1,2 +1,2 @@
 User-agent: *
-Disallow: /
+Allow: /
@@ -0,0 +1,7 @@
 {
  "cleanUrls": false,
  "trailingSlash": false,
  "rewrites": [
    { "source": "**", "destination": "/index.html" }
  ]
 }
@@ -0,0 +1,100 @@
 import { useEffect, useState } from 'react';
 import { Form, Modal, Select, Typography, message } from 'antd';
 import type { ActivityPosterItem } from '@dukang/shared-types';
 import { request, requestDownload, type Paginated } from '../lib/api';
 import { ADMIN_OPTIONS_PAGE_SIZE } from '../lib/constants';
 type Props = {
  open: boolean;
  partnerIds: string[];
  onClose: () => void;
 };
 export default function ActivityPosterDownloadModal({ open, partnerIds, onClose }: Props) {
  const [posters, setPosters] = useState<ActivityPosterItem[]>([]);
  const [posterId, setPosterId] = useState<string>();
  const [loading, setLoading] = useState(false);
  const [submitting, setSubmitting] = useState(false);
  const multi = partnerIds.length > 1;
  useEffect(() => {
    if (!open) return;
    setPosterId(undefined);
    setLoading(true);
    void request<Paginated<ActivityPosterItem>>(
      `/admin/activity-posters?status=ACTIVE&page=1&pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`,
    )
      .then((res) => {
        const items = res.items ?? [];
        setPosters(items);
        setPosterId(items[0]?.id);
      })
      .catch((e) => message.error(e instanceof Error ? e.message : '加载活动图失败'))
      .finally(() => setLoading(false));
  }, [open]);
  async function submit() {
    if (!posterId) {
      message.error('请选择活动图');
      return;
    }
    if (!partnerIds.length) {
      message.error('请选择合伙人');
      return;
    }
    setSubmitting(true);
    try {
      if (partnerIds.length === 1) {
        await requestDownload(
          `/admin/activity-posters/${posterId}/image?partnerId=${encodeURIComponent(partnerIds[0])}`,
          {},
          'activity-poster.png',
        );
      } else {
        await requestDownload(
          `/admin/activity-posters/${posterId}/partner-pack`,
          { method: 'POST', body: JSON.stringify({ partnerIds }) },
          'activity-poster-pack.zip',
        );
      }
      message.success('已开始下载');
      onClose();
    } catch (e) {
      message.error(e instanceof Error ? e.message : '下载失败');
    } finally {
      setSubmitting(false);
    }
  }
  return (
    <Modal
      title={multi ? `导出活动图（${partnerIds.length} 人）` : '下载活动图'}
      open={open}
      onCancel={onClose}
      onOk={() => void submit()}
      confirmLoading={submitting}
      okText="下载"
      okButtonProps={{ disabled: loading || !posterId }}
      destroyOnClose
    >
      <Typography.Paragraph type="secondary">
        {multi
          ? '将把所选主合伙人的关联码贴进同一张活动图，打包为 zip。无关联码或测试账号会跳过。'
          : '将把该主合伙人的关联码贴进所选活动图后下载 PNG。'}
      </Typography.Paragraph>
      <Form layout="vertical">
        <Form.Item label="活动图" required>
          <Select
            loading={loading}
            placeholder={loading ? '加载中' : posters.length ? '选择已上架活动图' : '暂无上架活动图'}
            value={posterId}
            onChange={setPosterId}
            options={posters.map((row) => ({ value: row.id, label: row.title }))}
            showSearch
            optionFilterProp="label"
          />
        </Form.Item>
      </Form>
    </Modal>
  );
 }
@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import {
  Button,
  Checkbox,
@@ -7,6 +8,7 @@ import {
  Input,
  InputNumber,
  Modal,
  Popconfirm,
  Select,
  Space,
  Table,
@@ -42,6 +44,7 @@ type PartnerRow = {
  districtCodes?: string[] | null;
  orderCommissionRate?: number;
  redeemCommissionRate?: number;
  storeCount?: number;
  accountCount: number;
  createdAt: string;
 };
@@ -121,6 +124,7 @@ export default function CityPartnersPanel({
  maxPartnerCommissionRate = 0.05,
  onChanged,
 }: Props) {
  const navigate = useNavigate();
  const [editForm] = Form.useForm();
  const [createForm] = Form.useForm();
  const [subForm] = Form.useForm();
@@ -204,6 +208,31 @@ export default function CityPartnersPanel({
    }
  }
  async function deletePartner(row: { id: string; storeCount?: number }) {
    if ((row.storeCount ?? 0) > 0) {
      Modal.warning({
        title: '请先删除门店',
        content: `该城市合伙人下还有 ${row.storeCount} 家门店，请先删除门店后再删除合伙人。`,
        okText: '查看门店',
        onOk: () => navigate(`/stores?partnerId=${row.id}`),
      });
      return;
    }
    try {
      await request(`/admin/partners/${row.id}`, { method: 'DELETE' });
      message.success('城市合伙人已删除');
      if (detail?.id === row.id) {
        setDrawerOpen(false);
        setDetail(null);
      }
      void loadPartners();
      onChanged?.();
    } catch (e) {
      const msg = formatApiError(e);
      if (msg) message.error(msg);
    }
  }
  async function deleteSubAccount(subId: string) {
    await request(`/admin/partner-accounts/${subId}`, { method: 'DELETE' });
    message.success('子账号已删除');
@@ -237,11 +266,24 @@ export default function CityPartnersPanel({
    { title: '创建', dataIndex: 'createdAt', width: 150, render: fmtTime },
    {
      title: '操作',
-      width: 80,
+      width: 140,
      render: (_, row) => (
-        <Button type="link" size="small" onClick={() => void openPartner(row.id)}>
+        <Space size={0}>
-          管理
+          <Button type="link" size="small" onClick={() => void openPartner(row.id)}>
-        </Button>
+            管理
          </Button>
          <Popconfirm
            title="确认删除该城市合伙人？"
            description="若有门店需先删除门店；账号下有订单或核销单将禁止删除。"
            okText="删除"
            okButtonProps={{ danger: true }}
            onConfirm={() => void deletePartner(row)}
          >
            <Button type="link" size="small" danger>
              删除
            </Button>
          </Popconfirm>
        </Space>
      ),
    },
  ];
@@ -272,7 +314,22 @@ export default function CityPartnersPanel({
        width={640}
        open={drawerOpen}
        onClose={() => setDrawerOpen(false)}
-        extra={<Button type="primary" onClick={() => void savePartner()}>保存</Button>}
+        extra={
          <Space>
            {detail ? (
              <Popconfirm
                title="确认删除该城市合伙人？"
                description="若有门店需先删除门店；账号下有订单或核销单将禁止删除。"
                okText="删除"
                okButtonProps={{ danger: true }}
                onConfirm={() => void deletePartner(detail)}
              >
                <Button danger>删除</Button>
              </Popconfirm>
            ) : null}
            <Button type="primary" onClick={() => void savePartner()}>保存</Button>
          </Space>
        }
      >
        {detail && (
          <Tabs
@@ -5,6 +5,7 @@ import type { ColumnsType } from 'antd/es/table';
 import type { PartnerAssocSummary, PartnerAssocUserItem } from '@dukang/shared-types';
 import { request, type HqProfile, type Paginated } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import ActivityPosterDownloadModal from './ActivityPosterDownloadModal';
 function formatNicknameWithRemark(row: PartnerAssocUserItem) {
  const name = row.nickname?.trim() || '—';
@@ -24,6 +25,8 @@ export default function PartnerAssocPanel({ partnerId }: PartnerAssocPanelProps)
  const [loading, setLoading] = useState(false);
  const [issuing, setIssuing] = useState(false);
  const [canEditAssoc, setCanEditAssoc] = useState(false);
  const [canDownloadPosters, setCanDownloadPosters] = useState(false);
  const [posterDownloadOpen, setPosterDownloadOpen] = useState(false);
  const loadSummary = useCallback(async () => {
    const data = await request<PartnerAssocSummary>(`/admin/partners/${partnerId}/assoc`);
@@ -46,8 +49,15 @@ export default function PartnerAssocPanel({ partnerId }: PartnerAssocPanelProps)
  useEffect(() => {
    void request<HqProfile>('/admin/auth/me')
-      .then((p) => setCanEditAssoc((p.permissionKeys ?? []).includes('users_partner_assoc')))
+      .then((p) => {
-      .catch(() => setCanEditAssoc(false));
+        const keys = p.permissionKeys ?? [];
        setCanEditAssoc(keys.includes('users_partner_assoc'));
        setCanDownloadPosters(keys.includes('activity_posters'));
      })
      .catch(() => {
        setCanEditAssoc(false);
        setCanDownloadPosters(false);
      });
  }, []);
  useEffect(() => {
@@ -130,6 +140,9 @@ export default function PartnerAssocPanel({ partnerId }: PartnerAssocPanelProps)
          <Button loading={issuing} onClick={() => void reissue()}>
            {summary?.qrcodeUrl ? '补发关联码' : '生成关联码'}
          </Button>
          {canDownloadPosters ? (
            <Button onClick={() => setPosterDownloadOpen(true)}>下载活动图</Button>
          ) : null}
        </div>
      </Space>
      <Table
@@ -145,6 +158,11 @@ export default function PartnerAssocPanel({ partnerId }: PartnerAssocPanelProps)
          onChange: (p) => void loadUsers(p),
        }}
      />
      <ActivityPosterDownloadModal
        open={posterDownloadOpen}
        partnerIds={[partnerId]}
        onClose={() => setPosterDownloadOpen(false)}
      />
    </div>
  );
 }
@@ -58,6 +58,54 @@ export async function request<T>(path: string, options: RequestInit = {}): Promi
  return json.data as T;
 }
 function parseDownloadFileName(header: string | null, fallback: string): string {
  if (!header) return fallback;
  const star = /filename\*=(?:UTF-8''|utf-8'')([^;]+)/i.exec(header);
  if (star?.[1]) {
    try {
      return decodeURIComponent(star[1].trim());
    } catch {
      /* ignore */
    }
  }
  const quoted = /filename="([^"]+)"/i.exec(header);
  if (quoted?.[1]) return quoted[1];
  const plain = /filename=([^;]+)/i.exec(header);
  return plain?.[1]?.trim() || fallback;
 }
 /** Binary download (PNG / zip). JSON error bodies are surfaced as Error. */
 export async function requestDownload(path: string, options: RequestInit = {}, fallbackName: string) {
  const headers: Record<string, string> = {
    'X-Client-App': CLIENT_APP,
    ...(options.headers as Record<string, string>),
  };
  if (options.body && !headers['Content-Type']) headers['Content-Type'] = 'application/json';
  const token = getToken();
  if (token) headers.Authorization = `Bearer ${token}`;
  const res = await fetch(`${apiBase}${path}`, { ...options, headers });
  const contentType = res.headers.get('content-type') || '';
  if (contentType.includes('application/json')) {
    const json = (await res.json()) as { code?: number; message?: string };
    if (json.code === 401) {
      clearAuth();
      window.location.href = '/login';
      throw new Error('未登录');
    }
    throw new Error(json.message || '下载失败');
  }
  if (!res.ok) throw new Error(`下载失败（HTTP ${res.status}）`);
  const blob = await res.blob();
  const fileName = parseDownloadFileName(res.headers.get('content-disposition'), fallbackName);
  const url = URL.createObjectURL(blob);
  const a = document.createElement('a');
  a.href = url;
  a.download = fileName;
  a.click();
  URL.revokeObjectURL(url);
 }
 export type Paginated<T> = {
  items: T[];
  total: number;
@@ -1,6 +1,7 @@
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { Link, useSearchParams } from 'react-router-dom';
 import {
-  Button, Form, Image, Input, InputNumber, Modal, Popconfirm, Select, Space, Table, Tag, message,
+  Alert, Button, Form, Image, Input, InputNumber, Modal, Popconfirm, Select, Space, Table, Tag, message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import {
@@ -10,7 +11,7 @@ import {
  type ActivityPosterQrSlot,
  type ActivityPosterStatus,
 } from '@dukang/shared-types';
-import { request } from '../lib/api';
+import { request, requestDownload } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
@@ -30,7 +31,16 @@ type FormValues = {
  status?: ActivityPosterStatus;
 };
 type PartnerHint = {
  id: string;
  companyName?: string | null;
  name?: string;
  phone?: string;
 };
 export default function ActivityPostersPage() {
  const [searchParams] = useSearchParams();
  const partnerId = searchParams.get('partnerId')?.trim() || '';
  const [form] = Form.useForm();
  const [editForm] = Form.useForm<FormValues>();
  const [filters, setFilters] = useState<Record<string, string>>({});
@@ -45,6 +55,8 @@ export default function ActivityPostersPage() {
  );
  const [modalOpen, setModalOpen] = useState(false);
  const [editing, setEditing] = useState<ActivityPosterItem | null>(null);
  const [partnerHint, setPartnerHint] = useState<PartnerHint | null>(null);
  const [downloadingId, setDownloadingId] = useState<string | null>(null);
  const imageUrl = Form.useWatch('imageUrl', editForm);
  const qrXPct = Form.useWatch('qrXPct', editForm);
@@ -56,6 +68,20 @@ export default function ActivityPostersPage() {
    qrSizePct: qrSizePct ?? DEFAULT_ACTIVITY_POSTER_QR_SLOT.qrSizePct,
  };
  useEffect(() => {
    if (!partnerId) {
      setPartnerHint(null);
      return;
    }
    void request<PartnerHint>(`/admin/partners/${partnerId}`)
      .then(setPartnerHint)
      .catch(() => setPartnerHint({ id: partnerId }));
  }, [partnerId]);
  const partnerLabel = partnerHint
    ? (partnerHint.companyName || partnerHint.name || partnerHint.phone || partnerHint.id)
    : partnerId;
  function openCreate() {
    setEditing(null);
    editForm.setFieldsValue({
@@ -98,6 +124,23 @@ export default function ActivityPostersPage() {
    void reload();
  }
  async function downloadForPartner(posterId: string) {
    if (!partnerId) return;
    setDownloadingId(posterId);
    try {
      await requestDownload(
        `/admin/activity-posters/${posterId}/image?partnerId=${encodeURIComponent(partnerId)}`,
        {},
        'activity-poster.png',
      );
      message.success('已开始下载');
    } catch (e) {
      message.error(e instanceof Error ? e.message : '下载失败');
    } finally {
      setDownloadingId(null);
    }
  }
  const baseColumns: ColumnsType<ActivityPosterItem> = [
    {
      title: '标题',
@@ -129,10 +172,20 @@ export default function ActivityPostersPage() {
    { title: '更新', dataIndex: 'updatedAt', width: 160, render: fmtTime },
    {
      title: '操作',
-      width: 200,
+      width: partnerId ? 280 : 200,
      render: (_, row) => (
        <Space>
          <Button type="link" size="small" onClick={() => openEdit(row)}>编辑</Button>
          {partnerId && row.status === 'ACTIVE' ? (
            <Button
              type="link"
              size="small"
              loading={downloadingId === row.id}
              onClick={() => void downloadForPartner(row.id)}
            >
              为该合伙人下载
            </Button>
          ) : null}
          <Button
            type="link"
            size="small"
@@ -176,6 +229,19 @@ export default function ActivityPostersPage() {
        settings={settingsButton}
        actions={<Button type="primary" onClick={openCreate}>新建活动图</Button>}
      />
      {partnerId ? (
        <Alert
          type="info"
          showIcon
          style={{ marginBottom: 16 }}
          message={
            <>
              正在为合伙人「{partnerLabel}」下载活动图。点行内「为该合伙人下载」，或返回{' '}
              <Link to="/city-partners">城市合伙人</Link>。
            </>
          }
        />
      ) : null}
      <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
        <Form.Item name="status" label="状态">
          <Select
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useState } from 'react';
-import { Link } from 'react-router-dom';
+import { Link, useNavigate } from 'react-router-dom';
 import {
  Alert,
  Button,
@@ -30,7 +30,6 @@ import {
  PARTNER_STAFF_ROLE_LABELS,
  type PartnerPermissionKey,
 } from '@dukang/shared-types';
 import { request, type Paginated } from '../lib/api';
 import { omitNullFields } from '../lib/omit-null-fields';
 import { districtCodeLabel, formatDistrictLabels } from '../lib/china-region';
 import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
@@ -38,9 +37,11 @@ import { useAdminList } from '../lib/useAdminList';
 import CityDistrictMultiSelect from '../components/CityDistrictMultiSelect';
 import PartnerSubAccountList, { type PartnerSubAccountRow } from '../components/PartnerSubAccountList';
 import PartnerAssocPanel from '../components/PartnerAssocPanel';
 import ActivityPosterDownloadModal from '../components/ActivityPosterDownloadModal';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
 import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 import { request, type HqProfile, type Paginated } from '../lib/api';
 type SubRow = PartnerSubAccountRow;
@@ -127,6 +128,7 @@ function formatApiError(err: unknown): string | null {
 }
 export default function CityPartnersPage() {
  const navigate = useNavigate();
  const [filterForm] = Form.useForm();
  const [editForm] = Form.useForm();
  const [createForm] = Form.useForm();
@@ -158,6 +160,9 @@ export default function CityPartnersPage() {
  const [maxCommissionRate, setMaxCommissionRate] = useState(0.05);
  const [createMaxRate, setCreateMaxRate] = useState(0.05);
  const [createCityCode, setCreateCityCode] = useState<string | undefined>();
  const [selectedRowKeys, setSelectedRowKeys] = useState<string[]>([]);
  const [posterDownloadIds, setPosterDownloadIds] = useState<string[] | null>(null);
  const [canDownloadPosters, setCanDownloadPosters] = useState(false);
  const loadCities = useCallback(async () => {
    const res = await request<Paginated<CityOption>>(`/admin/cities?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`);
@@ -168,6 +173,12 @@ export default function CityPartnersPage() {
    void loadCities();
  }, [loadCities]);
  useEffect(() => {
    void request<HqProfile>('/admin/auth/me')
      .then((p) => setCanDownloadPosters((p.permissionKeys ?? []).includes('activity_posters')))
      .catch(() => setCanDownloadPosters(false));
  }, []);
  const editCityCode = detail?.cityId
    ? cities.find((c) => c.id === detail.cityId)?.code
    : undefined;
@@ -234,6 +245,30 @@ export default function CityPartnersPage() {
    void reload();
  }
  async function deletePartner(row: { id: string; storeCount?: number }) {
    if ((row.storeCount ?? 0) > 0) {
      Modal.warning({
        title: '请先删除门店',
        content: `该城市合伙人下还有 ${row.storeCount} 家门店，请先删除门店后再删除合伙人。`,
        okText: '查看门店',
        onOk: () => navigate(`/stores?partnerId=${row.id}`),
      });
      return;
    }
    try {
      await request(`/admin/partners/${row.id}`, { method: 'DELETE' });
      message.success('城市合伙人已删除');
      if (detail?.id === row.id) {
        setDrawerOpen(false);
        setDetail(null);
      }
      void reload();
    } catch (e) {
      const msg = formatApiError(e);
      if (msg) message.error(msg);
    }
  }
  async function deleteSubAccount(subId: string, parentId: string) {
    await request(`/admin/partner-accounts/${subId}`, { method: 'DELETE' });
    message.success('子账号已删除');
@@ -348,16 +383,46 @@ export default function CityPartnersPage() {
        </Link>
      ),
    },
    {
      title: '活动图',
      width: 70,
      render: (_, row) => (
        <Link
          to={`/activity-posters?partnerId=${encodeURIComponent(row.id)}`}
          title={`为「${row.companyName || row.phone}」下载活动图`}
        >
          查看
        </Link>
      ),
    },
    { title: '子账号', dataIndex: 'accountCount', width: 70, render: (n) => Math.max(0, n - 1) },
    { title: '创建', dataIndex: 'createdAt', width: 150, render: fmtTime },
    {
      title: '操作',
-      width: 80,
+      width: 220,
      fixed: 'right',
      render: (_, row) => (
-        <Button type="link" size="small" onClick={() => void openPartner(row.id)}>
+        <Space size={0}>
-          管理
+          <Button type="link" size="small" onClick={() => void openPartner(row.id)}>
-        </Button>
+            管理
          </Button>
          {canDownloadPosters ? (
            <Button type="link" size="small" onClick={() => setPosterDownloadIds([row.id])}>
              下载活动图
            </Button>
          ) : null}
          <Popconfirm
            title="确认删除该城市合伙人？"
            description="若有门店需先删除门店；账号下有订单或核销单将禁止删除。"
            okText="删除"
            okButtonProps={{ danger: true }}
            onConfirm={() => void deletePartner(row)}
          >
            <Button type="link" size="small" danger>
              删除
            </Button>
          </Popconfirm>
        </Space>
      ),
    },
  ];
@@ -372,7 +437,16 @@ export default function CityPartnersPage() {
        settings={settingsButton}
        actions={
          <>
            <Link to="/activity-posters">活动图</Link>
            <Link to="/users?assocPartnerAccountId=any">全部关联用户</Link>
            {canDownloadPosters ? (
              <Button
                disabled={!selectedRowKeys.length}
                onClick={() => setPosterDownloadIds(selectedRowKeys)}
              >
                导出活动图{selectedRowKeys.length ? `（${selectedRowKeys.length}）` : ''}
              </Button>
            ) : null}
            <Button
            type="primary"
            onClick={() => {
@@ -460,6 +534,14 @@ export default function CityPartnersPage() {
        dataSource={toTableRows(data?.items ?? [])}
        scroll={{ x: 'max-content' }}
        childrenColumnName="__noTreeChildren__"
        rowSelection={
          canDownloadPosters
            ? {
                selectedRowKeys,
                onChange: (keys) => setSelectedRowKeys(keys.map(String)),
              }
            : undefined
        }
        expandable={{
          expandedRowRender: (record) => (
            <PartnerSubAccountList
@@ -491,9 +573,22 @@ export default function CityPartnersPage() {
        open={drawerOpen}
        onClose={() => setDrawerOpen(false)}
        extra={
-          <Button type="primary" onClick={() => void savePartner()}>
+          <Space>
-            保存
+            {detail ? (
-          </Button>
+              <Popconfirm
                title="确认删除该城市合伙人？"
                description="若有门店需先删除门店；账号下有订单或核销单将禁止删除。"
                okText="删除"
                okButtonProps={{ danger: true }}
                onConfirm={() => void deletePartner(detail)}
              >
                <Button danger>删除</Button>
              </Popconfirm>
            ) : null}
            <Button type="primary" onClick={() => void savePartner()}>
              保存
            </Button>
          </Space>
        }
      >
        {detail && (
@@ -513,6 +608,21 @@ export default function CityPartnersPage() {
                  {detail.assocUserCount ?? 0}
                </Link>
              </Descriptions.Item>
              <Descriptions.Item label="活动图">
                <Space>
                  <Link
                    to={`/activity-posters?partnerId=${encodeURIComponent(detail.id)}`}
                    title="查看活动图并下载该合伙人合成图"
                  >
                    查看
                  </Link>
                  {canDownloadPosters ? (
                    <Button type="link" size="small" onClick={() => setPosterDownloadIds([detail.id])}>
                      下载
                    </Button>
                  ) : null}
                </Space>
              </Descriptions.Item>
              <Descriptions.Item label="管仓仓库" span={2}>
                {detail.managedWarehouseName ?? (
                  <Typography.Text type="secondary">
@@ -761,6 +871,12 @@ export default function CityPartnersPage() {
          </Form.Item>
        </Form>
      </Modal>
      <ActivityPosterDownloadModal
        open={posterDownloadIds != null && posterDownloadIds.length > 0}
        partnerIds={posterDownloadIds ?? []}
        onClose={() => setPosterDownloadIds(null)}
      />
    </div>
  );
 }
@@ -274,7 +274,14 @@ export default function DevPlanTasksPage() {
        <Tag color={STATUS_COLOR[s]}>{DEV_PLAN_TASK_STATUS_LABELS[s]}</Tag>
      ),
    },
-    { title: '内容', dataIndex: 'content' },
+    {
      title: '内容',
      dataIndex: 'content',
      width: 360,
      render: (v: string) => (
        <div style={{ whiteSpace: 'pre-wrap', wordBreak: 'break-word', maxWidth: 480 }}>{v}</div>
      ),
    },
    {
      title: '附件',
      width: 100,
@@ -57,6 +57,7 @@ type Row = {
  redeemItems?: BillItemRow[];
  partner?: {
    companyName?: string;
    name?: string;
    phone?: string;
    bankAccountName?: string | null;
    bankAccountNo?: string | null;
@@ -64,6 +65,7 @@ type Row = {
  };
  partnerAccount?: {
    companyName?: string;
    name?: string;
    phone?: string;
    bankAccountName?: string | null;
    bankAccountNo?: string | null;
@@ -71,7 +73,7 @@ type Row = {
  };
 };
-type PartnerOption = { id: string; companyName: string; phone?: string };
+type PartnerOption = { id: string; companyName?: string | null; name?: string | null; phone?: string };
 const STATUS_LABELS: Record<string, string> = {
  PENDING_REVIEW: '待审核',
@@ -89,6 +91,18 @@ const STATUS_COLORS: Record<string, string> = {
  REJECTED: 'red',
 };
 function partnerDashLabel(p?: {
  companyName?: string | null;
  name?: string | null;
  phone?: string | null;
 } | null): string {
  if (!p) return '—';
  const company = (p.companyName || '').trim();
  const person = (p.name || '').trim();
  if (company && person) return `${company}-${person}`;
  return company || person || (p.phone || '').trim() || '—';
 }
 export default function PartnerBillsPage() {
  const [form] = Form.useForm();
  const [filters, setFilters] = useState<Record<string, string>>({});
@@ -257,7 +271,7 @@ export default function PartnerBillsPage() {
  }
  const summary = data?.summary;
-  const partnerName = (r: Row) => r.partner?.companyName || r.partnerAccount?.companyName || '—';
+  const partnerName = (r: Row) => partnerDashLabel(r.partnerAccount ?? r.partner);
  const partnerBank = (r: Row) => r.partnerAccount ?? r.partner;
  const selectedRows = (data?.items ?? []).filter((r) => selectedKeys.includes(r.id));
  const canSend = selectedRows.filter((r) => r.status === 'PENDING_REVIEW' || r.status === 'REJECTED');
@@ -275,7 +289,7 @@ export default function PartnerBillsPage() {
    },
    {
      title: '合伙人',
-      width: 160,
+      width: 200,
      render: (_, r) => partnerName(r),
    },
    {
@@ -406,7 +420,7 @@ export default function PartnerBillsPage() {
            optionFilterProp="label"
            options={partners.map((p) => ({
              value: p.id,
-              label: p.companyName || p.phone || p.id,
+              label: partnerDashLabel(p),
            }))}
          />
        </Form.Item>
@@ -503,7 +517,7 @@ export default function PartnerBillsPage() {
              placeholder="全部主合伙人"
              options={partners.map((p) => ({
                value: p.id,
-                label: p.companyName || p.phone || p.id,
+                label: partnerDashLabel(p),
              }))}
            />
          </Form.Item>
@@ -12,6 +12,7 @@ import {
  Input,
  InputNumber,
  Modal,
  Popconfirm,
  Select,
  Space,
  Steps,
@@ -302,6 +303,7 @@ export default function StoresPage() {
  const [categoryTree, setCategoryTree] = useState<CategoryNode[]>([]);
  const [optionsLoading, setOptionsLoading] = useState(false);
  const [saving, setSaving] = useState(false);
  const [deleting, setDeleting] = useState(false);
  const [phoneMismatch, setPhoneMismatch] = useState<string | null>(null);
  const deepLinkStoreOpenedRef = useRef(false);
@@ -372,6 +374,23 @@ export default function StoresPage() {
      .map((n) => ({ value: n.id, label: n.name }));
  }, [categoryTree, editCategoryParentId]);
  async function deleteStore(id: string) {
    setDeleting(true);
    try {
      await request(`/admin/stores/${id}`, { method: 'DELETE' });
      message.success('门店及门店账号已删除');
      if (detail && String(detail.id) === id) {
        setDrawerOpen(false);
        setDetail(null);
      }
      void reload();
    } catch (e) {
      message.error(e instanceof Error ? e.message : '删除失败');
    } finally {
      setDeleting(false);
    }
  }
  async function openStoreDetail(row: StoreRow, opts?: { tab?: string }) {
    const [d, cats] = await Promise.all([
      request<Record<string, unknown>>(`/admin/stores/${row.id}`),
@@ -821,7 +840,7 @@ export default function StoresPage() {
    {
      key: 'actions',
      title: '操作',
-      width: 280,
+      width: 320,
      fixed: 'right',
      render: (_, row) => (
        <Space size={0} wrap>
@@ -861,6 +880,17 @@ export default function StoresPage() {
          >
            提现
          </Button>
          <Popconfirm
            title="确认删除该门店？"
            description="将同时删除门店账号；若有关联订单或核销单将禁止删除。"
            okText="删除"
            okButtonProps={{ danger: true }}
            onConfirm={() => void deleteStore(row.id)}
          >
            <Button type="link" size="small" danger>
              删除
            </Button>
          </Popconfirm>
        </Space>
      ),
    },
@@ -1034,6 +1064,17 @@ export default function StoresPage() {
                void reload();
              }} />
            <Button type="primary" loading={saving} onClick={() => void saveStoreDetail()}>保存修改</Button>
            {detail?.id ? (
              <Popconfirm
                title="确认删除该门店？"
                description="将同时删除门店账号；若有关联订单或核销单将禁止删除。"
                okText="删除"
                okButtonProps={{ danger: true }}
                onConfirm={() => void deleteStore(String(detail.id))}
              >
                <Button danger loading={deleting}>删除门店</Button>
              </Popconfirm>
            ) : null}
          </Space>
        )}>
        {detail && (
@@ -19,6 +19,7 @@ import {
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import type { Dayjs } from 'dayjs';
 import dayjs from 'dayjs';
 import {
  WINERY_SETTLEMENT_RATE,
  type SystemConfigFormResponse,
@@ -95,6 +96,7 @@ function canConfirmWineryPay(row: { status: string; wineryAmount: number | strin
 const DELIVERY_LABELS: Record<string, string> = {
  LOCAL: '同城',
  CROSS_CITY: '跨城',
  ON_SITE_PICKUP: '现场提货',
 };
 const WINERY_BANK_KEYS = [
@@ -107,6 +109,7 @@ const WINERY_BANK_KEYS = [
 export default function WineryBillsPage() {
  const [form] = Form.useForm();
  const [bankForm] = Form.useForm<Record<string, string>>();
  const [reconcileForm] = Form.useForm<{ range?: [Dayjs, Dayjs] }>();
  const [filters, setFilters] = useState<Record<string, string>>({});
  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<Row>(
    '/admin/winery-bills',
@@ -122,6 +125,8 @@ export default function WineryBillsPage() {
    [filters],
  );
  const [exporting, setExporting] = useState(false);
  const [reconciling, setReconciling] = useState(false);
  const [reconcileOpen, setReconcileOpen] = useState(false);
  const [selectedKeys, setSelectedKeys] = useState<React.Key[]>([]);
  const [detail, setDetail] = useState<(Row & { items?: BillItem[] }) | null>(null);
  const [drawerOpen, setDrawerOpen] = useState(false);
@@ -200,6 +205,33 @@ export default function WineryBillsPage() {
    }
  }
  async function runReconcile(values: { range?: [Dayjs, Dayjs] }) {
    setReconciling(true);
    try {
      const body: { dateFrom?: string; dateTo?: string } = {};
      if (values.range?.[0]) body.dateFrom = values.range[0].format('YYYY-MM-DD');
      if (values.range?.[1]) body.dateTo = values.range[1].format('YYYY-MM-DD');
      const result = await request<{
        generated: number;
        skipped: number;
        orphanOrders: number;
        days: number;
      }>('/admin/winery-bills/reconcile', {
        method: 'POST',
        body: JSON.stringify(body),
      });
      message.success(
        `核对完成：重算 ${result.generated} 天，跳过 ${result.skipped} 天，补入孤儿订单 ${result.orphanOrders} 笔`,
      );
      setReconcileOpen(false);
      reload();
    } catch (e) {
      message.error(e instanceof Error ? e.message : '核对失败');
    } finally {
      setReconciling(false);
    }
  }
  async function openBankModal() {
    setBankOpen(true);
    setBankLoading(true);
@@ -314,13 +346,18 @@ export default function WineryBillsPage() {
      <AdminListHeader
        title="酒厂对账单"
        settings={settingsButton}
-        description={`T+3：每日 8:00 汇总 3 天前（自然日）已完成的同城/跨城订单（实付 × ${ratePct}%）；未打款红色、已打款绿色、应付为 0 无需打款（灰），可展开订单明细`}
+        description={`T+3：每 3 天出一期（相对 2026-08-01），纳入上期 3 天同城/跨城/现场提货已付已完成订单（实付 × ${ratePct}%）；应付为 0 仍出账「无需打款」`}
        actions={
-          canEditWineryBank ? (
+          <Space>
-            <Button type="default" onClick={() => void openBankModal()}>
+            <Button type="primary" onClick={() => setReconcileOpen(true)}>
-              酒厂银行账户信息配置
+              核对补生成
            </Button>
-          ) : null
+            {canEditWineryBank ? (
              <Button type="default" onClick={() => void openBankModal()}>
                酒厂银行账户信息配置
              </Button>
            ) : null}
          </Space>
        }
      />
@@ -530,6 +567,32 @@ export default function WineryBillsPage() {
          </Form.Item>
        </Form>
      </Modal>
      <Modal
        title="核对补生成酒厂账单"
        open={reconcileOpen}
        onCancel={() => setReconcileOpen(false)}
        footer={null}
        destroyOnClose
      >
        <Typography.Paragraph type="secondary" style={{ marginBottom: 12 }}>
          核对时会补齐同城配送、跨城配送、现场提货的已付已完成订单；并修复历史现场单缺完成时间的问题。
          实付或应付为 0 也会出账，状态显示为「无需打款」。已打款账单不回刷。
        </Typography.Paragraph>
        <Form
          form={reconcileForm}
          layout="vertical"
          initialValues={{ range: [dayjs().subtract(60, 'day'), dayjs()] }}
          onFinish={(v) => void runReconcile(v)}
        >
          <Form.Item name="range" label="出账日区间（可留空则默认近 60 天）">
            <DatePicker.RangePicker style={{ width: '100%' }} />
          </Form.Item>
          <Button type="primary" htmlType="submit" block loading={reconciling}>
            开始核对
          </Button>
        </Form>
      </Modal>
    </div>
  );
 }
@@ -3,7 +3,8 @@
  <head>
    <meta charset="UTF-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, viewport-fit=cover" />
-    <meta name="robots" content="noindex, nofollow, noarchive" />
+    <meta name="robots" content="noindex, nofollow, noarchive, nosnippet" />
    <meta name="baiduspider" content="noindex, nofollow, noarchive, nosnippet" />
    <title>城市合伙人</title>
    <link rel="preconnect" href="https://fonts.googleapis.com" />
    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
@@ -1,2 +1,2 @@
 User-agent: *
-Disallow: /
+Allow: /
@@ -11,6 +11,7 @@ import {
  saveActivityPosterSelection,
 } from '../lib/activity-posters';
 import { toastError, toastSuccess } from '../lib/toast';
 import { blobToDataUrl, isHttpImageUrl, previewSaveableImage } from '../lib/wechat-save-image';
 import { isWechatEnv } from '../lib/weixin';
 const NONE_ID = 'none';
@@ -98,11 +99,13 @@ export default function ActivityPosterPicker({ initialId }: Props) {
    setDownloading(true);
    try {
      if (selectedId === NONE_ID) {
        if (isWechatEnv() && isHttpImageUrl(qrcodeUrl)) {
          await previewSaveableImage(qrcodeUrl);
          return;
        }
        const blob = await fetchAssocQrcodeImage();
        if (isWechatEnv()) {
-          const url = URL.createObjectURL(blob);
+          setQrcodeUrl(await blobToDataUrl(blob));
          urlsRef.current.push(url);
          setQrcodeUrl(url);
          toastSuccess('请长按上方图片保存到相册');
          return;
        }
@@ -118,9 +121,8 @@ export default function ActivityPosterPicker({ initialId }: Props) {
      }
      if (isWechatEnv()) {
        let url = previewUrls[selected.id];
-        if (!url) {
+        if (!url || url.startsWith('blob:')) {
-          url = URL.createObjectURL(blob);
+          url = await blobToDataUrl(blob);
          urlsRef.current.push(url);
          setPreviewUrls((prev) => ({ ...prev, [selected.id]: url }));
        }
        toastSuccess('请长按上方图片保存到相册');
@@ -172,7 +174,7 @@ export default function ActivityPosterPicker({ initialId }: Props) {
          <div className="partner-activity-panel">
            {qrcodeUrl ? (
              <div className="partner-activity-preview partner-activity-preview--qr">
-                <img src={qrcodeUrl} alt="关联码" />
+                <img className="partner-longpress-img" src={qrcodeUrl} alt="关联码" />
              </div>
            ) : (
              <p className="body-md text-muted" style={{ marginBottom: 12 }}>关联码尚未生成</p>
@@ -200,7 +202,7 @@ export default function ActivityPosterPicker({ initialId }: Props) {
          {selectedId === item.id && (
            <div className="partner-activity-panel">
              <div className="partner-activity-preview">
-                <img src={previewUrl || item.imageUrl} alt={item.title} />
+                <img className="partner-longpress-img" src={previewUrl || item.imageUrl} alt={item.title} />
                {previewLoading && !previewUrl && (
                  <div className="partner-activity-preview-mask">正在贴入二维码…</div>
                )}
@@ -0,0 +1,31 @@
 import { isHttpImageUrl } from '@dukang/weixin-sdk';
 import { toastSuccess } from './toast';
 import { isWechatEnv, weixinSdk } from './weixin';
 export { isHttpImageUrl };
 export function blobToDataUrl(blob: Blob): Promise<string> {
  return new Promise((resolve, reject) => {
    const reader = new FileReader();
    reader.onload = () => resolve(String(reader.result || ''));
    reader.onerror = () => reject(new Error('读取图片失败'));
    reader.readAsDataURL(blob);
  });
 }
 /**
 * 微信内用 previewImage 打开可公网访问的图片，用户长按即可保存。
 * blob / data URL 不能走该接口。
 */
 export async function previewSaveableImage(url: string): Promise<boolean> {
  const href = url.trim();
  if (!isWechatEnv() || !isHttpImageUrl(href)) return false;
  try {
    await weixinSdk.previewImage(href);
    toastSuccess('请长按图片保存到相册');
    return true;
  } catch {
    toastSuccess('请长按上方图片保存到相册');
    return false;
  }
 }
@@ -4,6 +4,7 @@ import PageHeader from '@dukang/shared-ui/PageHeader';
 import type { PartnerAssocSummary } from '@dukang/shared-types';
 import { request } from '../lib/api';
 import { toastError, toastSuccess } from '../lib/toast';
 import { isHttpImageUrl, previewSaveableImage } from '../lib/wechat-save-image';
 import { isWechatEnv } from '../lib/weixin';
 import { usePartnerPageView } from '../lib/usePageView';
@@ -11,7 +12,6 @@ export default function AssocQrcodePage() {
  usePartnerPageView('partner_assoc_qrcode_view');
  const navigate = useNavigate();
  const [summary, setSummary] = useState<PartnerAssocSummary | null>(null);
  const [previewUrl, setPreviewUrl] = useState<string | null>(null);
  const [loading, setLoading] = useState(true);
  useEffect(() => {
@@ -21,11 +21,12 @@ export default function AssocQrcodePage() {
      .finally(() => setLoading(false));
  }, []);
  useEffect(() => () => {
    if (previewUrl) URL.revokeObjectURL(previewUrl);
  }, [previewUrl]);
  async function downloadQr() {
    const publicUrl = summary?.qrcodeUrl;
    if (isWechatEnv() && isHttpImageUrl(publicUrl)) {
      await previewSaveableImage(publicUrl);
      return;
    }
    const token = localStorage.getItem('accessToken');
    try {
      const res = await fetch('/api/v1/partner/assoc/qrcode', {
@@ -37,11 +38,6 @@ export default function AssocQrcodePage() {
      if (!res.ok) throw new Error('下载失败');
      const blob = await res.blob();
      const url = URL.createObjectURL(blob);
      if (isWechatEnv()) {
        setPreviewUrl(url);
        toastSuccess('请长按图片保存到相册');
        return;
      }
      const a = document.createElement('a');
      a.href = url;
      a.download = `partner-assoc-${summary?.partnerId || 'qr'}.png`;
@@ -49,9 +45,8 @@ export default function AssocQrcodePage() {
      URL.revokeObjectURL(url);
      toastSuccess('已开始下载');
    } catch (e) {
-      if (summary?.qrcodeUrl) {
+      if (isWechatEnv() && isHttpImageUrl(publicUrl)) {
-        setPreviewUrl(summary.qrcodeUrl);
+        await previewSaveableImage(publicUrl);
        toastSuccess('请长按图片保存到相册');
        return;
      }
      toastError(e instanceof Error ? e.message : '下载失败');
@@ -70,7 +65,8 @@ export default function AssocQrcodePage() {
            </p>
            {summary?.qrcodeUrl ? (
              <img
-                src={previewUrl || summary.qrcodeUrl}
+                className="partner-longpress-img"
                src={summary.qrcodeUrl}
                alt="关联码"
                style={{ width: 220, height: 220, background: '#fff' }}
              />
@@ -83,11 +79,11 @@ export default function AssocQrcodePage() {
            <button type="button" className="partner-btn-primary" style={{ marginTop: 20 }} onClick={() => void downloadQr()}>
              下载二维码
            </button>
-            {previewUrl && isWechatEnv() && (
+            {isWechatEnv() && summary?.qrcodeUrl ? (
              <p className="label-md text-muted" style={{ marginTop: 12 }}>
-                微信内请长按上方图片保存
+                微信内请点「下载二维码」后长按保存
              </p>
-            )}
+            ) : null}
          </div>
        </section>
      )}
@@ -13,6 +13,7 @@ import {
  fetchAssocQrcodeImage,
 } from '../lib/activity-posters';
 import { toastError, toastSuccess } from '../lib/toast';
 import { blobToDataUrl, isHttpImageUrl, previewSaveableImage } from '../lib/wechat-save-image';
 import { isWechatEnv } from '../lib/weixin';
 import { usePartnerPageView } from '../lib/usePageView';
@@ -58,7 +59,7 @@ export default function UsersManagePage() {
  }, []);
  useEffect(() => () => {
-    if (previewUrl) URL.revokeObjectURL(previewUrl);
+    if (previewUrl?.startsWith('blob:')) URL.revokeObjectURL(previewUrl);
  }, [previewUrl]);
  useEffect(() => {
@@ -131,12 +132,17 @@ export default function UsersManagePage() {
  async function downloadMainImage() {
    const posterId = summary?.activityPosterId;
    try {
      if (isWechatEnv() && !posterId && isHttpImageUrl(summary?.qrcodeUrl)) {
        await previewSaveableImage(summary.qrcodeUrl);
        return;
      }
      const blob = posterId
        ? await fetchActivityPosterImage(posterId)
        : await fetchAssocQrcodeImage();
      if (isWechatEnv()) {
-        setPreviewUrl(URL.createObjectURL(blob));
+        if (previewUrl?.startsWith('blob:')) URL.revokeObjectURL(previewUrl);
-        toastSuccess('请长按图片保存到相册');
+        setPreviewUrl(await blobToDataUrl(blob));
        toastSuccess('请长按上方图片保存到相册');
        return;
      }
      downloadBlob(blob, posterId
@@ -144,7 +150,11 @@ export default function UsersManagePage() {
        : `partner-assoc-${summary?.partnerId || 'qr'}.png`);
      toastSuccess('已开始下载');
    } catch (e) {
-      if (!posterId && summary?.qrcodeUrl) {
+      if (!posterId && isHttpImageUrl(summary?.qrcodeUrl)) {
        if (isWechatEnv()) {
          await previewSaveableImage(summary.qrcodeUrl);
          return;
        }
        setPreviewUrl(summary.qrcodeUrl);
        toastSuccess('请长按图片保存到相册');
        return;
@@ -182,6 +192,7 @@ export default function UsersManagePage() {
          </p>
          {summary?.activityPosterId && (previewUrl || heroUrl) ? (
            <img
              className="partner-longpress-img"
              src={previewUrl || heroUrl || ''}
              alt="活动图"
              style={{ width: '100%', maxWidth: 360, background: '#f5f5f5' }}
@@ -190,6 +201,7 @@ export default function UsersManagePage() {
            <p className="body-md text-muted">正在生成活动图…</p>
          ) : previewUrl || summary?.qrcodeUrl ? (
            <img
              className="partner-longpress-img"
              src={previewUrl || summary?.qrcodeUrl || ''}
              alt="关联码"
              style={{ width: 200, height: 200, background: '#fff' }}
@@ -203,9 +215,11 @@ export default function UsersManagePage() {
          <button type="button" className="partner-btn-primary" style={{ marginTop: 16 }} onClick={() => void downloadMainImage()}>
            {summary?.activityPosterId ? '下载活动图' : '下载二维码'}
          </button>
-          {previewUrl && isWechatEnv() && (
+          {isWechatEnv() && (previewUrl || summary?.qrcodeUrl) ? (
-            <p className="label-md text-muted" style={{ marginTop: 8 }}>微信内请长按上方图片保存</p>
+            <p className="label-md text-muted" style={{ marginTop: 8 }}>
-          )}
+              微信内请点「{summary?.activityPosterId ? '下载活动图' : '下载二维码'}」后长按保存
            </p>
          ) : null}
        </section>
        <Link to="/center/activity-posters" className="partner-menu-card" style={{ display: 'block', marginBottom: 20, textDecoration: 'none', color: 'inherit' }}>
@@ -4087,3 +4087,11 @@ header:has(> .app-page-title:only-child),
  width: 200px;
  height: 200px;
 }
 /* 微信内长按保存：不要禁用系统菜单 */
 img.partner-longpress-img {
  -webkit-touch-callout: default;
  -webkit-user-select: none;
  user-select: none;
  pointer-events: auto;
 }
@@ -3,7 +3,8 @@
  <head>
    <meta charset="UTF-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-    <meta name="robots" content="noindex, nofollow, noarchive" />
+    <meta name="robots" content="noindex, nofollow, noarchive, nosnippet" />
    <meta name="baiduspider" content="noindex, nofollow, noarchive, nosnippet" />
    <title>门店管理中心</title>
    <link rel="preconnect" href="https://fonts.googleapis.com" />
    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
@@ -1,2 +1,2 @@
 User-agent: *
-Disallow: /
+Allow: /
@@ -14,6 +14,9 @@ const API_ORIGIN =
  (isDevMode ? 'http://192.168.1.10:3010' : 'https://api.dukanghaoke.com');
 const requireFromApp = createRequire(path.resolve(__dirname, '../package.json'));
 const { version: APP_PKG_VERSION } = requireFromApp(path.resolve(__dirname, '../package.json')) as {
  version: string;
 };
 /** 解析包目录/文件，避免 pnpm/Vite 把同一 runtime 打成两份 → useDidShow 读到空 reactMeta */
 function resolvePkgFile(id: string): string {
@@ -54,6 +57,7 @@ export default defineConfig(async () => ({
  },
  defineConstants: {
    TARO_APP_API_ORIGIN: JSON.stringify(API_ORIGIN),
    TARO_APP_VERSION: JSON.stringify(APP_PKG_VERSION),
  },
  copy: {
    patterns: [
@@ -1,6 +1,6 @@
 {
  "name": "@dukang/mini-user",
-  "version": "3.5.16",
+  "version": "4.0.4",
  "private": true,
  "description": "杜康好客 · C 端用户微信小程序（Taro）",
  "scripts": {
@@ -4,6 +4,7 @@ export default defineAppConfig({
    'pages/stores/index',
    'pages/benefit/index',
    'pages/mine/index',
    'pages/open/index',
  ],
  subPackages: [
    { root: 'pages/product-detail', pages: ['index'] },
@@ -3,7 +3,7 @@ import { Button, Text } from '@tarojs/components';
 import type { ReactNode } from 'react';
 import { toast } from '../lib/api';
 import { getBrandAssetsSync, loadBrandAssets } from '../lib/brand-assets';
-import { formatOpenCsError, openWecomCustomerServiceChat } from '../lib/wecom-cs';
+import { buildCsSharePath, buildCsShareTitle, formatOpenCsError, openWecomCustomerServiceChat } from '../lib/wecom-cs';
 export type ContactCsSessionContext = {
  orderId?: string;
@@ -91,6 +91,9 @@ export default function ContactCsButton({
      className={className}
      openType="contact"
      sessionFrom={buildCsSessionFrom(session)}
      showMessageCard
      sendMessageTitle={buildCsShareTitle(session?.orderNo)}
      sendMessagePath={buildCsSharePath(session?.orderId)}
      hoverClass="none"
    >
      {typeof children === 'string' ? <Text>{children}</Text> : children}
@@ -130,10 +130,12 @@ export function toast(title: string, icon: 'success' | 'error' | 'none' = 'none'
  const text = title.trim();
  if (!text) return;
  if (icon !== 'success' && showFloatingToast(text)) {
-    void Taro.hideToast();
+    void Promise.resolve(Taro.hideToast() as void | Promise<unknown>).catch(() => {});
    return;
  }
-  Taro.showToast({ title: text, icon, duration: 1800 });
+  void Promise.resolve(
    Taro.showToast({ title: text, icon, duration: 1800 }) as void | Promise<unknown>,
  ).catch(() => {});
 }
 export type SessionPayload = {
@@ -21,6 +21,14 @@ export type ClientErrorPayload = {
  extra?: Record<string, unknown>;
 };
 /** 微信预期失败，不应按 P1 未捕获上报 */
 const IGNORED_REJECTION =
  /getLocation:fail|hideToast:fail:toast can't be found|showToast:fail|authorize:fail auth deny/i;
 function shouldIgnoreRejection(message: string): boolean {
  return IGNORED_REJECTION.test(message);
 }
 function currentPagePath(): string | undefined {
  try {
    const pages = Taro.getCurrentPages();
@@ -97,6 +105,7 @@ export function installClientErrorReporting(): void {
          : typeof reason === 'string'
            ? reason
            : JSON.stringify(reason);
      if (shouldIgnoreRejection(message || '')) return;
      const stack = reason instanceof Error ? reason.stack : undefined;
      reportClientError({
        level: 'error',
@@ -121,15 +130,17 @@ export function installClientErrorReporting(): void {
    });
    window.addEventListener('unhandledrejection', (ev) => {
      const reason = ev.reason;
      const message =
        reason instanceof Error
          ? reason.message
          : typeof reason === 'string'
            ? reason
            : 'unhandledrejection';
      if (shouldIgnoreRejection(message)) return;
      reportClientError({
        level: 'error',
        category: 'unhandled_rejection',
-        message:
+        message,
          reason instanceof Error
            ? reason.message
            : typeof reason === 'string'
              ? reason
              : 'unhandledrejection',
        stack: reason instanceof Error ? reason.stack : undefined,
      });
    });
@@ -14,13 +14,7 @@ export async function tryGetClientGpsLocation(): Promise<ClientGpsLocation | nul
  if (process.env.TARO_ENV === 'weapp') {
    try {
      const Taro = (await import('@tarojs/taro')).default;
-      const loc = await new Promise<{ latitude: number; longitude: number }>((resolve, reject) => {
+      const loc = await Taro.getLocation({ type: 'gcj02' });
        Taro.getLocation({
          type: 'gcj02',
          success: resolve,
          fail: reject,
        });
      });
      return { latitude: loc.latitude, longitude: loc.longitude };
    } catch {
      return null;
@@ -11,13 +11,7 @@ export type ClientGpsLocation = {
 export async function tryGetClientGpsLocation(): Promise<ClientGpsLocation | null> {
  try {
-    const loc = await new Promise<{ latitude: number; longitude: number }>((resolve, reject) => {
+    const loc = await Taro.getLocation({ type: 'gcj02' });
      Taro.getLocation({
        type: 'gcj02',
        success: resolve,
        fail: reject,
      });
    });
    return { latitude: loc.latitude, longitude: loc.longitude };
  } catch {
    return null;
@@ -1,13 +1,18 @@
 import Taro from '@tarojs/taro';
 import { fetchClientConfig } from './pay-wechat';
-/** 与 package.json version 同步，供服务端 minClientVersion 比对 */
+/** 与 package.json version 同步（Taro defineConstants 注入），供 minClientVersion 比对 */
-export const APP_VERSION = '3.5.16';
+export const APP_VERSION =
  (typeof TARO_APP_VERSION !== 'undefined' && String(TARO_APP_VERSION).trim()) || '4.0.4';
-export const APP_VERSION_LABEL = `v${APP_VERSION}`;
+export const APP_VERSION_LABEL = `v${APP_VERSION.replace(/^v/i, '')}`;
 function normalizeVersion(v: string): string {
  return String(v || '').trim().replace(/^v/i, '');
 }
 function parseSemver(v: string): number[] {
-  return v.split('.').map((n) => parseInt(n, 10) || 0);
+  return normalizeVersion(v).split('.').map((n) => parseInt(n, 10) || 0);
 }
 export function compareSemver(a: string, b: string): number {
@@ -89,7 +94,7 @@ async function enforceMinClientVersion(min: string) {
 export async function checkClientVersionGate() {
  try {
    const config = await fetchClientConfig();
-    const min = config.minClientVersion?.trim();
+    const min = normalizeVersion(config.minClientVersion ?? '');
    if (min && compareSemver(APP_VERSION, min) < 0) {
      await enforceMinClientVersion(min);
    }
@@ -59,6 +59,23 @@ function clearLocationDenied() {
  }
 }
 function wxErrorMessage(err: unknown): string {
  if (!err) return '';
  if (typeof err === 'string') return err;
  if (err instanceof Error) return err.message;
  if (typeof err === 'object') {
    const o = err as { errMsg?: unknown; message?: unknown };
    if (typeof o.errMsg === 'string' && o.errMsg) return o.errMsg;
    if (typeof o.message === 'string' && o.message) return o.message;
    try {
      return JSON.stringify(err);
    } catch {
      return '';
    }
  }
  return String(err);
 }
 function isDenyMessage(errMsg?: string): boolean {
  return /auth deny|authorize|permission|denied|拒绝|用户拒绝|getLocation:fail/i.test(
    errMsg || '',
@@ -179,14 +196,13 @@ async function promptLocationAuthOnce() {
  }).catch(() => {});
 }
-function getMiniLocation(): Promise<Taro.getLocation.SuccessCallbackResult> {
+async function getMiniLocation(): Promise<Taro.getLocation.SuccessCallbackResult> {
-  return new Promise((resolve, reject) => {
+  const setting = await Taro.getSetting().catch(() => null);
-    Taro.getLocation({
+  if (setting?.authSetting?.['scope.userLocation'] === false) {
-      type: 'gcj02',
+    throw new Error('getLocation:fail auth deny');
-      success: resolve,
+  }
-      fail: reject,
+  // 只用返回的 Promise，避免 callback + Promise 双重 reject 变成未捕获
-    });
+  return Taro.getLocation({ type: 'gcj02' });
  });
 }
 async function resolveViaH5Jssdk(): Promise<ResolvedUserCity | null> {
@@ -263,7 +279,7 @@ export async function resolveUserCity(force = false): Promise<ResolvedUserCity>
      return resolved;
    }
  } catch (err) {
-    const errMsg = err instanceof Error ? err.message : String(err);
+    const errMsg = wxErrorMessage(err);
    const denied = isDenyMessage(errMsg);
    if (denied && !isLocationDenied()) {
      await promptLocationAuthOnce();
@@ -57,6 +57,23 @@ function clearLocationDenied() {
  }
 }
 function wxErrorMessage(err: unknown): string {
  if (!err) return '';
  if (typeof err === 'string') return err;
  if (err instanceof Error) return err.message;
  if (typeof err === 'object') {
    const o = err as { errMsg?: unknown; message?: unknown };
    if (typeof o.errMsg === 'string' && o.errMsg) return o.errMsg;
    if (typeof o.message === 'string' && o.message) return o.message;
    try {
      return JSON.stringify(err);
    } catch {
      return '';
    }
  }
  return String(err);
 }
 function isDenyMessage(errMsg?: string): boolean {
  return /auth deny|authorize|permission|denied|拒绝|用户拒绝|getLocation:fail/i.test(
    errMsg || '',
@@ -175,14 +192,13 @@ async function promptLocationAuthOnce() {
  }).catch(() => {});
 }
-function getMiniLocation(): Promise<Taro.getLocation.SuccessCallbackResult> {
+async function getMiniLocation(): Promise<Taro.getLocation.SuccessCallbackResult> {
-  return new Promise((resolve, reject) => {
+  const setting = await Taro.getSetting().catch(() => null);
-    Taro.getLocation({
+  if (setting?.authSetting?.['scope.userLocation'] === false) {
-      type: 'gcj02',
+    throw new Error('getLocation:fail auth deny');
-      success: resolve,
+  }
-      fail: reject,
+  // 只用返回的 Promise，避免 callback + Promise 双重 reject 变成未捕获
-    });
+  return Taro.getLocation({ type: 'gcj02' });
  });
 }
 export async function resolveUserCity(force = false): Promise<ResolvedUserCity> {
@@ -211,7 +227,7 @@ export async function resolveUserCity(force = false): Promise<ResolvedUserCity>
      return resolved;
    }
  } catch (err) {
-    const errMsg = err instanceof Error ? err.message : String(err);
+    const errMsg = wxErrorMessage(err);
    const denied = isDenyMessage(errMsg);
    if (denied && !isLocationDenied()) {
      await promptLocationAuthOnce();
@@ -4,6 +4,17 @@ export type WecomCsSessionContext = {
  from?: string;
 };
 /** 客服消息卡片必须落主包页；分包（订单详情）作启动页会白屏 */
 export function buildCsSharePath(orderId?: string): string {
  const id = (orderId || '').trim();
  return id ? `pages/open/index?id=${encodeURIComponent(id)}` : 'pages/home/index';
 }
 export function buildCsShareTitle(orderNo?: string): string {
  const no = (orderNo || '').trim();
  return no ? `订单 ${no}` : '杜康好客';
 }
 type OpenCsChatOption = {
  extInfo: { url: string };
  corpId: string;
@@ -97,16 +108,10 @@ export async function openWecomCustomerServiceChat(params: {
  const option: OpenCsChatOption = {
    extInfo: { url },
    corpId,
    showMessageCard: true,
    sendMessageTitle: buildCsShareTitle(params.session?.orderNo),
    sendMessagePath: buildCsSharePath(params.session?.orderId),
  };
  if (params.session?.orderNo || params.session?.orderId) {
    option.showMessageCard = true;
    option.sendMessageTitle = params.session.orderNo
      ? `订单 ${params.session.orderNo}`
      : '订单咨询';
    if (params.session.orderId) {
      option.sendMessagePath = `pages/order-detail/index?id=${params.session.orderId}`;
    }
  }
  await new Promise<void>((resolve, reject) => {
    wxApi({
@@ -0,0 +1,3 @@
 export default definePageConfig({
  navigationBarTitleText: '杜康好客',
 });
@@ -0,0 +1,42 @@
 import { View, Text } from '@tarojs/components';
 import Taro, { useLoad } from '@tarojs/taro';
 import PageShell from '../../components/PageShell';
 import { goLogin } from '../../lib/auth-nav';
 import { isLoggedIn } from '../../lib/api';
 function goHome() {
  Taro.switchTab({ url: '/pages/home/index' }).catch(() => {
    Taro.reLaunch({ url: '/pages/home/index' });
  });
 }
 function openOrder(orderId: string) {
  const detail = `/pages/order-detail/index?id=${encodeURIComponent(orderId)}`;
  if (!isLoggedIn()) {
    goLogin(detail);
    return;
  }
  Taro.redirectTo({ url: detail }).catch(() => {
    Taro.reLaunch({ url: detail });
  });
 }
 /** 主包落地：客服卡片 / 外链打开分包页（订单详情）前先落到这里，避免白屏 */
 export default function OpenPage() {
  useLoad((query?: Record<string, string | undefined>) => {
    const orderId = String(query?.id || query?.orderId || '').trim();
    if (!orderId) {
      goHome();
      return;
    }
    openOrder(orderId);
  });
  return (
    <PageShell variant="plain">
      <View className="u-empty">
        <Text>正在打开…</Text>
      </View>
    </PageShell>
  );
 }
@@ -116,6 +116,7 @@ export default function OrderDetailPage() {
  const orderId = router.params.id ?? '';
  usePageView('order_detail_view', orderId ? { orderId } : undefined);
  const [order, setOrder] = useState<OrderDetail | null>(null);
  const [loadError, setLoadError] = useState('');
  const [confirming, setConfirming] = useState(false);
  const [latestTrack, setLatestTrack] = useState<OrderTrackNode | null>(null);
  const [estimatedArrival, setEstimatedArrival] = useState<OrderTrackEstimatedArrival | null>(null);
@@ -147,14 +148,18 @@ export default function OrderDetailPage() {
  }
  useEffect(() => {
-    if (!orderId) return;
+    if (!orderId) {
      setLoadError('订单信息缺失');
      return;
    }
    request<OrderDetail>(`/trade/orders/${orderId}`)
      .then((data) => {
        setOrder(data);
        setLoadError('');
        void loadOrderTrack(data.delivery, data.status);
        applyLocalDeliveryHint(data, setLocalHintHtml);
      })
-      .catch((e) => toast(e instanceof Error ? e.message : '加载失败'));
+      .catch((e) => setLoadError(e instanceof Error ? e.message : '加载失败'));
  }, [orderId]);
  useDidShow(() => {
@@ -293,7 +298,9 @@ export default function OrderDetailPage() {
      />
      <View className="sub-page-body">
        {!order ? (
-          <View className="u-empty">加载中…</View>
+          <View className="u-empty" onClick={loadError ? () => Taro.switchTab({ url: '/pages/home/index' }) : undefined}>
            <Text>{loadError || '加载中…'}</Text>
          </View>
        ) : (
          <>
            <View className="order-card">
@@ -13,6 +13,7 @@ declare const defineAppConfig: (config: Record<string, unknown>) => Record<strin
 declare const definePageConfig: (config: Record<string, unknown>) => Record<string, unknown>;
 declare const TARO_APP_API_ORIGIN: string;
 declare const TARO_APP_VERSION: string;
 /** 微信小程序全局（Taro 未封装的 API 如 openBusinessView 需直接调用） */
 declare const wx: {
@@ -46,10 +46,11 @@ module.exports = {
      exec_mode: 'fork',
    },
    {
      // cleanUrls:false 见 apps/admin-web/serve.json；否则百度校验 .html 会被 301 去后缀
      name: 'dukang-admin-web',
      cwd: `${APP_ROOT}/apps/admin-web`,
      script: 'npx',
-      args: 'serve -s dist -l 8094',
+      args: 'serve dist -l 8094 -c serve.json',
      interpreter: 'none',
      instances: 1,
      exec_mode: 'fork',
@@ -46,7 +46,7 @@ module.exports = {
      name: 'dukang-stg-admin-web',
      cwd: `${APP_ROOT}/apps/admin-web`,
      script: 'npx',
-      args: 'serve -s dist -l 8194',
+      args: 'serve dist -l 8194 -c serve.json',
      interpreter: 'none',
      instances: 1,
      exec_mode: 'fork',
@@ -33,6 +33,19 @@ server {
    client_max_body_size 50m;
    location ~ ^/api/v1/admin/activity-posters/[^/]+/partner-pack$ {
        proxy_pass http://127.0.0.1:8190;
        proxy_http_version 1.1;
        proxy_set_header Host $host;
        proxy_set_header X-Real-IP $remote_addr;
        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
        proxy_set_header X-Forwarded-Proto $scheme;
        proxy_set_header Connection "";
        proxy_buffering off;
        proxy_read_timeout 120s;
        proxy_send_timeout 120s;
    }
    location / {
        proxy_pass http://127.0.0.1:8190;
        proxy_http_version 1.1;
@@ -183,6 +196,19 @@ server {
    include /opt/dukang-staging/deploy/nginx-no-crawler.conf;
    location ~ ^/api/v1/admin/activity-posters/[^/]+/partner-pack$ {
        proxy_pass http://127.0.0.1:8190;
        proxy_http_version 1.1;
        proxy_set_header Host $host;
        proxy_set_header X-Real-IP $remote_addr;
        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
        proxy_set_header X-Forwarded-Proto $scheme;
        proxy_set_header Connection "";
        proxy_buffering off;
        proxy_read_timeout 120s;
        proxy_send_timeout 120s;
    }
    location /api/ {
        proxy_pass http://127.0.0.1:8190;
        proxy_http_version 1.1;
@@ -31,6 +31,19 @@ server {
    include /opt/dukang/deploy/nginx-deploy-webhook.conf;
    location ~ ^/api/v1/admin/activity-posters/[^/]+/partner-pack$ {
        proxy_pass http://127.0.0.1:8090;
        proxy_http_version 1.1;
        proxy_set_header Host $host;
        proxy_set_header X-Real-IP $remote_addr;
        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
        proxy_set_header X-Forwarded-Proto $scheme;
        proxy_set_header Connection "";
        proxy_buffering off;
        proxy_read_timeout 120s;
        proxy_send_timeout 120s;
    }
    location / {
        proxy_pass http://127.0.0.1:8090;
        proxy_http_version 1.1;
@@ -173,6 +186,19 @@ server {
    include /opt/dukang/deploy/nginx-no-crawler.conf;
    location ~ ^/api/v1/admin/activity-posters/[^/]+/partner-pack$ {
        proxy_pass http://127.0.0.1:8090;
        proxy_http_version 1.1;
        proxy_set_header Host $host;
        proxy_set_header X-Real-IP $remote_addr;
        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
        proxy_set_header X-Forwarded-Proto $scheme;
        proxy_set_header Connection "";
        proxy_buffering off;
        proxy_read_timeout 120s;
        proxy_send_timeout 120s;
    }
    location /api/ {
        proxy_pass http://127.0.0.1:8090;
        proxy_http_version 1.1;
@@ -1,11 +1,12 @@
-# 禁止搜索引擎抓取（shop / partner / admin，含测试域）
+# 禁止搜索引擎收录（shop / partner / admin，含测试域）
-# 合规爬虫读 robots.txt；X-Robots-Tag 覆盖不先读 robots.txt 的抓取器
+# 必须允许抓取页面：Disallow:/ 会让百度无法读到 noindex，旧标题会一直留在 SERP。
 # X-Robots-Tag 覆盖不先读 robots.txt / 不执行 JS 的抓取器。
-add_header X-Robots-Tag "noindex, nofollow, noarchive" always;
+add_header X-Robots-Tag "noindex, nofollow, noarchive, nosnippet" always;
 location = /robots.txt {
    default_type text/plain;
    charset utf-8;
-    add_header X-Robots-Tag "noindex, nofollow, noarchive" always;
+    add_header X-Robots-Tag "noindex, nofollow, noarchive, nosnippet" always;
-    return 200 "User-agent: *\nDisallow: /\n";
+    return 200 "User-agent: *\nAllow: /\n";
 }
@@ -138,19 +138,26 @@ if [[ "$SKIP_BUILD" == false ]]; then
  if [[ -f "$APP_ROOT/apps/mini-user/serve.json" ]]; then
    cp -f "$APP_ROOT/apps/mini-user/serve.json" "$APP_ROOT/apps/mini-user/dist/serve.json"
  fi
  if [[ -f "$APP_ROOT/apps/admin-web/serve.json" ]]; then
    cp -f "$APP_ROOT/apps/admin-web/serve.json" "$APP_ROOT/apps/admin-web/dist/serve.json"
  fi
 else
  echo "==> 4. 跳过构建"
  if [[ -f "$APP_ROOT/apps/mini-user/serve.json" && -d "$APP_ROOT/apps/mini-user/dist" ]]; then
    cp -f "$APP_ROOT/apps/mini-user/serve.json" "$APP_ROOT/apps/mini-user/dist/serve.json"
  fi
  if [[ -f "$APP_ROOT/apps/admin-web/serve.json" && -d "$APP_ROOT/apps/admin-web/dist" ]]; then
    cp -f "$APP_ROOT/apps/admin-web/serve.json" "$APP_ROOT/apps/admin-web/dist/serve.json"
  fi
 fi
 echo "==> 5. 重启 PM2 ($ECOSYSTEM_FILE)"
 if pm2 describe "$PM2_API" &>/dev/null; then
  pm2 delete "$PM2_USER" 2>/dev/null || true
  pm2 delete "$PM2_ADMIN" 2>/dev/null || true
  pm2 start "$DEPLOY_DIR/$ECOSYSTEM_FILE" --only "$PM2_USER"
-  pm2 restart "$PM2_API" "$PM2_SHOP" "$PM2_PARTNER" "$PM2_ADMIN" 2>/dev/null \
+  pm2 start "$DEPLOY_DIR/$ECOSYSTEM_FILE" --only "$PM2_ADMIN"
-    || pm2 restart "$PM2_API" "$PM2_SHOP" "$PM2_PARTNER"
+  pm2 restart "$PM2_API" "$PM2_SHOP" "$PM2_PARTNER" 2>/dev/null || true
 else
  pm2 start "$DEPLOY_DIR/$ECOSYSTEM_FILE"
 fi
@@ -173,11 +180,9 @@ APP_ROOT="$APP_ROOT" DEPLOY_TRIGGER="${DEPLOY_TRIGGER:-manual}" DUKANG_ENV_FILE=
 echo "==> 发版完成 ($DUKANG_DEPLOY_ENV)"
-if [[ "$DUKANG_DEPLOY_ENV" == "staging" ]]; then
+echo "==> 8. 重载 nginx（robots.txt / 校验文件等 include 配置）"
-  echo "==> 8. 重载 nginx（staging）"
+if command -v nginx >/dev/null 2>&1 && nginx -t 2>/dev/null; then
-  if command -v nginx >/dev/null 2>&1 && nginx -t 2>/dev/null; then
+  systemctl reload nginx || echo "WARN: nginx reload failed"
-    systemctl reload nginx || echo "WARN: nginx reload failed"
+else
-  else
+  echo "WARN: nginx 未安装或配置校验失败，跳过重载"
    echo "WARN: nginx 未安装或配置校验失败，跳过重载"
  fi
 fi
@@ -116,7 +116,8 @@
 - 确认打款时可填写打款凭证号（`paymentRef`），并可上传凭证照片（`paymentProofUrls`，最多 9 张）；已打款后在详情与导出中展示
 - 门店账单统一列表：T+1 终态「已打款」、手动提现终态「已结算」（均为 `PAID`，文案区分业务类型）
 - 门店 T+1「出账日」= 出账当天（核销窗口「昨日 00:00–今日 00:00」中的今天）
- **账单日一律为出账当天的北京日历日**（Asia/Shanghai）：门店 T+1、酒厂 T+3 日账单的 `billDate`；合伙人/物流月账的账期按北京自然月。酒厂 T+3 只决定纳入哪天完成的订单，账单日不是完成日。
+- **账单日一律为出账当天的北京日历日**（Asia/Shanghai）：门店 T+1、酒厂 T+3 期账单的 `billDate`；合伙人/物流月账的账期按北京自然月。酒厂 T+3 = **每 3 天出一期**，纳入上期 3 天完成订单。
 - **酒厂账单与订单完全比对**（v4.0.6）：全部已完成已付订单均入账（含现场提货）；出账日无单或应付为 0 仍生成账单，业务状态展示「无需打款」（DB 仍为 `UNPAID`）；支持按出账周期核对补生成漏账。
 - 核销详情展示核销门店主账户收款信息
 ### 3.4~3.8 Wave 能力
@@ -56,7 +56,7 @@ C 端购酒核销 · 门店扫码核销+打款 · 合伙人拓店履约 · WebAd
 **HQ 门店账单打款凭证**：确认打款 / 提现通过可填 `paymentRef`，并可上传照片（`paymentProofUrls`，OSS `PAYMENT_PROOF`，最多 9 张）。详情与 T+1 导出展示。
-**活动图（v4.0.2）**：规则见 v4-PRD §6。表 `activity_poster`；HQ `GET/POST/PUT/DELETE /admin/activity-posters`（权限 `activity_posters`）；合伙人 `GET /partner/activity-posters` · `GET/PUT /partner/activity-posters/selection`（写入 `partner_account.activity_poster_id`）· `GET /partner/activity-posters/:id/image`（合成本人关联码）。`GET /partner/assoc` 返回 `activityPosterId`。码栏百分比相对图宽。子账号无入口。
+**活动图（v4.0.2 / v4.0.7）**：规则见 v4-PRD §6。表 `activity_poster`；HQ `GET/POST/PUT/DELETE /admin/activity-posters`（权限 `activity_posters`）；合伙人 `GET /partner/activity-posters` · `GET/PUT /partner/activity-posters/selection`（写入 `partner_account.activity_poster_id`）· `GET /partner/activity-posters/:id/image`（合成本人关联码）。`GET /partner/assoc` 返回 `activityPosterId`。码栏百分比相对图宽。子账号无入口。v4.0.7：HQ `GET /admin/activity-posters/:id/image?partnerId=` 单张合成 PNG；`POST /admin/activity-posters/:id/partner-pack` `{ partnerIds }` 流式 zip（仅勾选，测试号/无码 skip）。城市合伙人快链 `/activity-posters?partnerId=`。不预生成缓存图、不批量调微信补码。
 **合伙人关联与订单佣金（v4.0.1）**：规则见 v4-PRD。`user_user.assoc_partner_account_id` 首次扫码锁定；`user_order.partner_account_id_at_pay` 仅关联或代下单显式选择写入（禁止区县解析）。`partner_bill_item` 分酒单 / 核销两段。合伙人备注独立表 `partner_user_note`（勿写 `hq_remark`）。`POST /user/partner-assoc/bind` · `GET /partner/assoc` · `GET /partner/assoc/stats`（关联用户 / 当前关联用户已付购酒单，本日/本月）· `GET /partner/assoc/users?keyword&sort`（合伙人侧返回 `partnerRemark`，不返回 `hqRemark`）· `GET /partner/assoc/users/:userId/orders` · `GET /partner/assoc/orders` · `PUT /partner/assoc/users/:userId/remark` · HQ `GET /admin/users` 支持 `keyword`、`assocPartnerAccountId`（`none` / `any` / 主账号 ID）· `GET /admin/orders` 支持 `assocPartnerAccountId`（筛本单快照，`none`=无快照）· `PUT /admin/users/:id/assoc`（权限 `users_partner_assoc`）改绑/解绑 · 开城合伙人关联用户快链 `/users?assocPartnerAccountId=` · `PUT /admin/partners/:id` 改费率用 `Decimal(toFixed(4))`。
@@ -65,7 +65,7 @@ C 端购酒核销 · 门店扫码核销+打款 · 合伙人拓店履约 · WebAd
 **主链路 15 项**：登录、4 SKU、起购、支付+权益、双通道核销、payout、关店不可见、拓店审核、配送完成、退款、T+1/T+30…  
 **后台 8 项**：商品/门店/订单/权益/核销/工单/日志/财务。  
 **开发计划任务**：状态 `TODO` 待开发 / `IN_PROGRESS` 开发中 / `DEVELOPED` 已开发 / `RELEASED` 已上线；任务列表「来源工单」链到 `/tickets/support?id=`。  
-**财务账单日**：出账当天北京日历日（门店/酒厂 `billDate`；合伙人/物流账期按北京自然月）。禁止 `toISOString().slice(0,10)` 或服务器本地 `Date` 午夜当账单日。
+**财务账单日**：出账当天北京日历日（门店/酒厂 `billDate`；合伙人/物流账期按北京自然月）。禁止 `toISOString().slice(0,10)` 或服务器本地 `Date` 午夜当账单日。酒厂应付为 0 仍出账（展示无需打款）。
 ## 6. 技术债（摘要）
@@ -1,8 +1,8 @@
 # 杜康好客 · V4 PRD
-> **v4.0**（2026-08-29）· 关联码与分佣事实源  
+> **v4.0**（2026-08-29）· 关联码与分佣事实源；**v4.0.6** 酒厂对账；**v4.0.7** HQ 活动图快链与勾选导出  
-> 未改规则仍见 [`杜康好客-v3-PRD.md`](./杜康好客-v3-PRD.md)。**冲突时 V4 > V3**（本主题：订单佣金归属、关联码、合伙人账单明细、活动图）。  
+> 未改规则仍见 [`杜康好客-v3-PRD.md`](./杜康好客-v3-PRD.md)。**冲突时 V4 > V3**（本主题：订单佣金归属、关联码、合伙人账单明细、活动图、酒厂对账）。  
-> 实现：[`v4.0.1 开发文档`](./杜康好客-v4.0.1-开发文档.md) · [`v4.0.2 开发文档`](./杜康好客-v4.0.2-开发文档.md) · 审计：[`v4-现状对照`](./杜康好客-v4-现状对照.md)
+> 实现：[`v4.0.1 开发文档`](./杜康好客-v4.0.1-开发文档.md) · [`v4.0.2 开发文档`](./杜康好客-v4.0.2-开发文档.md) · [`v4.0.6 开发文档`](./杜康好客-v4.0.6-开发文档.md) · [`v4.0.7 开发文档`](./杜康好客-v4.0.7-开发文档.md) · 审计：[`v4-现状对照`](./杜康好客-v4-现状对照.md)
 ## 0. 版本
@@ -10,6 +10,8 @@
 |----|------|------|----------|
 | 4.0.1 | 08-29 / 08-30 | 合伙人关联码；订单佣金只认关联；账单酒单/核销分列；去掉区县酒单佣金；HQ 关联筛选与快链；合伙人 H5 用户管理与首页统计 | [`v4.0.1`](./杜康好客-v4.0.1-开发文档.md) |
 | 4.0.2 | 08-30 | HQ 活动图模板（底图 + 方形码栏 + 文案）；合伙人下载合成关联码；所选图写入库并作为用户管理主图 | [`v4.0.2`](./杜康好客-v4.0.2-开发文档.md) |
 | 4.0.6 | 08-31 | 酒厂 T+3=每 3 天出一期；全部已完成已付订单（含现场提货）；应付为 0 仍出账；核对补生成 | [`v4.0.6`](./杜康好客-v4.0.6-开发文档.md) |
 | 4.0.7 | 09-01 | HQ 城市合伙人活动图快链；指定一张活动图为单个或勾选主合伙人合成下载（PNG / zip） | [`v4.0.7`](./杜康好客-v4.0.7-开发文档.md) |
 ## 1. 锚点（沿用 V3，佣金归属改写）
@@ -74,7 +76,15 @@ HQ 财务详情与合伙人确认页均展示两段列表。不再「无快照
 - 微信内下载失败则预览 + 长按保存（与关联码下载一致）。
 - 合伙人只看 `ACTIVE`；下架后列表不再出现。无关联码则不可下载并明确报错。
 - HQ 持权限 `activity_posters`（默认超管 + 运营）可增删改、上下架。
 - HQ 城市合伙人页提供活动图快链（列表列 / 详情 / 顶栏，进入 `/activity-posters?partnerId=`）。可指定一张已上架活动图：**单个下载**合成 PNG，或 **勾选主合伙人导出 zip**（仅已勾选，不做隐式全量）。合入码为已有 OSS 关联码；无码则单张报错、zip 记入跳过清单。不在本路径批量调微信补码，不预生成每人缓存图。
-## 7. 不做
+## 7. 酒厂对账（v4.0.6）
 - 口径：T+3 = **每 3 个自然日出具一张账单**（对齐起点 `2026-08-01`，出账日如 8/4、8/7、8/10…）；纳入窗口为上一期 3 天 `[出账日−3, 出账日)` 内全部 **COMPLETED + PAID** 订单（含现场提货）；`billDate` = 出账当天北京日历日；应付 = 实付合计 × 30%。
 - **与订单完全比对**：上述订单均须进入对应出账日账单明细；漏账可通过 HQ「核对补生成」或每日任务回扫补齐。
 - **应付为 0 仍出账**：出账日无订单或应付为 0 仍生成账单；业务状态展示「无需打款」（DB 仍为 `UNPAID`，不可确认打款）。
 - **已打款不回刷**；未打款账单可重算；明细 `orderId` 冲突时从其他未打款账单迁入。
 ## 8. 不做
 改推广码体系；改核销归属；子账号自己的码；回刷已打款账单；区县佣金双轨；AI 出图/出文案；C 端/门店端活动图；预生成每人缓存图。
@@ -3,14 +3,14 @@
 > 基准：[`杜康好客-v4-PRD.md`](./杜康好客-v4-PRD.md)  
 > V3 进度仍见 [`杜康好客-v3-现状对照.md`](./杜康好客-v3-现状对照.md)，不混表。
-## 0. 总览（2026-08-30）
+## 0. 总览（2026-09-01）
 | 维度 | 结论 |
 |------|------|
-| 版本线 | **v4.0.2** 活动图模板 + 关联码合成 |
+| 版本线 | **v4.0.7** HQ 活动图快链与勾选导出 |
 | 订单佣金 | 区县归属已删除；只认关联 / 代下单选择 |
-| 账单 | 酒订单 / 核销订单分列 |
+| 账单 | 酒订单 / 核销订单分列；酒厂含现场提货，零应付仍出账（无需打款） |
-| 活动图 | HQ 上传底图/码栏/文案；合伙人选择写入库；用户管理主图跟选择走 |
+| 活动图 | HQ 上传底图/码栏/文案；合伙人选择写入库；HQ 可指定一张图为勾选主合伙人合成下载 |
 ## 1. 版本交付
@@ -18,6 +18,8 @@
 |------|------|------|
 | 4.0.1 | [`关联码与分佣账单`](./杜康好客-v4.0.1-开发文档.md) | ✅ 已实现 |
 | 4.0.2 | [`活动图模板与关联码合成`](./杜康好客-v4.0.2-开发文档.md) | ✅ 已实现 |
 | 4.0.6 | [`酒厂对账核对`](./杜康好客-v4.0.6-开发文档.md) | ✅ 已实现 |
 | 4.0.7 | [`活动图快链与勾选导出`](./杜康好客-v4.0.7-开发文档.md) | ✅ 已实现 |
 | 日期 | 说明 |
 |------|------|
@@ -25,3 +27,5 @@
 | 2026-08-30 | HQ 订单/用户详情展示关联合伙人；改绑权限 `users_partner_assoc`；用户/订单筛选关联合伙人；开城关联用户快链 |
 | 2026-08-30 | 合伙人 H5：首页关联用户/关联用户订单统计；用户管理 Tab（关联码+列表+备注）；`partner_user_note` 与 HQ `hqRemark` 隔离 |
 | 2026-08-30 | v4.0.2：HQ 活动图（底图 + 拖拽码栏 + 文案）；合伙人复制文案、下载合成关联码；选择写入库，用户管理主图下次登录仍显示 |
 | 2026-08-31 | v4.0.6：酒厂 T+3=每 3 天出一期（非每日）；含现场提货；零应付仍出账；核对补生成 |
 | 2026-09-01 | v4.0.7：HQ 城市合伙人活动图快链；单张/勾选导出合成图（PNG / zip） |
@@ -0,0 +1,63 @@
 # 杜康好客 · v4.0.6 开发文档
 > **2026-08-31** · settlement / admin-web  
 > **主题**：酒厂 T+3 = 每 3 天出一期；与全部已完成已付订单完全比对（含现场提货）；应付为 0 仍出账（无需打款）；核对补生成
 需求事实源：[`杜康好客-v4-PRD.md`](./杜康好客-v4-PRD.md) §7 · V3 财务锚点仍见 [`杜康好客-v3-PRD.md`](./杜康好客-v3-PRD.md) §3.3
 ---
 ## 1. 版本目标
 | # | 任务 | 类型 | 交付 |
 |---|------|------|------|
 | 1 | T+3 出账节奏 | 修 | **每 3 天一张账单**（非每日）；纳入上期 3 个自然日全部已付已完成订单 |
 | 2 | 含现场提货 | 修 | 不限配送类型 |
 | 3 | 零应付 / 无单仍出账 | 修 | 出账日仍生成账单，展示「无需打款」 |
 | 4 | 核对补生成 | 需求 | HQ 按区间重算周期出账日；清理旧「每日一账」空账单 |
 ---
 ## 2. 规则
 对齐起点 `WINERY_BILL_EPOCH_YMD = 2026-08-01`，周期 `WINERY_SETTLEMENT_PERIOD_DAYS = 3`。
 | 出账日 | 纳入完成日窗口 |
 |--------|----------------|
 | 8/4 | [8/1, 8/4) |
 | 8/7 | [8/4, 8/7) |
 | 8/28 | [8/25, 8/28) |
 | 8/31 | [8/28, 8/31) |
 - 应付 = `round2(Σ payAmount × 0.3)`
 - `wineryAmount === 0` → UI/导出「无需打款」；确认打款拒绝
 - 非周期日不生成；每日 cron 仅在出账日真正落账
 ### 旧逻辑为何对不上
 旧实现是「**每天**出账，只收 **3 天前那一天** 的订单」：当天窗口无完成单就 skip → 8/4～8/28 大量空白；8/28、8/29 连着出是因为两天各自都有「D−3」完成单。
 ---
 ## 3. 变更面
 | 位置 | 说明 |
 |------|------|
 | `packages/domain` | `isWineryIssueDay` / `shanghaiWineryPeriodWindow` / `wineryIssueDateFromCompletedAt` / `listWineryIssueDays` |
 | `shared-types` | `WINERY_SETTLEMENT_PERIOD_DAYS`、`WINERY_BILL_EPOCH_YMD` |
 | `settlement.service` | 周期出账；`reconcileWineryBills` 只跑周期日并清理非周期空账单 |
 | `settlement.scheduler` | 每日尝试出账（非周期日 skip）+ 近 45 日核对 |
 | `admin-web` | 文案 + 核对补生成 |
 无 Prisma 迁移。线上历史账单一次性修复：`server/dukang-api/prisma/sql/fix-winery-bills-v406.sql`（补现场提货入账、中间 0 账、迁错期明细）。
 ---
 ## 4. 验收
 - [ ] 账单日仅为 8/4、8/7、8/10… 这类周期日，不会连续两天各出一张（除非跨期）
 - [ ] 核对补生成后，同城配送与现场提货订单均出现在对应期账单明细（历史现场单缺 `completedAt` 会自动用 `paidAt` 补齐）
 - [ ] 每张账单明细覆盖上期 3 天全部已付已完成订单（含现场提货/同城/跨城）
 - [ ] 出账日无单仍有账单，「无需打款」
 - [ ] HQ「核对补生成」可选 8/4～今天，补齐中间漏期并清理误生成的每日账单
 - [ ] 已打款账单不回刷
@@ -0,0 +1,49 @@
 # 杜康好客 · v4.0.7 开发文档
 > **2026-09-01** · ops / store / admin-web  
 > **主题**：HQ 城市合伙人页活动图快链；指定一张活动图为单个或勾选的主合伙人合成关联码并下载（单张 PNG / zip）
 需求事实源：[`杜康好客-v4-PRD.md`](./杜康好客-v4-PRD.md) §6
 ---
 ## 1. 版本目标
 | # | 任务 | 类型 | 交付 |
 |---|------|------|------|
 | 1 | 快链 | 需求 | 城市合伙人列表/详情/顶栏跳转活动图页（`?partnerId=`） |
 | 2 | 单个下载 | 需求 | 行操作、详情抽屉、活动图页「为该合伙人下载」；弹窗选已上架活动图 → PNG |
 | 3 | 勾选导出 | 需求 | 列表勾选主合伙人 → 选活动图 → zip（仅已勾选，非隐式全量） |
 **不做**：预生成每人缓存图；批量调微信补码；按每人当前所选活动图分别出图；BullMQ 异步包。
 ---
 ## 2. 规则
 - 合入码 = 主合伙人已有 OSS 关联码。无码则单张报错、zip 写入 `_skipped.txt`。不在本路径调用 `getwxacodeunlimit`。
 - HQ 指定 **一张** 已上架活动图，贴进所有目标合伙人。
 - zip 仅含请求体 `partnerIds`；测试号（`isTest`）跳过。
 - 底图最长边 ≤ 2500 且宽×高 ≤ 4e6，超限报错。
 - Sharp 合成并发 1；底图只下载一次；zip 流式写出。
 ---
 ## 3. 变更面
 - HQ：`GET /admin/activity-posters/:id/image?partnerId=` · `POST /admin/activity-posters/:id/partner-pack` `{ partnerIds }`；权限 `activity_posters`
 - admin-web：城市合伙人快链 / 勾选导出 / 弹窗选图；活动图页 `?partnerId=` 上下文下载
 - nginx：partner-pack 路径 `proxy_buffering off` + `proxy_read_timeout 120s`
 - `archiver` 依赖
 无 Prisma 迁移。
 ---
 ## 4. 验收
 - [ ] 城市合伙人「活动图」列、详情、顶栏快链进入活动图页；带 `partnerId` 时可「为该合伙人下载」
 - [ ] 行内/详情「下载活动图」弹窗选已上架图，得到该人合成 PNG；无关联码明确报错
 - [ ] 勾选 N 人导出 zip，文件名含城市/公司或姓名/id；缺码与测试号进 `_skipped.txt`
 - [ ] 未勾选时导出按钮禁用；不做隐式全量
 - [ ] 底图过大被拒绝；打包期间不调用微信补码
@@ -1,5 +1,7 @@
 import { describe, expect, it } from 'vitest';
 import {
  assertCanDeleteCityPartner,
  assertCanDeleteStore,
  validatePartnerCityBinding,
  validatePartnerCommissionRates,
 } from './city-partner';
@@ -70,3 +72,33 @@ describe('validatePartnerCommissionRates', () => {
    expect(validatePartnerCommissionRates(0.05, 0.04, 0.08).ok).toBe(false);
  });
 });
 describe('assertCanDeleteCityPartner', () => {
  it('requires stores to be deleted first', () => {
    const result = assertCanDeleteCityPartner({ storeCount: 2, orderCount: 0, redeemCount: 0 });
    expect(result.ok).toBe(false);
    expect(result.message).toContain('请先删除门店');
  });
  it('blocks when orders exist', () => {
    const result = assertCanDeleteCityPartner({ storeCount: 0, orderCount: 1, redeemCount: 0 });
    expect(result.ok).toBe(false);
    expect(result.message).toContain('关联订单');
  });
  it('allows delete when empty', () => {
    expect(assertCanDeleteCityPartner({ storeCount: 0, orderCount: 0, redeemCount: 0 }).ok).toBe(true);
  });
 });
 describe('assertCanDeleteStore', () => {
  it('blocks when redeem records exist', () => {
    const result = assertCanDeleteStore({ orderCount: 0, redeemCount: 3 });
    expect(result.ok).toBe(false);
    expect(result.message).toContain('关联核销单');
  });
  it('allows delete when no orders or redeems', () => {
    expect(assertCanDeleteStore({ orderCount: 0, redeemCount: 0 }).ok).toBe(true);
  });
 });
@@ -66,3 +66,33 @@ export function validatePartnerCommissionRates(
  }
  return { ok: true };
 }
 export function assertCanDeleteCityPartner(input: {
  storeCount: number;
  orderCount: number;
  redeemCount: number;
 }): PartnerCityValidationResult {
  if (input.storeCount > 0) {
    return { ok: false, message: '该城市合伙人下还有门店，请先删除门店' };
  }
  if (input.orderCount > 0) {
    return { ok: false, message: '该账号下有关联订单，禁止删除' };
  }
  if (input.redeemCount > 0) {
    return { ok: false, message: '该账号下有关联核销单，禁止删除' };
  }
  return { ok: true };
 }
 export function assertCanDeleteStore(input: {
  orderCount: number;
  redeemCount: number;
 }): PartnerCityValidationResult {
  if (input.orderCount > 0) {
    return { ok: false, message: '该账号下有关联订单，禁止删除' };
  }
  if (input.redeemCount > 0) {
    return { ok: false, message: '该账号下有关联核销单，禁止删除' };
  }
  return { ok: true };
 }
@@ -0,0 +1,25 @@
 import { describe, expect, it } from 'vitest';
 import {
  resolveTaskStatusFromVersions,
  taskStatusFromVersionStatus,
 } from './dev-plan';
 describe('taskStatusFromVersionStatus', () => {
  it('maps version status to task status', () => {
    expect(taskStatusFromVersionStatus('PENDING')).toBe('TODO');
    expect(taskStatusFromVersionStatus('IN_PROGRESS')).toBe('IN_PROGRESS');
    expect(taskStatusFromVersionStatus('TESTING')).toBe('DEVELOPED');
    expect(taskStatusFromVersionStatus('RELEASED')).toBe('RELEASED');
  });
 });
 describe('resolveTaskStatusFromVersions', () => {
  it('returns null when no versions', () => {
    expect(resolveTaskStatusFromVersions([])).toBeNull();
  });
  it('picks the highest mapped status across versions', () => {
    expect(resolveTaskStatusFromVersions(['PENDING', 'TESTING'])).toBe('DEVELOPED');
    expect(resolveTaskStatusFromVersions(['IN_PROGRESS', 'RELEASED'])).toBe('RELEASED');
  });
 });
@@ -61,3 +61,36 @@ export function taskCompletedAtOnStatus(
  void prev;
  return undefined;
 }
 const TASK_STATUS_RANK: Record<DevPlanTaskStatus, number> = {
  TODO: 0,
  IN_PROGRESS: 1,
  DEVELOPED: 2,
  RELEASED: 3,
 };
 /** 版本状态 → 任务状态：待开始/开发中/测试中/已发布 ↔ 待处理/进行中/已开发/已发布 */
 export function taskStatusFromVersionStatus(status: DevPlanVersionStatus): DevPlanTaskStatus {
  switch (status) {
    case 'PENDING':
      return 'TODO';
    case 'IN_PROGRESS':
      return 'IN_PROGRESS';
    case 'TESTING':
      return 'DEVELOPED';
    case 'RELEASED':
      return 'RELEASED';
  }
 }
 /** 任务挂多个版本时取进度最高的对应状态 */
 export function resolveTaskStatusFromVersions(
  versionStatuses: DevPlanVersionStatus[],
 ): DevPlanTaskStatus | null {
  if (!versionStatuses.length) return null;
  return versionStatuses
    .map(taskStatusFromVersionStatus)
    .reduce((highest, current) =>
      TASK_STATUS_RANK[current] > TASK_STATUS_RANK[highest] ? current : highest,
    );
 }
@@ -1,14 +1,18 @@
 import { describe, expect, it } from 'vitest';
 import {
  addShanghaiDays,
  isWineryIssueDay,
  listWineryIssueDays,
  previousShanghaiMonth,
  shanghaiLaggedIssueWindow,
  shanghaiMonthLastInstant,
  shanghaiMonthRange,
  shanghaiPeriodYmds,
  shanghaiT1DayWindow,
  shanghaiWineryPeriodWindow,
  shanghaiYmd,
  startOfShanghaiDay,
  wineryIssueDateFromCompletedAt,
 } from './shanghai-date';
 describe('shanghaiYmd / startOfShanghaiDay', () => {
@@ -46,7 +50,7 @@ describe('shanghaiT1DayWindow', () => {
 });
 describe('shanghaiLaggedIssueWindow', () => {
-  it('酒厂 T+3：出账日是今天，纳入 3 天前完成的订单', () => {
+  it('旧日滞后：出账日是今天，纳入 3 天前完成的订单', () => {
    const { start, end, billDate } = shanghaiLaggedIssueWindow(
      new Date('2026-08-31T00:00:00.000Z'),
      3,
@@ -57,6 +61,55 @@ describe('shanghaiLaggedIssueWindow', () => {
  });
 });
 describe('酒厂 T+3 每 3 天一期', () => {
  const epoch = '2026-08-01';
  const period = 3;
  it('出账日：8/4、8/7、8/28；非 8/5、8/29', () => {
    expect(isWineryIssueDay(new Date('2026-08-04T00:00:00+08:00'), period, epoch)).toBe(true);
    expect(isWineryIssueDay(new Date('2026-08-07T00:00:00+08:00'), period, epoch)).toBe(true);
    expect(isWineryIssueDay(new Date('2026-08-28T00:00:00+08:00'), period, epoch)).toBe(true);
    expect(isWineryIssueDay(new Date('2026-08-01T00:00:00+08:00'), period, epoch)).toBe(false);
    expect(isWineryIssueDay(new Date('2026-08-05T00:00:00+08:00'), period, epoch)).toBe(false);
    expect(isWineryIssueDay(new Date('2026-08-29T00:00:00+08:00'), period, epoch)).toBe(false);
  });
  it('窗口：出账日 8/28 → 完成日 [8/25, 8/28)', () => {
    const { start, end, billDate } = shanghaiWineryPeriodWindow(
      new Date('2026-08-28T00:00:00+08:00'),
      period,
    );
    expect(shanghaiYmd(billDate)).toBe('2026-08-28');
    expect(shanghaiYmd(start)).toBe('2026-08-25');
    expect(shanghaiYmd(end)).toBe('2026-08-28');
  });
  it('完成日归属出账日', () => {
    expect(
      shanghaiYmd(wineryIssueDateFromCompletedAt(new Date('2026-08-01T04:00:00.000Z'), period, epoch)),
    ).toBe('2026-08-04');
    expect(
      shanghaiYmd(wineryIssueDateFromCompletedAt(new Date('2026-08-03T04:00:00.000Z'), period, epoch)),
    ).toBe('2026-08-04');
    expect(
      shanghaiYmd(wineryIssueDateFromCompletedAt(new Date('2026-08-04T04:00:00.000Z'), period, epoch)),
    ).toBe('2026-08-07');
    expect(
      shanghaiYmd(wineryIssueDateFromCompletedAt(new Date('2026-08-27T04:00:00.000Z'), period, epoch)),
    ).toBe('2026-08-28');
  });
  it('listWineryIssueDays 只返回周期日', () => {
    const days = listWineryIssueDays(
      new Date('2026-08-01T00:00:00+08:00'),
      new Date('2026-08-10T00:00:00+08:00'),
      period,
      epoch,
    ).map(shanghaiYmd);
    expect(days).toEqual(['2026-08-04', '2026-08-07', '2026-08-10']);
  });
 });
 describe('addShanghaiDays', () => {
  it('跨月跨年按北京日历加减', () => {
    expect(shanghaiYmd(addShanghaiDays(new Date('2026-08-31T16:00:00.000Z'), 1))).toBe(
@@ -78,23 +131,15 @@ describe('shanghaiMonthRange', () => {
  it('UTC 月末 23:59:59 不会把账期止日滚成下月', () => {
    const periodStart = new Date('2026-08-01T00:00:00.000Z');
-    expect(shanghaiPeriodYmds(periodStart)).toEqual({
+    const ymds = shanghaiPeriodYmds(periodStart);
-      periodStart: '2026-08-01',
+    expect(ymds.periodStart).toBe('2026-08-01');
-      periodEnd: '2026-08-31',
+    expect(ymds.periodEnd).toBe('2026-08-31');
    });
  });
 });
 describe('previousShanghaiMonth', () => {
-  it('北京 9 月 1 日 08:00（UTC 9/1 00:00）取 8 月', () => {
+  it('北京 9 月 1 日取上月为 8 月', () => {
-    expect(previousShanghaiMonth(new Date('2026-09-01T00:00:00.000Z'))).toEqual({
+    expect(previousShanghaiMonth(new Date('2026-08-31T16:00:00.000Z'))).toEqual({
      year: 2026,
      month: 8,
    });
  });
  it('北京 9 月 1 日 00:30（UTC 8/31 16:30）取 8 月，不因 UTC 仍是 8 月而错到 7 月', () => {
    expect(previousShanghaiMonth(new Date('2026-08-31T16:30:00.000Z'))).toEqual({
      year: 2026,
      month: 8,
    });
@@ -33,7 +33,8 @@ export function shanghaiT1DayWindow(anchor = new Date()) {
 }
 /**
- * 酒厂 T+N：出账日 = 今天；纳入窗口为「今天 − lagDays」当天完成的订单
+ * 酒厂日滞后窗口（旧：每天出账只收 lagDays 前那一天）。
 * 现网酒厂已改为「每 periodDays 天出一期」，见 shanghaiWineryPeriodWindow。
 */
 export function shanghaiLaggedIssueWindow(anchor = new Date(), lagDays: number) {
  const billDate = startOfShanghaiDay(anchor);
@@ -42,6 +43,58 @@ export function shanghaiLaggedIssueWindow(anchor = new Date(), lagDays: number)
  return { start, end, billDate };
 }
 /** 两个北京自然日之间相差天数（b − a；可为负） */
 export function shanghaiCalendarDaysBetween(a: Date, b: Date): number {
  const sa = startOfShanghaiDay(a).getTime();
  const sb = startOfShanghaiDay(b).getTime();
  return Math.round((sb - sa) / (24 * 60 * 60 * 1000));
 }
 /** 是否酒厂出账日：相对 epoch，每 periodDays 天一次（首张 = epoch + periodDays） */
 export function isWineryIssueDay(anchor: Date, periodDays: number, epochYmd: string): boolean {
  const billDate = startOfShanghaiDay(anchor);
  const epoch = parseShanghaiYmd(epochYmd);
  const diff = shanghaiCalendarDaysBetween(epoch, billDate);
  return diff >= periodDays && diff % periodDays === 0;
 }
 /**
 * 酒厂 T+N 期账单窗口：出账日 = anchor 当天；纳入 [出账日 − periodDays, 出账日) 内完成的订单。
 * 调用方应先用 isWineryIssueDay 判断是否出账日。
 */
 export function shanghaiWineryPeriodWindow(anchor = new Date(), periodDays: number) {
  const billDate = startOfShanghaiDay(anchor);
  const start = addShanghaiDays(billDate, -periodDays);
  return { start, end: billDate, billDate };
 }
 /** 订单完成日 → 所属酒厂出账日（落入下一期出账日） */
 export function wineryIssueDateFromCompletedAt(
  completedAt: Date,
  periodDays: number,
  epochYmd: string,
 ) {
  const c = startOfShanghaiDay(completedAt);
  const epoch = parseShanghaiYmd(epochYmd);
  const daysFromEpoch = shanghaiCalendarDaysBetween(epoch, c);
  if (daysFromEpoch < 0) {
    return addShanghaiDays(epoch, periodDays);
  }
  const k = Math.floor(daysFromEpoch / periodDays) + 1;
  return addShanghaiDays(epoch, k * periodDays);
 }
 /** 枚举 [from, to] 内（含）的全部酒厂出账日 */
 export function listWineryIssueDays(from: Date, to: Date, periodDays: number, epochYmd: string): Date[] {
  const start = startOfShanghaiDay(from);
  const end = startOfShanghaiDay(to);
  const out: Date[] = [];
  for (let d = start; d.getTime() <= end.getTime(); d = addShanghaiDays(d, 1)) {
    if (isWineryIssueDay(d, periodDays, epochYmd)) out.push(d);
  }
  return out;
 }
 export function shanghaiMonthRange(year: number, month: number): { start: Date; endExclusive: Date } {
  const start = new Date(`${year}-${pad2(month)}-01T00:00:00+08:00`);
  const endMonth = month === 12 ? 1 : month + 1;
@@ -1,5 +1,9 @@
 import { describe, expect, it } from 'vitest';
-import { activityPosterQrSlotPx } from './activity-poster';
+import {
  activityPosterPackFileName,
  activityPosterQrSlotPx,
  activityPosterTemplateTooLarge,
 } from './activity-poster';
 describe('activityPosterQrSlotPx', () => {
  it('uses width for square size', () => {
@@ -18,3 +22,45 @@ describe('activityPosterQrSlotPx', () => {
    });
  });
 });
 describe('activityPosterTemplateTooLarge', () => {
  it('allows 1080x1920', () => {
    expect(activityPosterTemplateTooLarge(1080, 1920)).toBe(false);
  });
  it('rejects edge over 2500', () => {
    expect(activityPosterTemplateTooLarge(2501, 1000)).toBe(true);
  });
  it('rejects pixel count over 4e6', () => {
    expect(activityPosterTemplateTooLarge(2500, 2000)).toBe(true);
  });
 });
 describe('activityPosterPackFileName', () => {
  it('uses city, company, id', () => {
    expect(activityPosterPackFileName({
      cityName: '郑州',
      companyName: '杜康合伙',
      partnerName: '张三',
      partnerId: '12',
    })).toBe('郑州_杜康合伙_12.png');
  });
  it('falls back to partner name when company empty', () => {
    expect(activityPosterPackFileName({
      cityName: '洛阳',
      companyName: '  ',
      partnerName: '李四',
      partnerId: '9',
    })).toBe('洛阳_李四_9.png');
  });
  it('strips path separators', () => {
    expect(activityPosterPackFileName({
      cityName: 'a/b',
      companyName: 'c:d',
      partnerId: '1',
    })).toBe('a-b_c-d_1.png');
  });
 });
@@ -55,6 +55,39 @@ export type ActivityPosterSelectionRequest = {
  posterId?: string | null;
 };
 export type ActivityPosterPackRequest = {
  partnerIds: string[];
 };
 /** 底图最长边（px）；超出则拒绝合成，避免单进程 Sharp 撑爆内存 */
 export const ACTIVITY_POSTER_MAX_EDGE = 2500;
 /** 底图像素上限（宽×高） */
 export const ACTIVITY_POSTER_MAX_PIXELS = 4_000_000;
 /** 单次 zip 最多合伙人数 */
 export const ACTIVITY_POSTER_PACK_MAX_PARTNERS = 200;
 export function activityPosterTemplateTooLarge(width: number, height: number): boolean {
  const w = Math.max(0, Math.round(width));
  const h = Math.max(0, Math.round(height));
  return w > ACTIVITY_POSTER_MAX_EDGE || h > ACTIVITY_POSTER_MAX_EDGE || w * h > ACTIVITY_POSTER_MAX_PIXELS;
 }
 /** zip / 单张下载文件名：`{城市}_{公司或姓名}_{id}.png` */
 export function activityPosterPackFileName(input: {
  cityName?: string | null;
  companyName?: string | null;
  partnerName?: string | null;
  partnerId: string;
 }): string {
  const label = (input.companyName?.trim() || input.partnerName?.trim() || '').trim();
  const raw = [input.cityName?.trim(), label, input.partnerId.trim()]
    .filter(Boolean)
    .join('_')
    .replace(/[\\/:*?"<>|]+/g, '-')
    .replace(/\s+/g, '');
  return `${raw || input.partnerId}.png`;
 }
 /** 码栏百分比 → 像素。size 相对图宽，保证正方形；落点夹在画布内。 */
 export function activityPosterQrSlotPx(
  width: number,
@@ -187,12 +187,16 @@ export interface StoreBillDto {
 export interface WineryBillDto {
  id: string;
  billNo: string;
-  /** 出账日 YYYY-MM-DD（北京时间；T+3 只决定纳入哪天完成的订单，不是账单日） */
+  /** 出账日 YYYY-MM-DD（北京时间；T+3 = 每 3 天一期，纳入上期 3 天完成订单） */
  billDate: string;
  orderCount: number;
  orderAmount: number;
  wineryRate: number;
  wineryAmount: number;
  /**
   * DB：UNPAID | PAID。
   * 业务展示：wineryAmount === 0 时视为「无需打款」（NO_PAYMENT_NEEDED），仍保留账单以便与订单完全比对。
   */
  status: FinancePayStatus;
  paidAt?: string | null;
 }
@@ -210,11 +214,20 @@ export interface WineryBillItemDto {
 /** 门店结算默认比例（核销金额 × 比例） */
 export const STORE_SETTLEMENT_DEFAULT_RATE = 0.6;
-/** 酒厂账单结算比例（酒单实付 × 比例），暂定 30% */
+/** 酒厂账单结算比例（订单实付 × 比例），暂定 30%；含现场提货/同城/跨城 */
 export const WINERY_SETTLEMENT_RATE = 0.3;
-/** 酒厂账单出账滞后自然日（T+3：订单完成日 + 3 天后纳入当天出账的账单；账单日=出账当天北京日历日） */
+/**
-export const WINERY_SETTLEMENT_LAG_DAYS = 3;
+ * 酒厂 T+3：每 3 个自然日出具一张账单；出账日纳入上一期 3 天内完成的已付订单。
 * 例：出账日 8/4 → 完成日 [8/1, 8/4)；下一张 8/7 → [8/4, 8/7)。
 */
 export const WINERY_SETTLEMENT_PERIOD_DAYS = 3;
 /** @deprecated 使用 WINERY_SETTLEMENT_PERIOD_DAYS；保留别名避免旧引用断裂 */
 export const WINERY_SETTLEMENT_LAG_DAYS = WINERY_SETTLEMENT_PERIOD_DAYS;
 /** 酒厂账期对齐起点（北京日）；首张出账日 = 起点 + PERIOD_DAYS */
 export const WINERY_BILL_EPOCH_YMD = '2026-08-01';
 export type { LogisticsSettlementMethod } from './enums';
 export { LOGISTICS_SETTLEMENT_METHOD_LABELS } from './enums';
@@ -25,6 +25,7 @@ export { scanQrCode } from './scan';
 export { invokeWechatPay } from './pay';
 export { chooseWechatImages, canUseWechatChooseImage, formatChooseImageFailMessage } from './chooseImage';
 export type { ChooseWechatImageOptions } from './chooseImage';
 export { previewWechatImage, isHttpImageUrl } from './previewImage';
 export {
  setWechatShareData,
  canUseWechatShare,
@@ -53,6 +54,7 @@ import { getWechatLocation, getWechatLocationDetailed } from './location';
 import { scanQrCode } from './scan';
 import { invokeWechatPay } from './pay';
 import { chooseWechatImages } from './chooseImage';
 import { previewWechatImage } from './previewImage';
 import { setWechatShareData, shareViaWechatSdk } from './share';
 import {
  wechatLogin,
@@ -76,6 +78,7 @@ export function createWeixinSdk(config: WeixinSdkConfig) {
    scanQrCode: (options?: Parameters<typeof scanQrCode>[1]) => scanQrCode(config, options),
    chooseImages: (options?: Parameters<typeof chooseWechatImages>[1]) =>
      chooseWechatImages(config, options),
    previewImage: (url: string) => previewWechatImage(config, url),
    pay: (prepay: Parameters<typeof invokeWechatPay>[0]) =>
      invokeWechatPay(prepay, {
        apiBase: config.apiBase ?? '/api/v1',
@@ -0,0 +1,33 @@
 import { ensureJssdkReady } from './jssdk';
 import type { WeixinSdkConfig } from './types';
 export function isHttpImageUrl(url?: string | null): url is string {
  return !!url && /^https?:\/\//i.test(url.trim());
 }
 /** 微信内预览图片，便于长按保存到相册（须是可公网访问的 http(s) 地址） */
 export async function previewWechatImage(config: WeixinSdkConfig, url: string): Promise<void> {
  const href = url.trim();
  if (!isHttpImageUrl(href)) {
    throw new Error('图片地址无效');
  }
  await ensureJssdkReady({
    apiBase: config.apiBase ?? '/api/v1',
    clientApp: config.clientApp,
    getAccessToken: config.getAccessToken,
  });
  if (!window.wx?.previewImage) {
    throw new Error('微信预览图片不可用');
  }
  await new Promise<void>((resolve, reject) => {
    window.wx!.previewImage!({
      current: href,
      urls: [href],
      success: () => resolve(),
      fail: (res) => reject(new Error(res?.errMsg || '预览失败')),
    });
  });
 }
@@ -58,6 +58,12 @@ export type WxApi = {
    success?: (res: { localData: string }) => void;
    fail?: (res: { errMsg: string }) => void;
  }) => void;
  previewImage: (options: {
    current: string;
    urls: string[];
    success?: () => void;
    fail?: (res: { errMsg: string }) => void;
  }) => void;
  updateAppMessageShareData: (options: {
    title: string;
    desc: string;
@@ -121,6 +127,7 @@ export const DEFAULT_JS_API_LIST = [
  'chooseWXPay',
  'chooseImage',
  'getLocalImgData',
  'previewImage',
  'updateAppMessageShareData',
  'updateTimelineShareData',
  'onMenuShareAppMessage',
@@ -352,6 +352,9 @@ importers:
      ali-oss:
        specifier: ^6.23.0
        version: 6.23.0
      archiver:
        specifier: ^7.0.1
        version: 7.0.1
      bullmq:
        specifier: ^5.12.0
        version: 5.79.2
@@ -404,6 +407,9 @@ importers:
      '@types/ali-oss':
        specifier: ^6.23.3
        version: 6.23.3
      '@types/archiver':
        specifier: ^6.0.4
        version: 6.0.4
      '@types/express':
        specifier: ^4.17.21
        version: 4.17.25
@@ -2708,6 +2714,9 @@ packages:
  '@types/ali-oss@6.23.3':
    resolution: {integrity: sha512-huSf6njkqhSeR37OMJTGMCyUg2d9Zp2AioefhYuUMeh0vNM+WybctrBor7bO/RcCbLCQI6sHn6NtPBIWALYVJg==}
  '@types/archiver@6.0.4':
    resolution: {integrity: sha512-ULdQpARQ3sz9WH4nb98mJDYA0ft2A8C4f4fovvUcFwINa1cgGjY36JCAYuP5YypRq4mco1lJp1/7jEMS2oR0Hg==}
  '@types/archy@0.0.31':
    resolution: {integrity: sha512-v+dxizsFVyXgD3EpFuqT9YjdEjbJmPxNf1QIX9ohZOhxh1ZF2yhqv3vYaeum9lg3VghhxS5S0a6yldN9J9lPEQ==}
@@ -2828,6 +2837,9 @@ packages:
  '@types/react@18.3.31':
    resolution: {integrity: sha512-vfEqpXTvwT91yhmwdfouStN2hSKwTvyRs8qpLfADyrq/kxDw0hZM7Wk9Ug1FELj8hIby+S/+kQCSRFF32nv2Qw==}
  '@types/readdir-glob@1.1.5':
    resolution: {integrity: sha512-raiuEPUYqXu+nvtY2Pe8s8FEmZ3x5yAH4VkLdihcPdalvsHltomrRC9BzuStrJ9yk06470hS0Crw0f1pXqD+Hg==}
  '@types/responselike@1.0.3':
    resolution: {integrity: sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==}
@@ -2991,6 +3003,10 @@ packages:
  '@xtuc/long@4.2.2':
    resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==}
  abort-controller@3.0.0:
    resolution: {integrity: sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==}
    engines: {node: '>=6.5'}
  abortcontroller-polyfill@1.7.8:
    resolution: {integrity: sha512-9f1iZ2uWh92VcrU9Y8x+LdM4DLj75VE0MJB8zuF1iUnroEptStw+DQ8EQPMUdfe5k+PkB1uUfDQfWbhstH8LrQ==}
@@ -3115,10 +3131,18 @@ packages:
    resolution: {integrity: sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==}
    engines: {node: '>= 10'}
  archiver-utils@5.0.2:
    resolution: {integrity: sha512-wuLJMmIBQYCsGZgYLTy5FIB2pF6Lfb6cXMSF8Qywwk3t20zWnAi7zLcQFdKQmIB8wyZpY5ER38x08GbwtR2cLA==}
    engines: {node: '>= 14'}
  archiver@5.3.2:
    resolution: {integrity: sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==}
    engines: {node: '>= 10'}
  archiver@7.0.1:
    resolution: {integrity: sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ==}
    engines: {node: '>= 14'}
  archy@1.0.0:
    resolution: {integrity: sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==}
@@ -3169,6 +3193,14 @@ packages:
  axios@1.18.1:
    resolution: {integrity: sha512-3nTvFlvpn9Zu/RkHUqtc7/+al4UpRW5az71ap5zccp6e8RAYEzhMTecX8Dz1wWDYrPpUoB1HAQEGEAEvUr7S9g==}
  b4a@1.8.1:
    resolution: {integrity: sha512-aiqre1Nr0B/6DgE2N5vwTc+2/oQZ4Wh1t4NznYY4E00y8LCt6NqdRv81so00oo27D8MVKTpUa/MwUUtBLXCoDw==}
    peerDependencies:
      react-native-b4a: '*'
    peerDependenciesMeta:
      react-native-b4a:
        optional: true
  babel-plugin-const-enum@1.2.0:
    resolution: {integrity: sha512-o1m/6iyyFnp9MRsK1dHF3bneqyf3AlM2q3A/YbgQr2pCat6B6XJVDv2TXqzfY2RYUi4mak6WAksSBPlyYGx9dg==}
    peerDependencies:
@@ -3244,6 +3276,43 @@ packages:
    resolution: {integrity: sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==}
    engines: {node: 18 || 20 || >=22}
  bare-events@2.9.2:
    resolution: {integrity: sha512-AIPKioV7/Y/8KfZ3AAhjPJxLLbY49S64Ym5DakZlUg75qQiTgUq9hEJoEwa4eUezPUlXRy/i5NpsKvo9jgKmoA==}
    peerDependencies:
      bare-abort-controller: '*'
    peerDependenciesMeta:
      bare-abort-controller:
        optional: true
  bare-fs@4.8.1:
    resolution: {integrity: sha512-N1nnXdHZAOSstz0XiHikGS4HGMH4CnSwhqWdGQQMqqdvp4Jybm9sE3R1WVnpWVd4SFkc8ryPDBLViNLwiEqECg==}
    engines: {bare: '>=1.28.0'}
    peerDependencies:
      bare-buffer: '*'
    peerDependenciesMeta:
      bare-buffer:
        optional: true
  bare-path@3.1.1:
    resolution: {integrity: sha512-JprUlveX3QjApC1cTpsUOiscADftCGVWkzitbHsRqv84hzYwYHw2mbluddsq5TvI8mH/8Ov1f4BiMAdcB0oYnQ==}
  bare-stream@2.13.4:
    resolution: {integrity: sha512-PcrQ8lVLbiJscNm1Kez+Yp4Gy4AHGcN1lzwjvf5NybWen7VvEgUfyfnXYJ2zNqWnzOfCb1Abq6lH8ti0syQszA==}
    peerDependencies:
      bare-abort-controller: '*'
      bare-buffer: '*'
      bare-events: '*'
    peerDependenciesMeta:
      bare-abort-controller:
        optional: true
      bare-buffer:
        optional: true
      bare-events:
        optional: true
  bare-url@2.5.2:
    resolution: {integrity: sha512-L13PCJzKG8RGvx8V1/DdMi12ERhC3tprr7/8a94BxpmnRsFqxh5XZNdhtMxu5HPkRshYOOWRGY8lDP7ZhpG9Cg==}
  base64-js@0.0.8:
    resolution: {integrity: sha512-3XSA2cR/h/73EzlXXdU6YNycmYI7+kicTxks4eJg2g39biHR84slg2+des+p7iHYhbRg/udIS4TD53WabcOUkw==}
    engines: {node: '>= 0.4'}
@@ -3317,6 +3386,10 @@ packages:
  buffer-crc32@0.2.13:
    resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
  buffer-crc32@1.0.0:
    resolution: {integrity: sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==}
    engines: {node: '>=8.0.0'}
  buffer-equal-constant-time@1.0.1:
    resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==}
@@ -3333,6 +3406,9 @@ packages:
  buffer@5.7.1:
    resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
  buffer@6.0.3:
    resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==}
  buffers@0.1.1:
    resolution: {integrity: sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==}
    engines: {node: '>=0.2.0'}
@@ -3552,6 +3628,10 @@ packages:
    resolution: {integrity: sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==}
    engines: {node: '>= 10'}
  compress-commons@6.0.2:
    resolution: {integrity: sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==}
    engines: {node: '>= 14'}
  compute-scroll-into-view@3.1.1:
    resolution: {integrity: sha512-VRhuHOLoKYOy4UbilLbUzbYg93XLjv2PncJC50EuTWPA3gaja1UjBsUP/D/9/juV3vQFr6XBEzn9KCAHdUvOHw==}
@@ -3645,6 +3725,10 @@ packages:
    resolution: {integrity: sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==}
    engines: {node: '>= 10'}
  crc32-stream@6.0.0:
    resolution: {integrity: sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==}
    engines: {node: '>= 14'}
  create-require@1.1.1:
    resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
@@ -4041,9 +4125,16 @@ packages:
    resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}
    engines: {node: '>= 0.6'}
  event-target-shim@5.0.1:
    resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==}
    engines: {node: '>=6'}
  eventemitter3@5.0.4:
    resolution: {integrity: sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==}
  events-universal@1.0.1:
    resolution: {integrity: sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw==}
  events@3.3.0:
    resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
    engines: {node: '>=0.8.x'}
@@ -4086,6 +4177,9 @@ packages:
  fast-deep-equal@3.1.3:
    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
  fast-fifo@1.3.2:
    resolution: {integrity: sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==}
  fast-glob@3.3.3:
    resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==}
    engines: {node: '>=8.6.0'}
@@ -4689,6 +4783,10 @@ packages:
    resolution: {integrity: sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==}
    engines: {node: '>=0.10.0'}
  is-stream@2.0.1:
    resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
    engines: {node: '>=8'}
  is-stream@3.0.0:
    resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
@@ -5638,6 +5736,10 @@ packages:
  process-nextick-args@2.0.1:
    resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
  process@0.11.10:
    resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
    engines: {node: '>= 0.6.0'}
  promise-polyfill@7.1.2:
    resolution: {integrity: sha512-FuEc12/eKqqoRYIGBrUptCBRhobL19PS2U31vMNTfyck1FxPyMfgsXyW4Mav85y/ZN1hop3hOwRlUDok23oYfQ==}
@@ -5974,6 +6076,10 @@ packages:
    resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
    engines: {node: '>= 6'}
  readable-stream@4.7.0:
    resolution: {integrity: sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
  readdir-glob@1.1.3:
    resolution: {integrity: sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==}
@@ -6352,6 +6458,9 @@ packages:
    resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==}
    engines: {node: '>=10.0.0'}
  streamx@2.28.1:
    resolution: {integrity: sha512-zEzXb0s5Cds7tqMH6rhZ05lcJydCWiQPEwiNngVqzsxCc962vLY4Uw+mW7od8kDH258k2Uz/JrOkdIAAhSh9VA==}
  strict-uri-encode@1.1.0:
    resolution: {integrity: sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==}
    engines: {node: '>=0.10.0'}
@@ -6468,6 +6577,12 @@ packages:
    resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
    engines: {node: '>=6'}
  tar-stream@3.2.1:
    resolution: {integrity: sha512-nqsEO8zLZJvrOMdEwkA0QdCLFbetHMn95Zqu4fKwX+hkaTWJPZZOrxx/PwtxoK0MMGQmBQNRW3CPs8IFYQz4cQ==}
  teex@1.0.1:
    resolution: {integrity: sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==}
  terser-webpack-plugin@5.6.1:
    resolution: {integrity: sha512-201R5j+sJpK8nFWwKVyNfZot8FaJbLZDq5evriVzbV1wDtSXDjRUDRfJzHpAaxFDMEhsZL1QkeqM61wgsS3KaQ==}
    engines: {node: '>= 10.13.0'}
@@ -6516,6 +6631,9 @@ packages:
    engines: {node: '>=10'}
    hasBin: true
  text-decoder@1.2.7:
    resolution: {integrity: sha512-vlLytXkeP4xvEq2otHeJfSQIRyWxo/oZGEbXrtEEF9Hnmrdly59sUbzZ/QgyWuLYHctCHxFF4tRQZNQ9k60ExQ==}
  text-table@0.2.0:
    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
@@ -7082,6 +7200,10 @@ packages:
    resolution: {integrity: sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==}
    engines: {node: '>= 10'}
  zip-stream@6.0.1:
    resolution: {integrity: sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==}
    engines: {node: '>= 14'}
  zrender@6.1.0:
    resolution: {integrity: sha512-oEGMDB6pOP2S6OwRR4PdVv610zrjnA3Bh+JnSG12fYJlBKjtNAoEb5fSUoCOOINlH96I2fU38/A2UpRKs67xYQ==}
@@ -9585,6 +9707,10 @@ snapshots:
  '@types/ali-oss@6.23.3': {}
  '@types/archiver@6.0.4':
    dependencies:
      '@types/readdir-glob': 1.1.5
  '@types/archy@0.0.31': {}
  '@types/babel__core@7.20.5':
@@ -9732,6 +9858,10 @@ snapshots:
      '@types/prop-types': 15.7.15
      csstype: 3.2.3
  '@types/readdir-glob@1.1.5':
    dependencies:
      '@types/node': 20.19.43
  '@types/responselike@1.0.3':
    dependencies:
      '@types/node': 20.19.43
@@ -9998,6 +10128,10 @@ snapshots:
  '@xtuc/long@4.2.2': {}
  abort-controller@3.0.0:
    dependencies:
      event-target-shim: 5.0.1
  abortcontroller-polyfill@1.7.8: {}
  accepts@1.3.8:
@@ -10213,6 +10347,16 @@ snapshots:
      normalize-path: 3.0.0
      readable-stream: 3.6.2
  archiver-utils@5.0.2:
    dependencies:
      glob: 10.4.5
      graceful-fs: 4.2.11
      is-stream: 2.0.1
      lazystream: 1.0.1
      lodash: 4.18.1
      normalize-path: 3.0.0
      readable-stream: 4.7.0
  archiver@5.3.2:
    dependencies:
      archiver-utils: 2.1.0
@@ -10223,6 +10367,20 @@ snapshots:
      tar-stream: 2.2.0
      zip-stream: 4.1.1
  archiver@7.0.1:
    dependencies:
      archiver-utils: 5.0.2
      async: 3.2.6
      buffer-crc32: 1.0.0
      readable-stream: 4.7.0
      readdir-glob: 1.1.3
      tar-stream: 3.2.1
      zip-stream: 6.0.1
    transitivePeerDependencies:
      - bare-abort-controller
      - bare-buffer
      - react-native-b4a
  archy@1.0.0: {}
  arg@4.1.3: {}
@@ -10268,6 +10426,8 @@ snapshots:
      - debug
      - supports-color
  b4a@1.8.1: {}
  babel-plugin-const-enum@1.2.0(@babel/core@7.29.7):
    dependencies:
      '@babel/core': 7.29.7
@@ -10363,6 +10523,35 @@ snapshots:
  balanced-match@4.0.4: {}
  bare-events@2.9.2: {}
  bare-fs@4.8.1:
    dependencies:
      bare-events: 2.9.2
      bare-path: 3.1.1
      bare-stream: 2.13.4(bare-events@2.9.2)
      bare-url: 2.5.2
      fast-fifo: 1.3.2
    transitivePeerDependencies:
      - bare-abort-controller
      - react-native-b4a
  bare-path@3.1.1: {}
  bare-stream@2.13.4(bare-events@2.9.2):
    dependencies:
      b4a: 1.8.1
      streamx: 2.28.1
      teex: 1.0.1
    optionalDependencies:
      bare-events: 2.9.2
    transitivePeerDependencies:
      - react-native-b4a
  bare-url@2.5.2:
    dependencies:
      bare-path: 3.1.1
  base64-js@0.0.8: {}
  base64-js@1.5.1: {}
@@ -10452,6 +10641,8 @@ snapshots:
  buffer-crc32@0.2.13: {}
  buffer-crc32@1.0.0: {}
  buffer-equal-constant-time@1.0.1: {}
  buffer-fill@1.0.0: {}
@@ -10465,6 +10656,11 @@ snapshots:
      base64-js: 1.5.1
      ieee754: 1.2.1
  buffer@6.0.3:
    dependencies:
      base64-js: 1.5.1
      ieee754: 1.2.1
  buffers@0.1.1: {}
  builtin-status-codes@3.0.0: {}
@@ -10735,6 +10931,14 @@ snapshots:
      normalize-path: 3.0.0
      readable-stream: 3.6.2
  compress-commons@6.0.2:
    dependencies:
      crc-32: 1.2.2
      crc32-stream: 6.0.0
      is-stream: 2.0.1
      normalize-path: 3.0.0
      readable-stream: 4.7.0
  compute-scroll-into-view@3.1.1: {}
  concat-map@0.0.1: {}
@@ -10821,6 +11025,11 @@ snapshots:
      crc-32: 1.2.2
      readable-stream: 3.6.2
  crc32-stream@6.0.0:
    dependencies:
      crc-32: 1.2.2
      readable-stream: 4.7.0
  create-require@1.1.1: {}
  cron-parser@4.9.0:
@@ -11274,8 +11483,16 @@ snapshots:
  etag@1.8.1: {}
  event-target-shim@5.0.1: {}
  eventemitter3@5.0.4: {}
  events-universal@1.0.1:
    dependencies:
      bare-events: 2.9.2
    transitivePeerDependencies:
      - bare-abort-controller
  events@3.3.0: {}
  exceljs@4.4.0:
@@ -11366,6 +11583,8 @@ snapshots:
  fast-deep-equal@3.1.3: {}
  fast-fifo@1.3.2: {}
  fast-glob@3.3.3:
    dependencies:
      '@nodelib/fs.stat': 2.0.5
@@ -12041,6 +12260,8 @@ snapshots:
  is-stream@1.1.0: {}
  is-stream@2.0.1: {}
  is-stream@3.0.0: {}
  is-type-of@1.4.0:
@@ -12890,6 +13111,8 @@ snapshots:
  process-nextick-args@2.0.1: {}
  process@0.11.10: {}
  promise-polyfill@7.1.2: {}
  property-expr@2.0.6: {}
@@ -13331,6 +13554,14 @@ snapshots:
      string_decoder: 1.3.0
      util-deprecate: 1.0.2
  readable-stream@4.7.0:
    dependencies:
      abort-controller: 3.0.0
      buffer: 6.0.3
      events: 3.3.0
      process: 0.11.10
      string_decoder: 1.3.0
  readdir-glob@1.1.3:
    dependencies:
      minimatch: 5.1.9
@@ -13773,6 +14004,15 @@ snapshots:
  streamsearch@1.1.0: {}
  streamx@2.28.1:
    dependencies:
      events-universal: 1.0.1
      fast-fifo: 1.3.2
      text-decoder: 1.2.7
    transitivePeerDependencies:
      - bare-abort-controller
      - react-native-b4a
  strict-uri-encode@1.1.0: {}
  string-convert@0.2.1: {}
@@ -13929,6 +14169,24 @@ snapshots:
      inherits: 2.0.4
      readable-stream: 3.6.2
  tar-stream@3.2.1:
    dependencies:
      b4a: 1.8.1
      bare-fs: 4.8.1
      fast-fifo: 1.3.2
      streamx: 2.28.1
    transitivePeerDependencies:
      - bare-abort-controller
      - bare-buffer
      - react-native-b4a
  teex@1.0.1:
    dependencies:
      streamx: 2.28.1
    transitivePeerDependencies:
      - bare-abort-controller
      - react-native-b4a
  terser-webpack-plugin@5.6.1(@swc/core@1.3.96(@swc/helpers@0.5.23))(postcss@8.5.15)(webpack@5.97.1(@swc/core@1.3.96(@swc/helpers@0.5.23))(postcss@8.5.15)):
    dependencies:
      '@jridgewell/trace-mapping': 0.3.31
@@ -13958,6 +14216,12 @@ snapshots:
      commander: 2.20.3
      source-map-support: 0.5.21
  text-decoder@1.2.7:
    dependencies:
      b4a: 1.8.1
    transitivePeerDependencies:
      - react-native-b4a
  text-table@0.2.0: {}
  thenify-all@1.6.0:
@@ -14569,6 +14833,12 @@ snapshots:
      compress-commons: 4.1.2
      readable-stream: 3.6.2
  zip-stream@6.0.1:
    dependencies:
      archiver-utils: 5.0.2
      compress-commons: 6.0.2
      readable-stream: 4.7.0
  zrender@6.1.0:
    dependencies:
      tslib: 2.3.0
@@ -42,6 +42,7 @@
    "@sentry/node": "^10.69.0",
    "@wecom/aibot-node-sdk": "^1.0.7",
    "ali-oss": "^6.23.0",
    "archiver": "^7.0.1",
    "bullmq": "^5.12.0",
    "class-transformer": "^0.5.1",
    "class-validator": "^0.14.1",
@@ -61,6 +62,7 @@
    "@nestjs/cli": "^10.4.0",
    "@nestjs/schematics": "^10.1.0",
    "@types/ali-oss": "^6.23.3",
    "@types/archiver": "^6.0.4",
    "@types/express": "^4.17.21",
    "@types/multer": "^2.1.0",
    "@types/node": "^20.14.0",
@@ -0,0 +1,195 @@
 -- =============================================================================
 -- 酒厂账单一次性修复（v4.0.6）
 -- 库：生产 dukang_prod（也可在已同步的本地 dukang_haoke 先演练）
 --
 -- 规则（与代码一致）：
 --   起点 WINERY_BILL_EPOCH_YMD = 2026-08-01
 --   周期 WINERY_SETTLEMENT_PERIOD_DAYS = 3
 --   出账日 8/4、8/7、8/10 … ；纳入窗口 [出账日-3, 出账日)
 --   订单：status=COMPLETED AND pay_status=PAID
 --         delivery_type IN ('LOCAL','CROSS_CITY','ON_SITE_PICKUP')
 --   账期归属：completed_at（缺则 paid_at）的北京日历日
 --   应付 = ROUND(实付合计 × 0.3, 2)；出账日无单仍留账单（无需打款）
 --   已打款账单不改明细
 --   起点之前已入账的订单（如 7/28 同城挂在 7/31）保持原账单，不迁到 8/4
 --
 -- 本脚本会：
 --   1) 补现场提货等缺 completed_at 的已完成单
 --   2) 按周期补齐出账日账单（含中间应付为 0 的空账）
 --   3) 把未入账 / 挂错期（如 8/29）的同城、跨城、现场提货订单迁入对应出账日
 --   4) 按明细重算未打款表头
 --   5) 删除未打款、无明细、且非周期日的空账单（7/29、8/1、8/29 等）
 --
 -- 建议：先部署含「每 3 天出一期」的 API，再跑本脚本。
 --       若必须先修数据：跑完后尽快发版，避免旧「每日只收 D-3 当天」任务回刷 8/28。
 --
 -- 用法（生产）：
 --   mysql -u... -p dukang_prod < fix-winery-bills-v406.sql
 -- =============================================================================
 START TRANSACTION;
 -- 1) 现场提货等：支付即完成但未写 completed_at
 UPDATE user_order
 SET completed_at = paid_at
 WHERE status = 'COMPLETED'
  AND pay_status = 'PAID'
  AND completed_at IS NULL
  AND paid_at IS NOT NULL;
 -- 2) 补齐周期出账日（8/4 起至「今天北京日」能落到的最后一张）
 INSERT INTO winery_bill (
  bill_no, bill_date, order_count, order_amount, winery_rate, winery_amount, status, created_at
 )
 WITH RECURSIVE issue_days AS (
  SELECT DATE('2026-08-04') AS issue_ymd
  UNION ALL
  SELECT DATE_ADD(issue_ymd, INTERVAL 3 DAY)
  FROM issue_days
  WHERE DATE_ADD(issue_ymd, INTERVAL 3 DAY) <= DATE(DATE_ADD(UTC_TIMESTAMP(), INTERVAL 8 HOUR))
 )
 SELECT
  CONCAT('WBFIX', DATE_FORMAT(d.issue_ymd, '%Y%m%d')) AS bill_no,
  TIMESTAMP(DATE_ADD(d.issue_ymd, INTERVAL -8 HOUR)) AS bill_date,
  0,
  0.00,
  0.3000,
  0.00,
  'UNPAID',
  TIMESTAMP(DATE_ADD(d.issue_ymd, INTERVAL -8 HOUR))
 FROM issue_days d
 WHERE NOT EXISTS (
  SELECT 1
  FROM winery_bill b
  WHERE b.bill_date = TIMESTAMP(DATE_ADD(d.issue_ymd, INTERVAL -8 HOUR))
 );
 -- 3) 起点日及之后：从未打款账单上拿掉挂错期的明细（已打款账单因 status 过滤不会动）
 DELETE i
 FROM winery_bill_item i
 INNER JOIN winery_bill b ON b.id = i.winery_bill_id
 INNER JOIN user_order o ON o.id = i.order_id
 INNER JOIN winery_bill target
  ON target.bill_date = TIMESTAMP(DATE_ADD(
    DATE_ADD(
      DATE('2026-08-01'),
      INTERVAL (FLOOR(DATEDIFF(
        DATE(CONVERT_TZ(COALESCE(o.completed_at, o.paid_at), '+00:00', '+08:00')),
        DATE('2026-08-01')
      ) / 3) + 1) * 3 DAY
    ),
    INTERVAL -8 HOUR
  ))
 WHERE b.status = 'UNPAID'
  AND b.id <> target.id
  AND o.status = 'COMPLETED'
  AND o.pay_status = 'PAID'
  AND o.delivery_type IN ('LOCAL', 'CROSS_CITY', 'ON_SITE_PICKUP')
  AND COALESCE(o.completed_at, o.paid_at) IS NOT NULL
  AND DATE(CONVERT_TZ(COALESCE(o.completed_at, o.paid_at), '+00:00', '+08:00')) >= '2026-08-01';
 -- 4) 把未入账的同城/跨城/现场提货订单写入对应周期账单
 INSERT INTO winery_bill_item (
  winery_bill_id, order_id, order_no, delivery_type, pay_amount, winery_amount, paid_at, created_at
 )
 SELECT
  target.id,
  o.id,
  o.order_no,
  o.delivery_type,
  o.pay_amount,
  ROUND(o.pay_amount * 0.3, 2),
  COALESCE(o.paid_at, o.completed_at),
  UTC_TIMESTAMP(3)
 FROM user_order o
 INNER JOIN winery_bill target
  ON target.bill_date = TIMESTAMP(DATE_ADD(
    DATE_ADD(
      DATE('2026-08-01'),
      INTERVAL (FLOOR(DATEDIFF(
        DATE(CONVERT_TZ(COALESCE(o.completed_at, o.paid_at), '+00:00', '+08:00')),
        DATE('2026-08-01')
      ) / 3) + 1) * 3 DAY
    ),
    INTERVAL -8 HOUR
  ))
 LEFT JOIN winery_bill_item existing ON existing.order_id = o.id
 WHERE o.status = 'COMPLETED'
  AND o.pay_status = 'PAID'
  AND o.delivery_type IN ('LOCAL', 'CROSS_CITY', 'ON_SITE_PICKUP')
  AND COALESCE(o.completed_at, o.paid_at) IS NOT NULL
  AND DATE(CONVERT_TZ(COALESCE(o.completed_at, o.paid_at), '+00:00', '+08:00')) >= '2026-08-01'
  AND existing.id IS NULL;
 -- 5) 按明细重算所有未打款表头（应付为 0 的周期账单也保留）
 UPDATE winery_bill b
 LEFT JOIN (
  SELECT
    winery_bill_id,
    COUNT(*) AS order_count,
    ROUND(SUM(pay_amount), 2) AS order_amount
  FROM winery_bill_item
  GROUP BY winery_bill_id
 ) x ON x.winery_bill_id = b.id
 SET
  b.order_count = IFNULL(x.order_count, 0),
  b.order_amount = IFNULL(x.order_amount, 0.00),
  b.winery_rate = 0.3000,
  b.winery_amount = ROUND(IFNULL(x.order_amount, 0) * 0.3, 2)
 WHERE b.status = 'UNPAID';
 -- 6) 清掉误生成的非周期日空账单（有明细的如 7/31 保留；8/1 虽 MOD=0 但未满 3 天，仍删）
 DELETE b
 FROM winery_bill b
 LEFT JOIN winery_bill_item i ON i.winery_bill_id = b.id
 WHERE b.status = 'UNPAID'
  AND i.id IS NULL
  AND NOT (
    DATEDIFF(DATE(CONVERT_TZ(b.bill_date, '+00:00', '+08:00')), DATE('2026-08-01')) >= 3
    AND MOD(DATEDIFF(DATE(CONVERT_TZ(b.bill_date, '+00:00', '+08:00')), DATE('2026-08-01')), 3) = 0
  );
 COMMIT;
 -- -----------------------------------------------------------------------------
 -- 核对（不改数据）
 -- -----------------------------------------------------------------------------
 SELECT '=== 账单列表 ===' AS s;
 SELECT
  DATE(CONVERT_TZ(bill_date, '+00:00', '+08:00')) AS bill_ymd,
  bill_no,
  order_count,
  order_amount,
  winery_amount,
  status
 FROM winery_bill
 ORDER BY bill_date;
 SELECT '=== 明细按配送类型 ===' AS s;
 SELECT delivery_type, COUNT(*) AS cnt, ROUND(SUM(pay_amount), 2) AS pay_sum
 FROM winery_bill_item
 GROUP BY delivery_type;
 SELECT '=== 应入账但未入账（应为 0 行）===' AS s;
 SELECT o.id, o.order_no, o.delivery_type, o.pay_amount,
  DATE(CONVERT_TZ(COALESCE(o.completed_at, o.paid_at), '+00:00', '+08:00')) AS attr_ymd
 FROM user_order o
 LEFT JOIN winery_bill_item i ON i.order_id = o.id
 WHERE o.status = 'COMPLETED'
  AND o.pay_status = 'PAID'
  AND o.delivery_type IN ('LOCAL', 'CROSS_CITY', 'ON_SITE_PICKUP')
  AND i.id IS NULL;
 SELECT '=== 非周期日仍在的账单（仅允许起点前已入账的，如 7/31）===' AS s;
 SELECT
  DATE(CONVERT_TZ(bill_date, '+00:00', '+08:00')) AS bill_ymd,
  bill_no,
  order_count,
  order_amount,
  status
 FROM winery_bill
 WHERE NOT (
  DATEDIFF(DATE(CONVERT_TZ(bill_date, '+00:00', '+08:00')), DATE('2026-08-01')) >= 3
  AND MOD(DATEDIFF(DATE(CONVERT_TZ(bill_date, '+00:00', '+08:00')), DATE('2026-08-01')), 3) = 0
 )
 ORDER BY bill_date;
@@ -0,0 +1,64 @@
 /**
 * Sequential Sharp compose bench (1 / 10 / 50) on a 1080×1920 template.
 * Usage: node scripts/with-api-env.cjs npx ts-node --transpile-only scripts/bench-activity-poster-pack.ts
 * or from dukang-api: npx ts-node --transpile-only scripts/bench-activity-poster-pack.ts
 */
 import sharp from 'sharp';
 import {
  DEFAULT_ACTIVITY_POSTER_QR_SLOT,
  activityPosterQrSlotPx,
  activityPosterTemplateTooLarge,
 } from '@dukang/shared-types';
 async function png(width: number, height: number, r: number, g: number, b: number) {
  return sharp({
    create: { width, height, channels: 3, background: { r, g, b } },
  })
    .png()
    .toBuffer();
 }
 async function compose(template: Buffer, qrPng: Buffer) {
  const meta = await sharp(template).metadata();
  if (!meta.width || !meta.height) throw new Error('no size');
  if (activityPosterTemplateTooLarge(meta.width, meta.height)) throw new Error('too large');
  const { left, top, size } = activityPosterQrSlotPx(
    meta.width,
    meta.height,
    DEFAULT_ACTIVITY_POSTER_QR_SLOT.qrXPct,
    DEFAULT_ACTIVITY_POSTER_QR_SLOT.qrYPct,
    DEFAULT_ACTIVITY_POSTER_QR_SLOT.qrSizePct,
  );
  const qr = await sharp(qrPng).resize(size, size, { fit: 'fill' }).png().toBuffer();
  return sharp(template).composite([{ input: qr, left, top }]).png().toBuffer();
 }
 function rssMb() {
  return Math.round(process.memoryUsage().rss / 1024 / 1024);
 }
 async function bench(n: number, template: Buffer, qr: Buffer) {
  const t0 = Date.now();
  const rss0 = rssMb();
  let last = 0;
  for (let i = 0; i < n; i += 1) {
    const out = await compose(template, qr);
    last = out.length;
  }
  const ms = Date.now() - t0;
  return { n, ms, avgMs: Math.round(ms / n), rss0, rss1: rssMb(), lastKb: Math.round(last / 1024) };
 }
 async function main() {
  const template = await png(1080, 1920, 160, 32, 32);
  const qr = await png(430, 430, 255, 255, 255);
  console.log(`template=${Math.round(template.length / 1024)}KB qr=${Math.round(qr.length / 1024)}KB rss=${rssMb()}MB`);
  for (const n of [1, 10, 50]) {
    const row = await bench(n, template, qr);
    console.log(
      `n=${row.n} total=${row.ms}ms avg=${row.avgMs}ms rss ${row.rss0}->${row.rss1}MB out≈${row.lastKb}KB`,
    );
  }
 }
 void main();
@@ -11,6 +11,7 @@ export const HqOperationAction = {
  WAREHOUSE_DELETE: 'WAREHOUSE_DELETE',
  PARTNER_CREATE: 'PARTNER_CREATE',
  PARTNER_UPDATE: 'PARTNER_UPDATE',
  PARTNER_DELETE: 'PARTNER_DELETE',
  PARTNER_ACCOUNT_CREATE: 'PARTNER_ACCOUNT_CREATE',
  PARTNER_ACCOUNT_UPDATE: 'PARTNER_ACCOUNT_UPDATE',
  PARTNER_ACCOUNT_DELETE: 'PARTNER_ACCOUNT_DELETE',
@@ -29,6 +30,7 @@ export const HqOperationAction = {
  ORDER_EXPORT: 'ORDER_EXPORT',
  STORE_CREATE: 'STORE_CREATE',
  STORE_UPDATE: 'STORE_UPDATE',
  STORE_DELETE: 'STORE_DELETE',
  STORE_STATUS: 'STORE_STATUS',
  STORE_AUDIT: 'STORE_AUDIT',
  STORE_ACCOUNT_CREATE: 'STORE_ACCOUNT_CREATE',
@@ -75,6 +77,7 @@ export const HqOperationAction = {
  PARTNER_BILL_REJECT: 'PARTNER_BILL_REJECT',
  WINERY_BILL_CONFIRM: 'WINERY_BILL_CONFIRM',
  WINERY_BILL_BATCH_CONFIRM: 'WINERY_BILL_BATCH_CONFIRM',
  WINERY_BILL_RECONCILE: 'WINERY_BILL_RECONCILE',
  LOGISTICS_BILL_CONFIRM: 'LOGISTICS_BILL_CONFIRM',
  LOGISTICS_BILL_BATCH_CONFIRM: 'LOGISTICS_BILL_BATCH_CONFIRM',
  LOGISTICS_PROVIDER_RECHARGE: 'LOGISTICS_PROVIDER_RECHARGE',
@@ -126,6 +129,7 @@ export const HqOperationAction = {
  ACTIVITY_POSTER_UPDATE: 'ACTIVITY_POSTER_UPDATE',
  ACTIVITY_POSTER_UPDATE_STATUS: 'ACTIVITY_POSTER_UPDATE_STATUS',
  ACTIVITY_POSTER_DELETE: 'ACTIVITY_POSTER_DELETE',
  ACTIVITY_POSTER_PACK: 'ACTIVITY_POSTER_PACK',
 } as const;
 export type HqOperationActionCode = (typeof HqOperationAction)[keyof typeof HqOperationAction];
@@ -142,6 +146,7 @@ export const HQ_OPERATION_ACTION_LABELS: Record<string, string> = {
  [HqOperationAction.WAREHOUSE_DELETE]: '删除城市仓库',
  [HqOperationAction.PARTNER_CREATE]: '新增城市合伙人',
  [HqOperationAction.PARTNER_UPDATE]: '编辑城市合伙人',
  [HqOperationAction.PARTNER_DELETE]: '删除城市合伙人',
  [HqOperationAction.PARTNER_ACCOUNT_CREATE]: '新增合伙人账户',
  [HqOperationAction.PARTNER_ACCOUNT_UPDATE]: '编辑合伙人账户',
  [HqOperationAction.PARTNER_ACCOUNT_DELETE]: '删除合伙人子账号',
@@ -160,6 +165,7 @@ export const HQ_OPERATION_ACTION_LABELS: Record<string, string> = {
  [HqOperationAction.ORDER_EXPORT]: '导出订单',
  [HqOperationAction.STORE_CREATE]: '新增门店',
  [HqOperationAction.STORE_UPDATE]: '编辑门店',
  [HqOperationAction.STORE_DELETE]: '删除门店',
  [HqOperationAction.STORE_STATUS]: '变更门店状态',
  [HqOperationAction.STORE_AUDIT]: '门店审核',
  [HqOperationAction.STORE_ACCOUNT_CREATE]: '新增门店账户',
@@ -206,6 +212,7 @@ export const HQ_OPERATION_ACTION_LABELS: Record<string, string> = {
  [HqOperationAction.PARTNER_BILL_REJECT]: '驳回合伙人打款申请',
  [HqOperationAction.WINERY_BILL_CONFIRM]: '酒厂对账单确认打款',
  [HqOperationAction.WINERY_BILL_BATCH_CONFIRM]: '批量酒厂对账单打款',
  [HqOperationAction.WINERY_BILL_RECONCILE]: '酒厂对账单核对补生成',
  [HqOperationAction.LOGISTICS_BILL_CONFIRM]: '物流对账单确认结算',
  [HqOperationAction.LOGISTICS_BILL_BATCH_CONFIRM]: '批量物流对账单结算',
  [HqOperationAction.LOGISTICS_PROVIDER_RECHARGE]: '物流承运商充值',
@@ -257,6 +264,7 @@ export const HQ_OPERATION_ACTION_LABELS: Record<string, string> = {
  [HqOperationAction.ACTIVITY_POSTER_UPDATE]: '编辑活动图',
  [HqOperationAction.ACTIVITY_POSTER_UPDATE_STATUS]: '活动图上下架',
  [HqOperationAction.ACTIVITY_POSTER_DELETE]: '删除活动图',
  [HqOperationAction.ACTIVITY_POSTER_PACK]: '导出合伙人活动图',
  STORE_PAYOUT: '门店打款确认',
 };
@@ -144,8 +144,8 @@ export const SYSTEM_CONFIG_FIELDS: SystemConfigFieldMeta[] = [
    group: G.wechat_mini,
    type: 'string',
    requiresRestart: false,
-    placeholder: '3.4.15',
+    placeholder: '4.0.4',
-    description: 'semver 格式；客户端低于此版本时提示更新',
+    description: 'semver 格式（可带或不带 v）；客户端低于此版本时提示更新',
  },
  {
    key: 'USER_H5_URL',
@@ -1,12 +1,12 @@
 import { Injectable, Logger } from '@nestjs/common';
 import { Cron } from '@nestjs/schedule';
-import { shanghaiYmd } from '@dukang/domain';
+import { addShanghaiDays, shanghaiYmd, startOfShanghaiDay } from '@dukang/domain';
 import { SettlementService } from '../modules/settlement/settlement.service';
 import { AlertService } from '../common/alert/alert.service';
 /**
 * 财务对账单定时任务（Asia/Shanghai）
- * - 每日 08:00：酒厂日账单（T+3：3 天前已完成订单）+ 门店日账单（昨日核销，出账日=今天）
+ * - 每日 08:00：酒厂 T+3 期账单（每 3 天出一期，纳入上期 3 天已完成已付订单）+ 近 45 日出账周期核对补漏 + 门店日账单
 * - 每月 1 日 08:00：合伙人上一自然月账单 + 物流承运商上一自然月对账
 * - 工作日 18:05：门店提现 T+0 审完预警（FIN-003）
 */
@@ -23,8 +23,14 @@ export class SettlementScheduler {
  async handleDailyBills() {
    this.logger.log('Daily settlement bills job start');
    try {
-      const winery = await this.settlementService.generateWineryBillForDay();
+      const today = startOfShanghaiDay(new Date());
-      this.logger.log(`Winery bill: ${JSON.stringify(winery)}`);
+      const reconcile = await this.settlementService.reconcileWineryBills({
        dateFrom: shanghaiYmd(addShanghaiDays(today, -45)),
        dateTo: shanghaiYmd(today),
      });
      this.logger.log(
        `Winery reconcile: days=${reconcile.days} generated=${reconcile.generated} orphans=${reconcile.orphanOrders} cleaned=${reconcile.cleanedNonIssueBills}`,
      );
    } catch (e) {
      this.logger.error('Winery bill job failed', e instanceof Error ? e.stack : e);
      this.alert.notify({
@@ -32,7 +32,11 @@ import type {
 } from '@dukang/shared-types';
-import { taskCompletedAtOnStatus, versionStatusTimestamps } from '@dukang/domain';
+import {
  resolveTaskStatusFromVersions,
  taskCompletedAtOnStatus,
  versionStatusTimestamps,
 } from '@dukang/domain';
 import { PrismaService } from '../../common/prisma/prisma.module';
@@ -530,6 +534,8 @@ export class DevPlanService {
      await this.replaceTaskVersions(id, dto.versionIds);
    }
    await this.syncLinkedTaskStatuses([id]);
    return this.getTask(id);
  }
@@ -768,8 +774,10 @@ export class DevPlanService {
    }
    await this.syncLinkedTasksForVersion(row.id);
    if (status === 'RELEASED') {
-      await this.cascadeVersionReleased(row.id, row.versionNo);
+      await this.cascadeTicketsPublished(row.id, row.versionNo);
    }
    return this.getVersion(row.id);
@@ -840,15 +848,16 @@ export class DevPlanService {
    await this.prisma.devPlanVersion.update({ where: { id }, data });
-    if (
+    if (dto.taskIds != null) await this.replaceVersionTasks(id, dto.taskIds);
-      dto.status === 'RELEASED' &&
+
-      existing.status !== 'RELEASED'
+    if (dto.status != null || dto.taskIds != null) {
-    ) {
+      await this.syncLinkedTasksForVersion(id);
      const versionNo = (dto.versionNo ?? existing.versionNo).trim();
      await this.cascadeVersionReleased(id, versionNo);
    }
-    if (dto.taskIds != null) await this.replaceVersionTasks(id, dto.taskIds);
+    if (dto.status === 'RELEASED' && existing.status !== 'RELEASED') {
      const versionNo = (dto.versionNo ?? existing.versionNo).trim();
      await this.cascadeTicketsPublished(id, versionNo);
    }
    return this.getVersion(id);
@@ -880,11 +889,58 @@ export class DevPlanService {
    await this.replaceVersionTasks(versionId, taskIds);
    await this.syncLinkedTasksForVersion(versionId);
    return this.getVersion(versionId);
  }
-  private async cascadeVersionReleased(versionId: bigint, versionNo: string) {
+  private async syncLinkedTasksForVersion(versionId: bigint) {
    const links = await this.prisma.devPlanVersionTask.findMany({
      where: { versionId },
      select: { taskId: true },
    });
    await this.syncLinkedTaskStatuses(links.map((l) => l.taskId));
  }
  private async syncLinkedTaskStatuses(taskIds: bigint[]) {
    const uniq = [...new Set(taskIds)];
    if (!uniq.length) return;
    const [tasks, links] = await Promise.all([
      this.prisma.devPlanTask.findMany({
        where: { id: { in: uniq } },
        select: { id: true, status: true, completedAt: true },
      }),
      this.prisma.devPlanVersionTask.findMany({
        where: { taskId: { in: uniq } },
        include: { version: { select: { status: true } } },
      }),
    ]);
    const statusesByTask = new Map<string, DevPlanVersionStatus[]>();
    for (const link of links) {
      const key = String(link.taskId);
      const list = statusesByTask.get(key) ?? [];
      list.push(link.version.status);
      statusesByTask.set(key, list);
    }
    for (const task of tasks) {
      const next = resolveTaskStatusFromVersions(statusesByTask.get(String(task.id)) ?? []);
      if (!next || next === task.status) continue;
      const completed = taskCompletedAtOnStatus(task.status, next, task.completedAt);
      await this.prisma.devPlanTask.update({
        where: { id: task.id },
        data: {
          status: next,
          ...(completed ? { completedAt: completed } : {}),
        },
      });
    }
  }
  private async cascadeTicketsPublished(versionId: bigint, versionNo: string) {
    const links = await this.prisma.devPlanVersionTask.findMany({
      where: { versionId },
      select: { taskId: true },
@@ -894,33 +950,26 @@ export class DevPlanService {
    const taskIds = links.map((l) => l.taskId);
    const now = new Date();
-    await this.prisma.$transaction(async (tx) => {
+    const tasks = await this.prisma.devPlanTask.findMany({
-      await tx.devPlanTask.updateMany({
+      where: { id: { in: taskIds }, supportTicketId: { not: null } },
-        where: { id: { in: taskIds }, status: { not: 'RELEASED' } },
+      select: { supportTicketId: true },
-        data: { status: 'RELEASED', completedAt: now },
+    });
-      });
+    const ticketIds = [
      ...new Set(
        tasks
          .map((t) => t.supportTicketId)
          .filter((id): id is bigint => id != null),
      ),
    ];
    if (!ticketIds.length) return;
-      const tasks = await tx.devPlanTask.findMany({
+    await this.prisma.commonSupportTicket.updateMany({
-        where: { id: { in: taskIds }, supportTicketId: { not: null } },
+      where: { id: { in: ticketIds }, status: { not: 'REJECTED' } },
-        select: { supportTicketId: true },
+      data: {
-      });
+        status: 'PUBLISHED',
-      const ticketIds = [
+        releasedVersionNo: versionNo,
-        ...new Set(
+        publishedAt: now,
-          tasks
+      },
            .map((t) => t.supportTicketId)
            .filter((id): id is bigint => id != null),
        ),
      ];
      if (!ticketIds.length) return;
      await tx.commonSupportTicket.updateMany({
        where: { id: { in: ticketIds }, status: { not: 'REJECTED' } },
        data: {
          status: 'PUBLISHED',
          releasedVersionNo: versionNo,
          publishedAt: now,
        },
      });
    });
  }
@@ -976,6 +1025,8 @@ export class DevPlanService {
    await this.addVersionTasks(versionId, taskIds);
    await this.syncLinkedTasksForVersion(versionId);
    return this.getVersion(versionId);
  }
@@ -1248,7 +1299,7 @@ export class DevPlanService {
    }
-
+    await this.syncLinkedTaskStatuses(taskIds);
    return { updated: taskIds.length };
@@ -1,6 +1,12 @@
 import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
 import { Prisma } from '@prisma/client';
-import { activityPosterQrSlotPx } from '@dukang/shared-types';
+import {
  activityPosterPackFileName,
  activityPosterQrSlotPx,
  activityPosterTemplateTooLarge,
 } from '@dukang/shared-types';
 import archiver from 'archiver';
 import type { Response } from 'express';
 import sharp from 'sharp';
 import { PrismaService } from '../../common/prisma/prisma.module';
 import { serializeBigInt } from '../../common/decorators/current-user.decorator';
@@ -108,11 +114,7 @@ export class ActivityPosterService {
  }
  async composeForPartner(partnerAccountId: bigint, posterId: bigint) {
-    const poster = await this.require(posterId);
+    const poster = await this.requireActive(posterId);
    if (poster.status !== 'ACTIVE') {
      throw new NotFoundException('活动图不存在或已下架');
    }
    let qr: { buffer: Buffer; fileName: string };
    try {
      qr = await this.partnerAssoc.getQrcodeBuffer(partnerAccountId);
@@ -123,17 +125,139 @@ export class ActivityPosterService {
      throw e;
    }
    const template = await this.fetchPngLike(poster.imageUrl, '活动图底图下载失败');
    const buffer = await this.compose(template, qr.buffer, poster);
    return { buffer, fileName: `activity-poster-${poster.id}.png` };
  }
-  private async compose(template: Buffer, qrPng: Buffer, poster: PosterRow) {
+  async composeForHqPartner(partnerAccountId: bigint, posterId: bigint) {
-    const base = sharp(template);
+    const poster = await this.requireActive(posterId);
-    const meta = await base.metadata();
+    const qr = await this.partnerAssoc.getExistingQrcodeBuffer(partnerAccountId);
    if (!qr) {
      throw new BadRequestException('关联码尚未生成，无法合成活动图');
    }
    const template = await this.fetchPngLike(poster.imageUrl, '活动图底图下载失败');
    const buffer = await this.compose(template, qr.buffer, poster);
    return { buffer, fileName: await this.fileNameForPartner(partnerAccountId) };
  }
  async packForPartners(posterId: bigint, partnerIds: string[], res: Response) {
    const ids = uniqueNumericIds(partnerIds);
    if (!ids.length) throw new BadRequestException('请选择有效的合伙人');
    const poster = await this.requireActive(posterId);
    const template = await this.fetchPngLike(poster.imageUrl, '活动图底图下载失败');
    await this.assertTemplateSize(template);
    const rows = await this.prisma.partnerAccount.findMany({
      where: { id: { in: ids.map((id) => BigInt(id)) }, isPrimary: 1 },
      select: {
        id: true,
        isTest: true,
        companyName: true,
        name: true,
        assocQrcodeResource: { select: { url: true } },
        city: { select: { name: true } },
      },
    });
    const byId = new Map(rows.map((row) => [row.id.toString(), row]));
    res.setHeader('Content-Type', 'application/zip');
    res.setHeader(
      'Content-Disposition',
      `attachment; filename="activity-poster-${poster.id.toString()}-pack.zip"`,
    );
    res.setHeader('Cache-Control', 'no-store');
    const archive = archiver('zip', { zlib: { level: 6 } });
    const done = new Promise<void>((resolve, reject) => {
      archive.on('end', () => resolve());
      archive.on('error', reject);
      res.on('error', reject);
    });
    archive.pipe(res);
    const skipped: string[] = [];
    for (const id of ids) {
      const row = byId.get(id);
      if (!row) {
        skipped.push(`${id}\t不是有效主合伙人`);
        continue;
      }
      if (row.isTest) {
        skipped.push(`${id}\t测试账号已跳过`);
        continue;
      }
      const qrUrl = row.assocQrcodeResource?.url;
      if (!qrUrl) {
        skipped.push(`${id}\t关联码尚未生成`);
        continue;
      }
      const qrRes = await fetch(qrUrl);
      if (!qrRes.ok) {
        skipped.push(`${id}\t关联码下载失败`);
        continue;
      }
      const qrBuffer = Buffer.from(await qrRes.arrayBuffer());
      try {
        const buffer = await this.compose(template, qrBuffer, poster);
        archive.append(buffer, {
          name: activityPosterPackFileName({
            cityName: row.city?.name,
            companyName: row.companyName,
            partnerName: row.name,
            partnerId: id,
          }),
        });
      } catch {
        skipped.push(`${id}\t合成失败`);
      }
    }
    if (skipped.length) {
      archive.append(`${skipped.join('\n')}\n`, { name: '_skipped.txt' });
    }
    await archive.finalize();
    await done;
  }
  private async fileNameForPartner(partnerAccountId: bigint) {
    const row = await this.prisma.partnerAccount.findUnique({
      where: { id: partnerAccountId },
      select: { id: true, companyName: true, name: true, city: { select: { name: true } } },
    });
    return activityPosterPackFileName({
      cityName: row?.city?.name,
      companyName: row?.companyName,
      partnerName: row?.name,
      partnerId: partnerAccountId.toString(),
    });
  }
  private async requireActive(id: bigint) {
    const poster = await this.require(id);
    if (poster.status !== 'ACTIVE') {
      throw new NotFoundException('活动图不存在或已下架');
    }
    return poster;
  }
  private async assertTemplateSize(template: Buffer) {
    const meta = await sharp(template).metadata();
    if (!meta.width || !meta.height) {
      throw new BadRequestException('活动图底图无法读取尺寸');
    }
    if (activityPosterTemplateTooLarge(meta.width, meta.height)) {
      throw new BadRequestException('活动图底图过大，请压缩后再上传（最长边不超过 2500px）');
    }
  }
  private async compose(template: Buffer, qrPng: Buffer, poster: PosterRow) {
    const meta = await sharp(template).metadata();
    if (!meta.width || !meta.height) {
      throw new BadRequestException('活动图底图无法读取尺寸');
    }
    if (activityPosterTemplateTooLarge(meta.width, meta.height)) {
      throw new BadRequestException('活动图底图过大，请压缩后再上传（最长边不超过 2500px）');
    }
    const { left, top, size } = activityPosterQrSlotPx(
      meta.width,
      meta.height,
@@ -142,7 +266,7 @@ export class ActivityPosterService {
      Number(poster.qrSizePct),
    );
    const qr = await sharp(qrPng).resize(size, size, { fit: 'fill' }).png().toBuffer();
-    return base.composite([{ input: qr, left, top }]).png().toBuffer();
+    return sharp(template).composite([{ input: qr, left, top }]).png().toBuffer();
  }
  private async fetchPngLike(url: string, failMessage: string) {
@@ -186,3 +310,15 @@ export class ActivityPosterService {
    };
  }
 }
 function uniqueNumericIds(raw: string[]): string[] {
  const seen = new Set<string>();
  const ids: string[] = [];
  for (const item of raw) {
    const id = String(item ?? '').trim();
    if (!/^\d+$/.test(id) || seen.has(id)) continue;
    seen.add(id);
    ids.push(id);
  }
  return ids;
 }
@@ -1,10 +1,12 @@
-import { Body, Controller, Delete, Get, Param, Post, Put, Query, UseGuards } from '@nestjs/common';
+import { Body, Controller, Delete, Get, Param, Post, Put, Query, Res, UseGuards, BadRequestException } from '@nestjs/common';
 import type { Response } from 'express';
 import { HqAuthGuard } from '../../common/guards/hq-auth.guard';
 import { HqPermissionGuard, RequireHqPermissions } from '../../common/guards/hq-permission.guard';
 import { HqOperation } from '../../common/hq-operation/hq-operation.decorator';
 import { HqOperationAction } from '../../common/hq-operation/hq-operation.constants';
 import { ActivityPosterService } from './activity-poster.service';
 import {
  ActivityPosterPackDto,
  ActivityPosterQueryDto,
  UpdateActivityPosterStatusDto,
  UpsertActivityPosterDto,
@@ -21,6 +23,36 @@ export class AdminActivityPostersController {
    return this.service.adminList(query);
  }
  @Get(':id/image')
  async image(
    @Param('id') id: string,
    @Query('partnerId') partnerId: string,
    @Res() res: Response,
  ) {
    if (!partnerId || !/^\d+$/.test(partnerId.trim())) {
      throw new BadRequestException('请指定合伙人');
    }
    const { buffer, fileName } = await this.service.composeForHqPartner(BigInt(partnerId.trim()), BigInt(id));
    res.setHeader('Content-Type', 'image/png');
    res.setHeader(
      'Content-Disposition',
      `attachment; filename="activity-poster.png"; filename*=UTF-8''${encodeURIComponent(fileName)}`,
    );
    res.send(buffer);
  }
  @Post(':id/partner-pack')
  @HqOperation({
    action: HqOperationAction.ACTIVITY_POSTER_PACK,
    refType: 'ACTIVITY_POSTER',
    refIdParam: 'id',
    includeBody: true,
    includeResponse: false,
  })
  async pack(@Param('id') id: string, @Body() dto: ActivityPosterPackDto, @Res() res: Response) {
    await this.service.packForPartners(BigInt(id), dto.partnerIds, res);
  }
  @Get(':id')
  detail(@Param('id') id: string) {
    return this.service.adminDetail(BigInt(id));
@@ -56,6 +56,16 @@ export class AdminPartnersController {
    return this.service.updatePartner(BigInt(id), dto);
  }
  @Delete(':id')
  @HqOperation({
    action: HqOperationAction.PARTNER_DELETE,
    refType: 'PARTNER',
    refIdParam: 'id',
  })
  remove(@Param('id') id: string) {
    return this.service.deletePartner(BigInt(id));
  }
  @Get(':id/assoc')
  assocSummary(@Param('id') id: string) {
    return this.assoc.getSummary(BigInt(id));
@@ -1,6 +1,10 @@
 import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
 import { Prisma, CityPartnerScopeType, CityPartnerStatus } from '@prisma/client';
-import { resolveMaxPartnerCommissionRate, validatePartnerCommissionRates } from '@dukang/domain';
+import {
  assertCanDeleteCityPartner,
  resolveMaxPartnerCommissionRate,
  validatePartnerCommissionRates,
 } from '@dukang/domain';
 import { PrismaService } from '../../common/prisma/prisma.module';
 import { serializeBigInt } from '../../common/decorators/current-user.decorator';
 import { PartnerCityService } from '../city-scope/partner-city.service';
@@ -502,6 +506,62 @@ export class AdminPartnersService {
    return serializeBigInt(account);
  }
  async deletePartner(id: bigint) {
    const account = await this.prisma.partnerAccount.findFirst({
      where: { id, ...PRIMARY_WHERE },
      include: { children: { select: { id: true } } },
    });
    if (!account) throw new NotFoundException('开城合伙人不存在');
    const accountIds = [id, ...account.children.map((c) => c.id)];
    const [storeCount, orderCount, billCount, redeemCount] = await Promise.all([
      this.prisma.store.count({ where: { partnerAccountId: { in: accountIds } } }),
      this.prisma.order.count({
        where: {
          OR: [
            { partnerAccountIdAtPay: { in: accountIds } },
            { proxyPartnerAccountId: { in: accountIds } },
          ],
        },
      }),
      this.prisma.partnerBill.count({ where: { partnerAccountId: { in: accountIds } } }),
      this.prisma.redeemRecord.count({
        where: { store: { partnerAccountId: { in: accountIds } } },
      }),
    ]);
    const check = assertCanDeleteCityPartner({
      storeCount,
      orderCount: orderCount + billCount,
      redeemCount,
    });
    if (!check.ok) throw new BadRequestException(check.message);
    await this.prisma.$transaction(async (tx) => {
      await tx.user.updateMany({
        where: { assocPartnerAccountId: { in: accountIds } },
        data: { assocPartnerAccountId: null, assocBoundAt: null },
      });
      await tx.partnerUserNote.deleteMany({ where: { partnerAccountId: { in: accountIds } } });
      await tx.logPartnerAnalytics.deleteMany({ where: { partnerAccountId: { in: accountIds } } });
      await tx.cityWarehouse.updateMany({
        where: { partnerAccountId: { in: accountIds } },
        data: { partnerAccountId: null },
      });
      await tx.partnerAccount.updateMany({
        where: { id: { in: accountIds } },
        data: { managedWarehouseId: null, assocQrcodeResourceId: null, activityPosterId: null },
      });
      const childIds = account.children.map((c) => c.id);
      if (childIds.length) {
        await tx.partnerAccount.deleteMany({ where: { id: { in: childIds } } });
      }
      await tx.partnerAccount.delete({ where: { id } });
    });
    return { ok: true, message: '城市合伙人已删除' };
  }
  async deletePartnerSubAccount(id: bigint) {
    const account = await this.prisma.partnerAccount.findUnique({ where: { id } });
    if (!account) throw new NotFoundException('合伙人账号不存在');
@@ -52,6 +52,12 @@ export class AdminStoresController {
    return this.service.updateStore(BigInt(id), dto, user.actorId);
  }
  @Delete(':id')
  @HqOperation({ action: HqOperationAction.STORE_DELETE, refType: 'STORE', refIdParam: 'id' })
  remove(@CurrentUser() user: AuthUser, @Param('id') id: string) {
    return this.service.deleteStore(BigInt(id), user.actorId);
  }
  @Put(':id/status')
  @HqOperation({ action: HqOperationAction.STORE_STATUS, refType: 'STORE', refIdParam: 'id', includeBody: true })
  updateStatus(@CurrentUser() user: AuthUser, @Param('id') id: string, @Body() dto: UpdateStoreStatusDto) {
@@ -1,6 +1,12 @@
 import { BadRequestException, ForbiddenException, Injectable, NotFoundException } from '@nestjs/common';
 import { Prisma } from '@prisma/client';
-import { isMobilePhone, isStoreContactPhone, STORE_CONTACT_PHONE_HINT, validateBusinessHours } from '@dukang/domain';
+import {
  assertCanDeleteStore,
  isMobilePhone,
  isStoreContactPhone,
  STORE_CONTACT_PHONE_HINT,
  validateBusinessHours,
 } from '@dukang/domain';
 import { PrismaService } from '../../common/prisma/prisma.module';
 import { serializeBigInt } from '../../common/decorators/current-user.decorator';
 import { mapStoreCompat } from '../../common/compat/v31-compat';
@@ -241,6 +247,88 @@ export class AdminStoresService {
    return serializeBigInt(store);
  }
  async deleteStore(id: bigint, actorId: bigint) {
    await this.hqPermissions.assertStoreIdInScope(actorId, id);
    const store = await this.prisma.store.findUnique({
      where: { id },
      include: { bindings: { select: { storeAccountId: true } } },
    });
    if (!store) throw new NotFoundException('门店不存在');
    const [redeemCount, pendingCount, payoutCount, billCount, ratingCount, withdrawCount] =
      await Promise.all([
        this.prisma.redeemRecord.count({ where: { storeId: id } }),
        this.prisma.redeemPendingRecord.count({ where: { storeId: id } }),
        this.prisma.storePayout.count({ where: { storeId: id } }),
        this.prisma.storeBill.count({ where: { storeId: id } }),
        this.prisma.storeRating.count({ where: { storeId: id } }),
        this.prisma.storeWithdrawRequest.count({ where: { storeId: id } }),
      ]);
    const check = assertCanDeleteStore({
      orderCount: 0,
      redeemCount:
        redeemCount + pendingCount + payoutCount + billCount + ratingCount + withdrawCount,
    });
    if (!check.ok) throw new BadRequestException(check.message);
    const accountIds = [...new Set(store.bindings.map((b) => b.storeAccountId))];
    const exclusiveAccountIds: bigint[] = [];
    for (const accountId of accountIds) {
      const otherBindings = await this.prisma.storeAccountStore.count({
        where: { storeAccountId: accountId, NOT: { storeId: id } },
      });
      if (otherBindings === 0) exclusiveAccountIds.push(accountId);
    }
    const staffToDelete: bigint[] = [];
    if (exclusiveAccountIds.length) {
      const staff = await this.prisma.storeAccount.findMany({
        where: { parentAccountId: { in: exclusiveAccountIds }, isPrimary: 0 },
        select: { id: true },
      });
      for (const row of staff) {
        const other = await this.prisma.storeAccountStore.count({
          where: { storeAccountId: row.id, NOT: { storeId: id } },
        });
        if (other > 0) continue;
        const pending = await this.prisma.redeemPendingRecord.count({
          where: { storeAccountId: row.id },
        });
        if (pending > 0) {
          throw new BadRequestException('该账号下有关联核销单，禁止删除');
        }
        staffToDelete.push(row.id);
      }
    }
    await this.prisma.$transaction(async (tx) => {
      await tx.store.update({ where: { id }, data: { coverResourceId: null } });
      await tx.commonResource.updateMany({
        where: { ownerType: 'STORE', ownerId: id },
        data: { status: 'DELETED' },
      });
      await tx.logStoreAnalytics.deleteMany({ where: { storeId: id } });
      await tx.store.delete({ where: { id } });
      if (staffToDelete.length) {
        await tx.logStoreAnalytics.deleteMany({ where: { storeAccountId: { in: staffToDelete } } });
        await tx.storeAccount.deleteMany({ where: { id: { in: staffToDelete } } });
      }
      if (exclusiveAccountIds.length) {
        await tx.logStoreAnalytics.deleteMany({
          where: { storeAccountId: { in: exclusiveAccountIds } },
        });
        await tx.storeAccount.updateMany({
          where: { parentAccountId: { in: exclusiveAccountIds } },
          data: { parentAccountId: null },
        });
        await tx.storeAccount.deleteMany({ where: { id: { in: exclusiveAccountIds } } });
      }
    });
    return { ok: true, message: '门店及门店账号已删除' };
  }
  async auditStore(id: bigint, dto: { approved: boolean; remark?: string }, actorId: bigint) {
    await this.hqPermissions.assertStoreIdInScope(actorId, id);
    const store = await this.prisma.store.findUnique({ where: { id } });
@@ -1,5 +1,8 @@
 import { Type } from 'class-transformer';
 import {
  ArrayMaxSize,
  ArrayMinSize,
  IsArray,
  IsIn,
  IsInt,
  IsNumber,
@@ -11,7 +14,7 @@ import {
  MinLength,
  ValidateIf,
 } from 'class-validator';
-import { ACTIVITY_POSTER_STATUSES } from '@dukang/shared-types';
+import { ACTIVITY_POSTER_PACK_MAX_PARTNERS, ACTIVITY_POSTER_STATUSES } from '@dukang/shared-types';
 import { PaginationQueryDto } from './admin-query.dto';
 export class ActivityPosterQueryDto extends PaginationQueryDto {
@@ -76,3 +79,11 @@ export class ActivityPosterSelectionDto {
  @IsString()
  posterId?: string | null;
 }
 export class ActivityPosterPackDto {
  @IsArray()
  @ArrayMinSize(1)
  @ArrayMaxSize(ACTIVITY_POSTER_PACK_MAX_PARTNERS)
  @IsString({ each: true })
  partnerIds!: string[];
 }
@@ -1,5 +1,6 @@
 import { BadRequestException, Body, Controller, Get, Param, Post, Put, Query, UseGuards } from '@nestjs/common';
 import { IsOptional, IsString } from 'class-validator';
 import { parseShanghaiYmd } from '@dukang/domain';
 import { DEFAULT_PARTNER_STORE_STAFF_PERMISSIONS } from '@dukang/shared-types';
 import { SettlementService } from './settlement.service';
 import { JwtAuthGuard, AuthUser } from '../../common/guards/jwt-auth.guard';
@@ -464,8 +465,23 @@ export class AdminWineryBillController {
  }
  @Post('generate')
-  generate() {
+  generate(@Body() body?: { date?: string }) {
-    return this.settlementService.generateWineryBillForDay();
+    const anchor = body?.date?.trim() ? parseShanghaiYmd(body.date.trim()) : new Date();
    if (body?.date?.trim() && Number.isNaN(anchor.getTime())) {
      throw new BadRequestException('日期格式无效，请使用 YYYY-MM-DD');
    }
    return this.settlementService.generateWineryBillForDay(anchor);
  }
  @Post('reconcile')
  @HqOperation({
    action: HqOperationAction.WINERY_BILL_RECONCILE,
    refType: 'WINERY_BILL',
    batch: true,
    includeBody: true,
  })
  reconcile(@Body() body?: { dateFrom?: string; dateTo?: string }) {
    return this.settlementService.reconcileWineryBills(body);
  }
  @Post('batch-confirm')
@@ -5,27 +5,31 @@ import {
  DEFAULT_XFX_LOGISTICS_PRICING,
  LOGISTICS_SETTLEMENT_METHOD_LABELS,
  PAYMENT_PROOF_IMAGE_MAX_COUNT,
-  WINERY_SETTLEMENT_LAG_DAYS,
+  WINERY_BILL_EPOCH_YMD,
  WINERY_SETTLEMENT_PERIOD_DAYS,
  WINERY_SETTLEMENT_RATE,
 } from '@dukang/shared-types';
 import {
  addShanghaiDays,
  calcLogisticsFeeByBottles,
  calcRedeemSettleAmount,
  isWineryIssueDay,
  listWineryIssueDays,
  parseShanghaiYmd,
  pickPayoutsForWithdrawAmount,
  previousShanghaiMonth,
  resolveSettlementRate,
  shanghaiLaggedIssueWindow,
  shanghaiMonthLastInstant,
  shanghaiMonthRange,
  shanghaiPeriodYmds,
  shanghaiT1DayWindow,
  shanghaiWineryPeriodWindow,
  shanghaiYearMonth,
  shanghaiYmd,
  startOfShanghaiDay,
  sumUnbilledPayoutAmount,
  validateStoreWithdraw,
  wineryIssueDateFromCompletedAt,
  type LogisticsPricingRule,
 } from '@dukang/domain';
 import { PrismaService } from '../../common/prisma/prisma.module';
@@ -236,19 +240,25 @@ export class SettlementService implements OnModuleInit {
    }
  }
-  /** 酒厂账单日改为出账当天（不再存 T+3 完成日） */
+  /**
   * 一次性：旧「billDate = 完成日」改为出账当天。
   * 已是 T+3 周期出账日的账单禁止再按 createdAt 挪日，否则补生成的历史期账单会被改成今天。
   */
  private async realignWineryBillIssueDates(): Promise<number> {
    const locked = await this.prisma.$queryRaw<Array<{ acquired: number | bigint | null }>>`
      SELECT GET_LOCK('winery_bill_issue_date_align', 5) AS acquired
    `;
    if (!Number(locked[0]?.acquired)) return 0;
    try {
      const periodDays = WINERY_SETTLEMENT_PERIOD_DAYS;
      const epochYmd = WINERY_BILL_EPOCH_YMD;
      const bills = await this.prisma.wineryBill.findMany({
        select: { id: true, billDate: true, createdAt: true },
        orderBy: { createdAt: 'desc' },
      });
      let shifted = 0;
      for (const b of bills) {
        if (isWineryIssueDay(b.billDate, periodDays, epochYmd)) continue;
        const issue = startOfShanghaiDay(b.createdAt);
        if (shanghaiYmd(b.billDate) === shanghaiYmd(issue)) continue;
        const clash = await this.prisma.wineryBill.findUnique({ where: { billDate: issue } });
@@ -2201,10 +2211,58 @@ export class SettlementService implements OnModuleInit {
  // ─── Winery bills ────────────────────────────────────
-  async generateWineryBillForDay(anchor = new Date()) {
+  /** 酒厂账单纳入的配送类型：同城 / 跨城 / 现场提货 */
-    const { start, end, billDate } = shanghaiLaggedIssueWindow(anchor, WINERY_SETTLEMENT_LAG_DAYS);
+  private static readonly WINERY_DELIVERY_TYPES = ['LOCAL', 'CROSS_CITY', 'ON_SITE_PICKUP'] as const;
-    const rate = WINERY_SETTLEMENT_RATE;
+
  /**
   * 历史现场提货单支付即 COMPLETED 但未写 completedAt，补齐为 paidAt，否则核对补生成捞不到。
   */
  private async backfillMissingCompletedAt() {
    await this.prisma.$executeRaw`
      UPDATE user_order
      SET completed_at = paid_at
      WHERE status = 'COMPLETED'
        AND pay_status = 'PAID'
        AND completed_at IS NULL
        AND paid_at IS NOT NULL
    `;
  }
  /** 期窗口内已付已完成订单（含同城/跨城/现场提货；completedAt 优先，缺省用 paidAt） */
  private wineryEligibleOrderWhere(start: Date, end: Date): Prisma.OrderWhereInput {
    return {
      status: 'COMPLETED',
      payStatus: 'PAID',
      deliveryType: { in: [...SettlementService.WINERY_DELIVERY_TYPES] },
      OR: [
        { completedAt: { gte: start, lt: end } },
        { completedAt: null, paidAt: { gte: start, lt: end } },
      ],
    };
  }
  /**
   * 生成/重算某一出账日的酒厂对账单（T+3 = 每 3 天出一期）。
   * - 仅在周期出账日生成：相对 epoch 每 3 天一张
   * - 纳入上一期 3 个自然日内完成的同城/跨城/现场提货已付订单（含实付/应付为 0）
   * - 出账日无订单也出账（无需打款），保证每隔三天有账单
   * - 已打款账单不回刷；未打款账单可重算；冲突明细从其他未打款账单迁入
   */
  async generateWineryBillForDay(anchor = new Date(), opts?: { notify?: boolean }) {
    const periodDays = WINERY_SETTLEMENT_PERIOD_DAYS;
    const epochYmd = WINERY_BILL_EPOCH_YMD;
    const billDate = startOfShanghaiDay(anchor);
    const issueYmd = shanghaiYmd(billDate);
    const today = startOfShanghaiDay(new Date());
    if (billDate.getTime() > today.getTime()) {
      return { billDate: issueYmd, skipped: true, reason: '出账日未到' };
    }
    if (!isWineryIssueDay(billDate, periodDays, epochYmd)) {
      return { billDate: issueYmd, skipped: true, reason: '非出账周期日（T+3 每 3 天出账）' };
    }
    const { start, end } = shanghaiWineryPeriodWindow(billDate, periodDays);
    const rate = WINERY_SETTLEMENT_RATE;
    const existing =
      (await this.prisma.wineryBill.findUnique({ where: { billDate } })) ??
@@ -2215,21 +2273,31 @@ export class SettlementService implements OnModuleInit {
      return { billDate: issueYmd, skipped: true, reason: '已打款' };
    }
-    // T+3：纳入「今天 − lagDays」当天完成的同城/跨城订单；billDate = 出账日（今天）
+    // 手工单日出账时也补齐缺 completedAt 的现场单
-    const orders = await this.prisma.order.findMany({
+    await this.backfillMissingCompletedAt();
-      where: {
+
-        status: 'COMPLETED',
+    // 期窗口 [出账日−3, 出账日) 内：同城 / 跨城 / 现场提货
-        payStatus: 'PAID',
+    const candidates = await this.prisma.order.findMany({
-        deliveryType: { in: ['LOCAL', 'CROSS_CITY'] },
+      where: this.wineryEligibleOrderWhere(start, end),
        completedAt: { gte: start, lt: end },
      },
      include: { city: { select: { name: true } } },
-      orderBy: { completedAt: 'asc' },
+      orderBy: [{ completedAt: 'asc' }, { paidAt: 'asc' }],
    });
-    if (orders.length === 0 && !existing) {
+    // 已打款账单上的明细不可再迁；其余订单一律纳入本账
-      return { billDate: issueYmd, skipped: true, reason: '无订单' };
+    const candidateIds = candidates.map((o) => o.id);
    const paidLockedIds = new Set<string>();
    if (candidateIds.length) {
      const locked = await this.prisma.wineryBillItem.findMany({
        where: {
          orderId: { in: candidateIds },
          wineryBill: { status: 'PAID' },
          ...(existing ? { wineryBillId: { not: existing.id } } : {}),
        },
        select: { orderId: true },
      });
      for (const row of locked) paidLockedIds.add(row.orderId.toString());
    }
    const orders = candidates.filter((o) => !paidLockedIds.has(o.id.toString()));
    const orderAmount = round2(orders.reduce((s, o) => s + Number(o.payAmount), 0));
    const wineryAmount = round2(orderAmount * rate);
@@ -2262,7 +2330,22 @@ export class SettlementService implements OnModuleInit {
        await tx.wineryBillItem.deleteMany({ where: { wineryBillId: header.id } });
      }
      // 从未打款的其他账单迁出冲突明细，避免 orderId 唯一约束失败导致整日对不上
      const affectedBillIds = new Set<bigint>();
      if (orders.length > 0) {
        const conflicts = await tx.wineryBillItem.findMany({
          where: {
            orderId: { in: orders.map((o) => o.id) },
            wineryBillId: { not: header.id },
            wineryBill: { status: 'UNPAID' },
          },
          select: { id: true, wineryBillId: true },
        });
        for (const c of conflicts) affectedBillIds.add(c.wineryBillId);
        if (conflicts.length) {
          await tx.wineryBillItem.deleteMany({ where: { id: { in: conflicts.map((c) => c.id) } } });
        }
        await tx.wineryBillItem.createMany({
          data: orders.map((o) => ({
            wineryBillId: header.id,
@@ -2271,50 +2354,189 @@ export class SettlementService implements OnModuleInit {
            deliveryType: o.deliveryType,
            payAmount: o.payAmount,
            wineryAmount: round2(Number(o.payAmount) * rate),
-            // 明细仍保留支付时间；账期窗口按 completedAt 归属
+            // 明细时间：支付时间优先；账期归属用 completedAt（现场提货已与支付同时写入）
            paidAt: o.paidAt ?? o.completedAt!,
          })),
        });
      }
      for (const otherId of affectedBillIds) {
        await this.recalcWineryBillHeader(tx, otherId, rate);
      }
      return header;
    });
    const period = issueYmd;
-    const wineryBank = await loadWineryBankConfig(this.prisma);
+    if (opts?.notify !== false && wineryAmount > 0) {
-    const bankParts = wecomBankParts(wineryBank);
+      const wineryBank = await loadWineryBankConfig(this.prisma);
-    const cityNames = joinLimited(
+      const bankParts = wecomBankParts(wineryBank);
-      orders.map((o) => o.city?.name || ''),
+      const cityNames = joinLimited(
-      '城',
+        orders.map((o) => o.city?.name || ''),
-    );
+        '城',
-    const partnerNames = await this.partnerDashLabels(orders.map((o) => o.partnerAccountIdAtPay));
+      );
-    void this.wecomPush.dispatchEvent(
+      const partnerNames = await this.partnerDashLabels(orders.map((o) => o.partnerAccountIdAtPay));
-      'finance.winery_bill',
+      void this.wecomPush.dispatchEvent(
-      {
+        'finance.winery_bill',
-        period,
+        {
-        billCount: '1',
+          period,
-        totalAmount: wineryAmount.toFixed(2),
+          billCount: '1',
-        cityNames,
+          totalAmount: wineryAmount.toFixed(2),
-        partnerNames,
+          cityNames,
-        orderCount: String(orders.length),
+          partnerNames,
-        orderAmount: orderAmount.toFixed(2),
+          orderCount: String(orders.length),
-        rate: formatPercent(rate),
+          orderAmount: orderAmount.toFixed(2),
-        amount: wineryAmount.toFixed(2),
+          rate: formatPercent(rate),
-        payee: bankParts.payee,
+          amount: wineryAmount.toFixed(2),
-        accountNo: bankParts.accountNo,
+          payee: bankParts.payee,
-        bankBranch: bankParts.bankBranch,
+          accountNo: bankParts.accountNo,
-        bankAccount: formatWecomBankAccount(wineryBank),
+          bankBranch: bankParts.bankBranch,
-      },
+          bankAccount: formatWecomBankAccount(wineryBank),
-      { handlePath: '/finance/winery-bills' },
+        },
-    );
+        { handlePath: '/finance/winery-bills' },
      );
    }
    return serializeBigInt({
      billDate: period,
      skipped: false,
      bill,
      orderCount: orders.length,
      orderAmount,
      wineryAmount,
      lockedOnPaid: paidLockedIds.size,
    });
  }
  /** 按明细重算酒厂账单表头（应付为 0 保留账单，展示为无需打款） */
  private async recalcWineryBillHeader(
    tx: Prisma.TransactionClient,
    wineryBillId: bigint,
    rate = WINERY_SETTLEMENT_RATE,
  ) {
    const items = await tx.wineryBillItem.findMany({ where: { wineryBillId } });
    const orderAmount = round2(items.reduce((s, i) => s + Number(i.payAmount), 0));
    const wineryAmount = round2(orderAmount * rate);
    await tx.wineryBill.update({
      where: { id: wineryBillId },
      data: {
        orderCount: items.length,
        orderAmount,
        wineryRate: rate,
        wineryAmount,
      },
    });
  }
  /**
   * 按出账日区间核对补生成酒厂账单：只处理 T+3 周期出账日，捞回未入账的同城/跨城/现场提货订单，并清理误生成的非周期日空账单。
   */
  async reconcileWineryBills(body?: { dateFrom?: string; dateTo?: string }) {
    const periodDays = WINERY_SETTLEMENT_PERIOD_DAYS;
    const epochYmd = WINERY_BILL_EPOCH_YMD;
    const today = startOfShanghaiDay(new Date());
    const to = body?.dateTo ? parseShanghaiYmd(body.dateTo) : today;
    const from = body?.dateFrom
      ? parseShanghaiYmd(body.dateFrom)
      : addShanghaiDays(today, -60);
    if (Number.isNaN(from.getTime()) || Number.isNaN(to.getTime())) {
      throw new BadRequestException('日期格式无效，请使用 YYYY-MM-DD');
    }
    if (from.getTime() > to.getTime()) {
      throw new BadRequestException('开始日期不能晚于结束日期');
    }
    // 先补历史现场提货等缺 completedAt 的已完成单，再按期入账
    await this.backfillMissingCompletedAt();
    const endIssue = to.getTime() > today.getTime() ? today : to;
    const startIssue = from.getTime() > endIssue.getTime() ? endIssue : from;
    const issueYmids = new Set(
      listWineryIssueDays(startIssue, endIssue, periodDays, epochYmd).map(shanghaiYmd),
    );
    // 捞仍未入账的孤儿订单（同城/跨城/现场提货），按其完成日归属到对应出账日
    const orphanLookbackStart = addShanghaiDays(startIssue, -periodDays - 90);
    const orphanLookbackEnd = addShanghaiDays(today, 1);
    const windowOrders = await this.prisma.order.findMany({
      where: this.wineryEligibleOrderWhere(orphanLookbackStart, orphanLookbackEnd),
      select: { id: true, completedAt: true, paidAt: true },
    });
    const billedSet = new Set(
      windowOrders.length === 0
        ? []
        : (
            await this.prisma.wineryBillItem.findMany({
              where: { orderId: { in: windowOrders.map((o) => o.id) } },
              select: { orderId: true },
            })
          ).map((r) => r.orderId.toString()),
    );
    let orphanCount = 0;
    for (const o of windowOrders) {
      const attributedAt = o.completedAt ?? o.paidAt;
      if (!attributedAt || billedSet.has(o.id.toString())) continue;
      const issue = wineryIssueDateFromCompletedAt(attributedAt, periodDays, epochYmd);
      if (issue.getTime() > today.getTime()) continue;
      issueYmids.add(shanghaiYmd(issue));
      orphanCount += 1;
    }
    const sorted = [...issueYmids].sort();
    const results: Array<{
      billDate: string;
      skipped: boolean;
      reason?: string;
      orderCount?: number;
      wineryAmount?: number;
    }> = [];
    for (const ymd of sorted) {
      const r = await this.generateWineryBillForDay(parseShanghaiYmd(ymd), { notify: false });
      results.push({
        billDate: String(r.billDate),
        skipped: Boolean(r.skipped),
        reason: 'reason' in r ? String(r.reason ?? '') : undefined,
        orderCount: 'orderCount' in r ? Number(r.orderCount ?? 0) : undefined,
        wineryAmount: 'wineryAmount' in r ? Number(r.wineryAmount ?? 0) : undefined,
      });
    }
    // 清理旧「每日出账」留下的非周期日出账单（明细已迁走后为空）
    let cleaned = 0;
    const strayBills = await this.prisma.wineryBill.findMany({
      where: {
        status: 'UNPAID',
        billDate: { gte: startIssue, lte: endIssue },
      },
      include: { _count: { select: { items: true } } },
    });
    for (const b of strayBills) {
      if (isWineryIssueDay(b.billDate, periodDays, epochYmd)) continue;
      if (b._count.items > 0) {
        await this.prisma.$transaction(async (tx) => {
          await this.recalcWineryBillHeader(tx, b.id);
        });
        continue;
      }
      await this.prisma.wineryBill.delete({ where: { id: b.id } });
      cleaned += 1;
    }
    return {
      dateFrom: shanghaiYmd(startIssue),
      dateTo: shanghaiYmd(endIssue),
      days: results.length,
      generated: results.filter((r) => !r.skipped).length,
      skipped: results.filter((r) => r.skipped).length,
      orphanOrders: orphanCount,
      cleanedNonIssueBills: cleaned,
      results,
    };
  }
  async listAdminWineryBills(query: {
    page?: number;
    pageSize?: number;
@@ -2469,7 +2691,13 @@ export class SettlementService implements OnModuleInit {
            csvEscape(b.billNo),
            shanghaiYmd(b.billDate),
            csvEscape(item.orderNo),
-            item.deliveryType === 'LOCAL' ? '同城' : item.deliveryType === 'CROSS_CITY' ? '跨城' : item.deliveryType,
+            item.deliveryType === 'LOCAL'
              ? '同城'
              : item.deliveryType === 'CROSS_CITY'
                ? '跨城'
                : item.deliveryType === 'ON_SITE_PICKUP'
                  ? '现场提货'
                  : item.deliveryType,
            Number(item.payAmount),
            Number(b.wineryRate),
            Number(item.wineryAmount),
@@ -452,4 +452,19 @@ export class PartnerAssocService {
    const buffer = Buffer.from(await res.arrayBuffer());
    return { buffer, fileName: `partner-assoc-${summary.partnerId}.png` };
  }
  /** 只读已有 OSS 关联码，不调微信补码。无码返回 null。 */
  async getExistingQrcodeBuffer(partnerAccountId: bigint): Promise<{ buffer: Buffer; fileName: string } | null> {
    const primary = await this.partnerCityService.resolvePrimaryAccount(partnerAccountId);
    if (!primary.assocQrcodeResourceId) return null;
    const resource = await this.prisma.commonResource.findUnique({
      where: { id: primary.assocQrcodeResourceId },
      select: { url: true },
    });
    if (!resource?.url) return null;
    const res = await fetch(resource.url);
    if (!res.ok) return null;
    const buffer = Buffer.from(await res.arrayBuffer());
    return { buffer, fileName: `partner-assoc-${primary.id.toString()}.png` };
  }
 }
@@ -448,6 +448,7 @@ export class TradeService {
          status: toStatus,
          payStatus: 'PAID',
          paidAt: now,
          ...(toStatus === 'COMPLETED' ? { completedAt: now } : {}),
          payExternalNo: externalNo,
          partnerAccountIdAtPay: paySnapshot.partnerAccountId,
          orderCommissionRateAtPay: paySnapshot.orderCommissionRate,
@@ -636,6 +637,7 @@ export class TradeService {
          status: toStatus,
          payStatus: 'PAID',
          paidAt: now,
          ...(toStatus === 'COMPLETED' ? { completedAt: now } : {}),
          payExternalNo: params.transactionId,
          partnerAccountIdAtPay: paySnapshot.partnerAccountId,
          orderCommissionRateAtPay: paySnapshot.orderCommissionRate,
@@ -2651,6 +2653,7 @@ export class TradeService {
          status: toStatus,
          payStatus: 'PAID',
          paidAt: now,
          ...(toStatus === 'COMPLETED' ? { completedAt: now } : {}),
          payExternalNo: externalNo,
          partnerAccountIdAtPay: order.partnerAccountIdAtPay,
          orderCommissionRateAtPay: order.orderCommissionRateAtPay,
Author	SHA1	Message	Date
jacy	04d903c554	merge(dev): v4.0.8 客服卡片主包落地与微信内保存海报 CI / verify (push) Waiting to run Details	2026-09-01 15:24:31 +08:00
jacy	30bfcc0d93	merge(dev_jacy): v4.0.8 客服卡片主包落地与微信内保存海报 CI / verify (pull_request) Waiting to run Details	2026-09-01 15:24:19 +08:00
jacy	283e6651aa	feat(mini): v4.0.8 客服卡片主包落地、定位误报修复，合伙人微信内预览保存海报 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-09-01 15:23:52 +08:00
jacy	0e883d3e70	merge(dev): v4.0.7 HQ 活动图快链与勾选导出 CI / verify (push) Waiting to run Details	2026-09-01 15:12:48 +08:00
jacy	6a95f47860	merge(dev_jacy): v4.0.7 HQ 活动图快链与勾选导出 CI / verify (pull_request) Waiting to run Details	2026-09-01 15:12:28 +08:00
jacy	cdc4b82931	feat(ops): v4.0.7 HQ 活动图快链与勾选导出 HQ 指定一张活动图为勾选主合伙人合成 PNG/zip；城市合伙人页增加快链与单下/导出。 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-09-01 15:12:10 +08:00
jacy	9a35c4aea9	merge(dev): 后台反收录与百度校验文件 CI / verify (push) Waiting to run Details	2026-09-01 09:12:11 +08:00
jacy	99c7f8caea	merge(dev_jacy): 后台反收录与百度校验文件 CI / verify (pull_request) Waiting to run Details	2026-09-01 09:12:08 +08:00
jacy	eeee55e215	fix(admin): 后台校验文件避免 301，并让搜索引擎读到 noindex serve -s 会把 .html 301 去后缀，百度站长验证失败；同时放开 robots 抓取，避免旧标题一直留在 SERP。	2026-09-01 09:11:43 +08:00
jacy	971b8aaa7b	merge(dev): v4.0.6 酒厂账单与订单完全比对 CI / verify (push) Has been cancelled Details	2026-08-31 17:28:09 +08:00
jacy	d555240295	merge(dev_jacy): v4.0.6 酒厂账单与订单完全比对 CI / verify (pull_request) Has been cancelled Details	2026-08-31 17:28:00 +08:00
jacy	f35e1a3ba5	feat(settlement): v4.0.6 酒厂 T+3 每 3 天出一期并与订单完全比对含现场提货入账、零应付仍出账、核对补生成，以及线上历史账单修复 SQL。	2026-08-31 17:27:38 +08:00
jacy	4b9ab79acb	merge(dev): v4.0.4 开发任务/合伙人删除/账单合伙人列 CI / verify (push) Has been cancelled Details	2026-08-31 16:09:20 +08:00
jacy	d9725b1914	merge(dev_jacy): v4.0.4 开发任务/合伙人删除/账单合伙人列 CI / verify (pull_request) Has been cancelled Details	2026-08-31 16:09:09 +08:00
jacy	ac94f5f5de	feat(ops): v4.0.4 开发任务多行与版本状态同步、合伙人/门店删除、账单合伙人列 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-08-31 16:08:55 +08:00
jacy	874ae93a9b	Merge pull request 'v4.0.3版本' (#55 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/55	2026-08-31 14:27:47 +08:00
`@@ -1,2 +1,2 @@`
	`User-agent: *`	`User-agent: *`
	`Disallow: /`	`Allow: /`