Merge pull request 'Dev v3.5.6' (#39) from dev into main

Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/39

.cursor/rules/dukang-core.mdc

@@ -1,55 +0,0 @@
----
-description: 杜康好客全局约束 — Monorepo 布局、文档优先级、2 人 OWNER 边界
-alwaysApply: true
----
-
-# 杜康好客 · 核心规则
-
-## Monorepo 布局
-
-- `apps/` — preV1：`h5-user`、`h5-shop`、`h5-partner`、`admin-web`
-- `packages/` — `shared-types`、`domain`、`shared-ui`
-- `server/dukang-api/` — NestJS 单体 API
-- `pages/` — UI 原型（**只读参照**）
-
-> V2 目标为 Taro 四端（`mini-user` 等），编码以 **当前实际目录** 为准。
-
-## 文档
-
-- **V3.0 业务事实源**：`杜康好客-v3-PRD.md`
-- V3 实现验收：`杜康好客-v3编码手册.md`
-- V2 蓝图：`杜康好客-V2编码手册.md`（与 V3 冲突时 V3 PRD 优先）
-- preV1 裁剪：`杜康好客-preV1编码手册.md`
-- 协作：`conventions.md` · AI 入口：`AGENTS.md`
-
-**禁止**：编码时修改业务规则；需求变更只改 `杜康好客-v3-PRD.md`。
-
-## 边界（2 人团队）
-
-> **临时（2026-07）**：刘京尧任务由 `jacy-dukang` 代管，B+D 路径可改。
-
-| 负责人 | 路径 |
-|--------|------|
-| jacy-dukang | `apps/*`, `packages/`, `callbacks/`, `jobs/`, `common/`, `integrations/`, 全部 `modules/*` |
-| ~~刘京尧~~ | ~~`apps/h5-partner/`, `apps/h5-shop/`, `modules/{store,redeem}/`~~（暂代管） |
-
-- 跨模块只 inject **exported Service**，禁止 `prisma` 写他人表
-- `apps/*` 禁止 import `server/*` 或其他 app
-- Mock 只在 `integrations/*`，不在业务 Service 散落
-
-## 共享契约
-
-- 枚举/DTO → `packages/shared-types`
-- 纯规则 → `packages/domain`（无 IO）
-
-## 核心业务常量
-
-- 权益额 = `benefit_amount ?? price`
-- 核销：直接核销 `0 < amount ≤ 全部 ACTIVE 权益总余额`；带单据核销 `0 < amount ≤ 该单据可用金额`；Redis 码 3 分钟
-- 订单 Tab（V3.0）：`待付款 | 已付款 | 已完成`
-- API：`/api/v1`，响应 `{ code, message, data }`
-
-## 提交
-
-- Conventional Commits：`feat(trade):` 等
-- 不提交 `.env`

.cursor/rules/git-conventions.mdc

@@ -1,33 +1,11 @@
 ---
-description: Git 提交与 PR 协作规范
+description: 杜康提交 scope 与发版默认（生产）
 alwaysApply: true
 ---
 
-# Git 规范
+# Git / 发版（杜康专属）
 
-## 提交格式
-
-Conventional Commits，scope = 端或模块名：
-
-```
-feat(trade): add order preview API
-fix(redeem): validate redeem amount against balance
-chore(shared-types): add OrderStatus enum
-```
-
-## 禁止提交
-
-- `.env`、`.env.local` 等敏感配置
-- `node_modules/`、`dist/`（已在 .gitignore）
-
-## PR 与 Review
-
-- feature 分支 + 小步 PR
-- 跨模块改动需相关双 Owner Review
-- Prisma 迁移必须多 Owner Review
-
-## Agent 行为
-
-- **仅用户明确要求时** 才执行 git commit / push
-- 不 amend 已推送的 commit，不 force push main/master/dev
-- 发版：`dev`→测试(staging)，`main`→生产；用户只说「发布/发版」默认发**生产**（见 dukang-release skill）；明确说「发测试」才发 staging
+- Conventional Commits，scope = 端或模块：`feat(trade):`、`fix(redeem):`
+- 只说「发布/发版」→ 生产（`main` + `deploy-prod.sh`）；明确说「发测试」才 staging。流程见 `/dukang-release`
+- 改 API/表 → 同步 v3-PRD + v3编码手册 + `shared-types`
+- Prisma 迁移须 Review

.cursor/skills/dukang-coding/SKILL.md

@@ -21,7 +21,7 @@ disable-model-invocation: true
 ## 会话启动（按序）
 
 1. 确认阶段：**V3.0** → 读 `杜康好客-v3-PRD.md` + `@dukang-v3`；preV1 → preV1 手册；V2 蓝图 → V2 手册
-2. 读 [`AGENTS.md`](../../AGENTS.md) OWNER 表 → **只改本 OWNER 路径**
+2. 读 [`AGENTS.md`](../../AGENTS.md) OWNER 段 + 对应 `apps/` 或 `server/dukang-api/AGENTS.md` → **只改本 OWNER 路径**
 3. 有任务卡 ID → 配合 `dukang-task-card` skill 或查 preV1 §9 / V2 §七
 4. UI 任务 → `pages/ROUTE_MAP.md` + 对应 `pages/{端}/` 原型
 5. 编码前过一遍下方 Checklist

.cursor/skills/dukang-prev1/SKILL.md

@@ -5,6 +5,7 @@ description: >-
   MOCK_SMS/MOCK_PAY/MOCK_DELIVERY flags, Seed data, and V2 upgrade path.
   Use when working on Mock providers, feature flags, preV1 task cards P1-*,
   or smoke tests — not for V2 WeChat/payment production integration.
+disable-model-invocation: true
 ---
 
 # 杜康好客 · preV1 Mock Skill

.cursor/skills/dukang-release/SKILL.md

@@ -4,6 +4,7 @@ description: >-
   杜康好客发布流程：dev→测试(staging)，main→生产；同机双栈。
   Use when the user says 发布、上传、deploy、上线、发版、发测试、发生产,
   or @杜康发布 / @dukang-release.
+disable-model-invocation: true
 ---
 
 # 杜康发布

.cursor/skills/dukang-task-card/SKILL.md

@@ -4,6 +4,7 @@ description: >-
   Executes Dukang Haoke task cards (P1-M* or M0-M6) one at a time with DoD
   verification. Use when the user provides a task ID like P1-M2-002 or M2-FE-U-003,
   or asks to start/implement a milestone card from the coding manuals.
+disable-model-invocation: true
 ---
 
 # 杜康好客 · 任务卡 Skill

.gitignore

@@ -21,4 +21,8 @@ coverage/
 server/dukang-api/prisma/migrations/
 debug_v3.xlsx
 ~$debug_v3.xlsx
+server/dukang-api/assets/fonts/*.ttf
+server/dukang-api/assets/fonts/*.ttc
+server/dukang-api/assets/fonts/*.otf
 deploy/auto-release.env
+deploy/backups/

AGENTS.md

@@ -1,133 +1,37 @@
 # 杜康好客 · AGENTS.md
 
-> AI 编码入口。人类协作者仍读 [`agent.md`](./agent.md)；本文件供 Cursor / Codex / Copilot 等自动加载。
+> AI 编码入口。人类读 [`agent.md`](./agent.md)。启动、端口、测试账号见 [`README.md`](./README.md)。
 
-## 项目概览
+杜康酒业 O2O：**购酒 → 发券 → 门店核销**。Monorepo + NestJS 单体（`/api/v1`，`{ code, message, data }`）。
 
-杜康酒业 O2O 平台：**购酒 → 发券 → 门店核销**。Monorepo + 单体 NestJS（方案三：模块 OWNER）。
+| 路径 | 说明 |
+|------|------|
+| `apps/` | `h5-user` · `h5-shop` · `h5-partner` · `admin-web` · `mini-user` |
+| `packages/` | `shared-types`（枚举/DTO）· `domain`（纯规则，无 IO）· `shared-ui` |
+| `server/dukang-api/` | 唯一 API |
+| `pages/` | UI 原型，只读 |
 
-| 阶段 | 手册 | 说明 |
-|------|------|------|
-| **V3.0 唯一需求源** | [`杜康好客-v3-PRD.md`](./杜康好客-v3-PRD.md) | 产品需求与三波交付（**只看这个**） |
-| **现状对照** | [`杜康好客-v3-现状对照.md`](./杜康好客-v3-现状对照.md) | 已完成 / 冲突 / 缺口审计 |
-| **V3 实现验收** | [`杜康好客-v3编码手册.md`](./杜康好客-v3编码手册.md) | 核销规则、分工、闭环 |
-| ~~V2 / preV1~~ | 历史参考（**已压缩**；V2 全文见 git 2026-08-06 前） | **不再作为需求依据** |
+前端：[`apps/AGENTS.md`](./apps/AGENTS.md)。后端模块/表 OWNER：[`server/dukang-api/AGENTS.md`](./server/dukang-api/AGENTS.md)。
 
-**禁止**：臆造 PRD 未定义规则；依赖 `doc/` 下过时文档；跨 OWNER 直写他人 Prisma 表。
+## 文档（冲突时）
 
-## 启动命令
-
-```bash
-# 基础设施
-cd deploy && docker compose up -d   # dukang-v1：MySQL :6016 Redis :6017
-
-# 依赖与数据库
-pnpm install
-cp server/dukang-api/.env.example server/dukang-api/.env
-pnpm db:generate && pnpm db:validate
-cd server/dukang-api && npx prisma db push && pnpm prisma:seed
-
-# 开发（分终端）
-pnpm dev:api      # http://localhost:3010/api/v1
-pnpm dev:user     # :5173
-pnpm dev:shop     # :5174
-pnpm dev:partner  # :5175
-pnpm dev:admin    # preV1 HQ 替代（内部工具，非 V2 小程序）
-
-# 验证
-node scripts/smoke-v3.mjs
-node scripts/smoke-prev1.mjs
-pnpm lint && pnpm test
-```
-
-Mock 验证码：`999888`。测试账号见 [`README.md`](./README.md)。
-
-> **端口冲突**：`h5-partner` 与 `admin-web` 同为 5175，勿同时 `dev:partner` + `dev:admin`。
-
-## 文档优先级（冲突时）
-
-1. `杜康好客-v3-PRD.md` — **唯一需求事实源**
-2. `杜康好客-v3-现状对照.md` — 实现进度审计
-3. `杜康好客-v3编码手册.md` — 实现验收、核销、分工
-4. `conventions.md` — 协作与模块边界
-5. V2 手册 §四 §五 §六 — 仅作架构/DB/API **参考**（与 V3 冲突时忽略）
+1. `杜康好客-v3-PRD.md` — **唯一需求事实源**（编码时禁止改业务规则；需求变更只改它）
+2. `杜康好客-v3-现状对照.md` — 进度
+3. `杜康好客-v3编码手册.md` — 验收、核销、分工
+4. `conventions.md` — 协作边界
+5. V2 手册 §四–§六 — 架构/DB/API **参考**（与 V3 冲突则忽略）
 6. `pages/{user,shop,partner,hq}/` — UI 参照
 
-> **V2 / preV1 手册不再作为需求依据。**
+**禁止**：臆造 PRD 未定义规则；依赖 `doc/` 过时文档；`apps/*` import `server/*`；跨模块 `prisma` 写他人表。V2 / preV1 手册不再作需求依据。
 
-## 团队与 OWNER 边界（2 人）
+## OWNER（2026-07 起暂由 jacy 代管全部）
 
-| 负责人 | Git 账号 | 职责 |
-|--------|----------|------|
-| **Jacy**（管理员） | `jacy-dukang` | C 端、admin-web、后端主模块、packages、Prisma 迁移主 Review |
-| **刘景尧** | `刘景尧` | 合伙人 H5、门店 H5、`store` / `redeem` 模块（**暂由 jacy-dukang 代管**） |
+`jacy-dukang` 可改 `apps/*`、`packages/*`、全部后端模块。逻辑边界仍按 A/B/C/D，便于子 Agent 隔离。Prisma 迁移由 jacy 主导。
 
-> **临时分工（2026-07）**：刘景尧任务暂由 `jacy-dukang` 全权负责；逻辑 OWNER B+D 路径可改，Prisma 迁移由 jacy 主导。
+- 跨模块只 inject 对方 **exported Service**
+- Mock 只在 `integrations/*`；微信/配送回调只进 `callbacks/`
 
-逻辑模块边界仍按 A/B/C/D 划分（便于 Agent 隔离），**当前人员合并**如下：
-
-| 逻辑 OWNER | 负责人 | 可改路径 | 后端 Module |
-|------------|--------|----------|-------------|
-| **A + C + Lead + B + D** | jacy-dukang | `apps/*`, `packages/*`, `callbacks/`, `jobs/`, `common/`, `integrations/` | 全部后端模块 |
-| ~~B + D~~ | ~~刘景尧~~ | — | 恢复分工前由 jacy 代管 |
-
-**Prisma 迁移**：jacy-dukang 主导 Review；涉及 `store_*` / 核销表时仍建议刘景尧知会（恢复分工后共同 Review）。
-
-### 跨模块规则（R1–R8 摘要）
-
-- 只 inject 对方 Module **exports 的 Service**，禁止 `prisma.xxx` 写他人表
-- `apps/*` 禁止 import `server/*` 源码；只走 HTTP + `packages/shared-types`
-- 业务纯规则 → `packages/domain`；枚举/DTO → `packages/shared-types`
-- 微信/配送回调入口 **仅** `callbacks/`；Mock 实现 **仅** `integrations/*`
-
-## Cursor 规范
-
-| 类型 | 路径 | 说明 |
-|------|------|------|
-| Rules | `.cursor/rules/` | 自动加载的编码规范 |
-| 编码 Skill | `.cursor/skills/dukang-coding/` | @dukang-coding |
-| V3.0 需求 Skill | `.cursor/skills/dukang-v3/` | @dukang-v3（PRD、Wave、REQ/ACC） |
-| 需求 Skill | `.cursor/skills/dukang-project/` | @dukang-project |
-| preV1 Skill | `.cursor/skills/dukang-prev1/` | Mock / Feature Flag |
-| 任务卡 Skill | `.cursor/skills/dukang-task-card/` | DLV-W* / P1-* / M*-* |
-| 发布 Skill | `.cursor/skills/dukang-release/` | @杜康发布 / @dukang-release |
-
-## 子 Agent（按职责选用）
-
-在 Cursor Agent 输入 `/` 选择：
-
-| 子 Agent | 负责人 | 适用场景 |
-|----------|--------|----------|
-| `v3-delivery-lead` | jacy-dukang | V3.0 三波交付统筹、DLV 拆分、跨 Owner 协调 |
-| `v3-req-reviewer` | — | V3.0 需求只读审查、REQ/ACC 缺口分析 |
-| `owner-a-user-trade` | jacy-dukang | C 端、订单、支付、权益、埋点 |
-| `owner-c-catalog-ops` | jacy-dukang | admin-web、开城商品、结算、运营 |
-| `backend-lead` | jacy-dukang | packages、callbacks、jobs、Prisma 横切 |
-| `owner-b-partner-store` | 刘景尧 | 合伙人 H5、门店 CRUD/审核 |
-| `owner-d-shop-redeem` | 刘景尧 | 门店 H5、核销 |
-| `boundary-reviewer` | — | PR 前只读审查跨模块违规 |
-
-## Skills（按需 @）
-
-| Skill | 何时用 |
-|-------|--------|
-| `dukang-v3` | V3.0 PRD、现状对照、Wave/REQ/ACC |
-| `dukang-coding` | 实现功能、修 Bug（通用编码流程） |
-| `dukang-project` | PRD/需求评审、原型对照、任务卡规划（**不用于日常编码**） |
-| `dukang-prev1` | Mock 开关、preV1 裁剪、Feature Flag |
-| `dukang-task-card` | 领取任务卡 `DLV-W*-*` / `P1-*` / `M*-*` 并按 DoD 交付 |
-| `dukang-release`（杜康发布） | `dev_jacy`→`dev` 合并 + `deploy.sh` 发版 |
-
-## 快速指令
-
-- 现状审计：`@dukang-v3` + [`杜康好客-v3-现状对照.md`](./杜康好客-v3-现状对照.md)
-- 实现 DLV 任务：`@dukang-coding 实现 DLV-W1-M2`
-- 波次规划：`/v3-delivery-lead 拆分 Wave 2 任务`
-- 需求缺口审查：`/v3-req-reviewer 审查门店提现`
-- PR 前审查：`/boundary-reviewer`
-- 原型参照：`pages/{user,shop,partner}/`（只读）
-
-## 核心业务常量（不可偏离）
+## 不可偏离
 
 ```
 权益额 = benefit_amount ?? price
@@ -137,38 +41,10 @@ C 端门店仅 status=OPEN
 订单 Tab：待付款 | 已付款 | 已完成
 ```
 
-**iOS 微信 H5 JSSDK**：登录/OAuth 后禁止仅 SPA 跳转再调扫码；见 `packages/weixin-sdk/GOTCHAS.md`、知识库「门店端 · 踩坑」。
-**微信小程序 open-type**：`chooseAvatar` 等 Button 的祖先禁止 `stopPropagation`（会编成 catchtap）；见知识库「C 端 · 踩坑」、`.cursor/rules/mini-user-weapp-opentype.mdc`。
-**微信小程序页面标题**：weapp 只用原生 `navigationBarTitleText`，不要再画一层与导航栏重复的 `SubPageHeader` title；见 `.cursor/rules/mini-user-weapp-nav-title.mdc`。
+微信：iOS H5 登录后禁止仅 SPA 跳转再扫码（`packages/weixin-sdk/GOTCHAS.md`）。小程序 `open-type` 按钮祖先禁止 `stopPropagation`；weapp 标题只用 `navigationBarTitleText`。`h5-partner` 与 `admin-web` 同端口 5175，勿同时开。
 
-## 环境与发版
+## 按需加载
 
-| 环境 | 分支 | 目录 | 端口 | 域名 |
-|------|------|------|------|------|
-| local | `dev_jacy` | 本机 Docker 6016/6017 | API `:3010` | — |
-| **staging 测试** | `dev` | `/opt/dukang-staging` | 8190–8194 | `*-test.dukanghaoke.com` |
-| **production 生产** | `main` | `/opt/dukang` | 8090–8094 | `*.dukanghaoke.com` |
-
-- 日常发布 → `deploy/deploy-staging.sh`（`dev`）
-- 生产发布 → `deploy/deploy-prod.sh`（`main`，验收后）
-- Staging：正式微信 + 全 Mock；配置见 `.env.staging.example`
-- 详情：`@dukang-release` / `.cursor/skills/dukang-release/SKILL.md`
-
-## 提交与 PR
-
-- Conventional Commits：`feat(trade):`、`fix(redeem):`；scope = 端或模块
-- 跨模块 PR → jacy-dukang + 刘景尧 共同 Review（若涉及双方模块）
-- 改 API/表 → 同步 v3-PRD + v3编码手册 + `shared-types`
-- 不提交 `.env`、`dist/`、`node_modules/`
-
-## 完成定义（DoD）
-
-- [ ] 任务卡验收项全部满足
-- [ ] 未跨模块直写 Prisma 表
-- [ ] 枚举/DTO 在 `shared-types`；纯规则在 `domain`
-- [ ] `pnpm lint` 无新增错误；相关 domain 单测通过
-
-## 嵌套指引
-
-- 后端细节：[`server/dukang-api/AGENTS.md`](./server/dukang-api/AGENTS.md)
-- 前端四 App：[`apps/AGENTS.md`](./apps/AGENTS.md)
+- 编码 `/dukang-coding` · V3 需求 `/dukang-v3` · 发版 `/dukang-release`（只说「发版」= 生产）
+- 子 Agent：`/owner-a-user-trade` 等（见 `.cursor/agents/`）
+- DoD：验收项满足；不跨模块直写表；类型在 `shared-types`、规则在 `domain`；相关 lint/单测过

apps/admin-web/src/components/ProductSpecsEditor.tsx

@@ -1,10 +1,11 @@
 import { useMemo, useState } from 'react';
 import {
-  Button, Input, InputNumber, Radio, Select, Space, Switch, Table, Typography, message,
+  Button, Image, Input, InputNumber, Modal, Radio, Select, Space, Switch, Table, Typography, message,
 } from 'antd';
-import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
+import { EditOutlined, MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
 import { request } from '../lib/api';
 import { PRODUCT_STATUS_LABELS } from '../lib/constants';
+import OssUpload from './OssUpload';
 
 type SpecValue = { id?: string; name: string; sortOrder?: number };
 type SpecAttr = { id?: string; name: string; sortOrder?: number; values: SpecValue[] };
@@ -24,6 +25,7 @@ type SkuRow = {
   isDefault: boolean;
   sortOrder?: number;
   specText?: string;
+  imageUrl?: string | null;
 };
 
 function cartesian(attrs: SpecAttr[]): string[][] {
@@ -73,6 +75,7 @@ export default function ProductSpecsEditor({ productId, initialAttrs, initialSku
           saleUnit: s.saleUnit === 'BOX' ? 'BOX' : 'BOTTLE',
           bottlesPerUnit: s.bottlesPerUnit || (s.saleUnit === 'BOX' ? 6 : 1),
           isDefault: !!s.isDefault,
+          imageUrl: s.imageUrl ?? '',
         }))
       : [
           {
@@ -86,10 +89,12 @@ export default function ProductSpecsEditor({ productId, initialAttrs, initialSku
             saleUnit: 'BOTTLE',
             bottlesPerUnit: 1,
             isDefault: true,
+            imageUrl: '',
           },
         ],
   );
   const [saving, setSaving] = useState(false);
+  const [editIndex, setEditIndex] = useState<number | null>(null);
 
   const combos = useMemo(() => cartesian(attrs.filter((a) => a.name.trim() && a.values.some((v) => v.name.trim()))), [attrs]);
 
@@ -111,12 +116,21 @@ export default function ProductSpecsEditor({ productId, initialAttrs, initialSku
         bottlesPerUnit: 1,
         isDefault: i === 0,
         sortOrder: i,
+        imageUrl: '',
       };
     });
     if (next.length && !next.some((s) => s.isDefault)) next[0].isDefault = true;
     setSkus(next.length ? next : skus);
   }
 
+  function patchSku(index: number, patch: Partial<SkuRow>) {
+    setSkus((prev) => {
+      const next = [...prev];
+      next[index] = { ...next[index], ...patch };
+      return next;
+    });
+  }
+
   async function handleSave() {
     setSaving(true);
     try {
@@ -168,6 +182,7 @@ export default function ProductSpecsEditor({ productId, initialAttrs, initialSku
         bottlesPerUnit: s.saleUnit === 'BOX' ? s.bottlesPerUnit || 6 : 1,
         isDefault: !!s.isDefault,
         sortOrder: i,
+        imageUrl: s.imageUrl?.trim() || null,
       }));
 
       const barcodes = payloadSkus.map((row) => row.barcode69);
@@ -189,11 +204,13 @@ export default function ProductSpecsEditor({ productId, initialAttrs, initialSku
     }
   }
 
+  const editing = editIndex != null ? skus[editIndex] : null;
+
   return (
     <div>
       <Typography.Paragraph type="secondary">
-        SKU 码由系统自动生成（DK 开头），无需填写。每个规格必须填写<strong>互不相同</strong>的 69 码。
-        先配置销售规格轴（如「包装」），再生成 SKU 矩阵；未配置规格时仅保留默认一行。
+        SKU 码由系统自动生成（DK 开头），无需填写。每个规格必须填写<strong>互不相同</strong>的 69 码，并可单独上传主图。
+        点「填写」在弹窗中编辑。先配置销售规格轴（如「包装」），再生成 SKU 矩阵。
       </Typography.Paragraph>
 
       <Typography.Title level={5}>规格轴</Typography.Title>
@@ -446,12 +463,154 @@ export default function ProductSpecsEditor({ productId, initialAttrs, initialSku
               />
             ),
           },
+          {
+            title: '主图',
+            width: 72,
+            render: (_, row) =>
+              row.imageUrl ? (
+                <Image src={row.imageUrl} width={40} height={40} style={{ objectFit: 'cover', borderRadius: 4 }} />
+              ) : (
+                <Typography.Text type="secondary">无</Typography.Text>
+              ),
+          },
+          {
+            title: '编辑',
+            width: 80,
+            fixed: 'right',
+            render: (_, row, index) => (
+              <Button type="link" size="small" icon={<EditOutlined />} onClick={() => setEditIndex(index)}>
+                填写
+              </Button>
+            ),
+          },
         ]}
       />
 
       <Button type="primary" loading={saving} style={{ marginTop: 16 }} onClick={() => void handleSave()}>
         保存规格与 SKU
       </Button>
+
+      <Modal
+        title={`编辑规格${editing?.specText ? ` · ${editing.specText}` : editing?.skuCode ? ` · ${editing.skuCode}` : ''}`}
+        open={editIndex != null}
+        onCancel={() => setEditIndex(null)}
+        onOk={() => setEditIndex(null)}
+        okText="完成"
+        width={560}
+        destroyOnClose
+      >
+        {editing && editIndex != null ? (
+          <Space direction="vertical" size={14} style={{ width: '100%' }}>
+            <div>
+              <Typography.Text type="secondary">SKU</Typography.Text>
+              <div>{editing.skuCode || '保存后自动生成'}</div>
+            </div>
+            <div>
+              <Typography.Text>69 码 <Typography.Text type="danger">*</Typography.Text></Typography.Text>
+              <Input
+                placeholder="本规格独立 69 码"
+                value={editing.barcode69}
+                onChange={(e) => patchSku(editIndex, { barcode69: e.target.value })}
+              />
+            </div>
+            <div>
+              <Typography.Text>主图</Typography.Text>
+              <OssUpload
+                bizType="COVER"
+                value={editing.imageUrl || ''}
+                onChange={(url) => patchSku(editIndex, { imageUrl: url })}
+              />
+            </div>
+            <Space>
+              <div>
+                <Typography.Text>售价</Typography.Text>
+                <InputNumber
+                  min={0}
+                  style={{ width: 140 }}
+                  value={editing.price}
+                  onChange={(v) => patchSku(editIndex, { price: Number(v) || 0 })}
+                />
+              </div>
+              <div>
+                <Typography.Text>权益</Typography.Text>
+                <InputNumber
+                  min={0}
+                  style={{ width: 140 }}
+                  value={editing.benefitAmount}
+                  onChange={(v) => patchSku(editIndex, { benefitAmount: v == null ? undefined : Number(v) })}
+                />
+              </div>
+            </Space>
+            <div>
+              <Typography.Text>状态</Typography.Text>
+              <Select
+                style={{ width: '100%' }}
+                value={editing.status}
+                options={Object.entries(PRODUCT_STATUS_LABELS).map(([value, label]) => ({ value, label }))}
+                onChange={(status) => patchSku(editIndex, { status })}
+              />
+            </div>
+            <Space>
+              <Select
+                style={{ width: 100 }}
+                value={editing.saleUnit}
+                options={[
+                  { value: 'BOTTLE', label: '瓶' },
+                  { value: 'BOX', label: '箱' },
+                ]}
+                onChange={(saleUnit) =>
+                  patchSku(editIndex, {
+                    saleUnit,
+                    bottlesPerUnit: saleUnit === 'BOX' ? editing.bottlesPerUnit || 6 : 1,
+                  })
+                }
+              />
+              {editing.saleUnit === 'BOX' ? (
+                <InputNumber
+                  min={1}
+                  value={editing.bottlesPerUnit}
+                  onChange={(v) => patchSku(editIndex, { bottlesPerUnit: Number(v) || 6 })}
+                />
+              ) : null}
+            </Space>
+            <Space>
+              <Switch
+                checkedChildren="线上"
+                unCheckedChildren="线上"
+                checked={editing.allowOnlinePurchase}
+                onChange={(checked) =>
+                  patchSku(editIndex, {
+                    allowOnlinePurchase: checked,
+                    allowCrossCityDelivery: checked ? editing.allowCrossCityDelivery : false,
+                  })
+                }
+              />
+              <Switch
+                checkedChildren="跨城"
+                unCheckedChildren="跨城"
+                disabled={!editing.allowOnlinePurchase}
+                checked={editing.allowCrossCityDelivery}
+                onChange={(checked) => patchSku(editIndex, { allowCrossCityDelivery: checked })}
+              />
+              <Switch
+                checkedChildren="现场"
+                unCheckedChildren="现场"
+                checked={editing.allowOnSitePickup}
+                onChange={(checked) => patchSku(editIndex, { allowOnSitePickup: checked })}
+              />
+              <Switch
+                checkedChildren="默认"
+                unCheckedChildren="默认"
+                checked={editing.isDefault}
+                onChange={(checked) => {
+                  if (!checked) return;
+                  setSkus((prev) => prev.map((s, i) => ({ ...s, isDefault: i === editIndex })));
+                }}
+              />
+            </Space>
+          </Space>
+        ) : null}
+      </Modal>
     </div>
   );
 }

apps/admin-web/src/components/RedeemRecordDetailDescriptions.tsx

@@ -23,6 +23,11 @@ export default function RedeemRecordDetailDescriptions({ detail, maskUserPhone =
         cityName?: string;
         address?: string;
         partnerAccount?: { companyName?: string };
+        primaryAccount?: {
+          bankAccountName?: string | null;
+          bankAccountNo?: string | null;
+          bankBranch?: string | null;
+        } | null;
       }
     | undefined;
   const coupon = detail.coupon as { couponNo?: string; order?: { orderNo?: string } } | undefined;
@@ -46,6 +51,15 @@ export default function RedeemRecordDetailDescriptions({ detail, maskUserPhone =
       </Descriptions.Item>
       <Descriptions.Item label="门店地址">{store?.address ?? '—'}</Descriptions.Item>
       <Descriptions.Item label="合伙人">{store?.partnerAccount?.companyName ?? '—'}</Descriptions.Item>
+      <Descriptions.Item label="收款户名">
+        {store?.primaryAccount?.bankAccountName || '—'}
+      </Descriptions.Item>
+      <Descriptions.Item label="收款账号">
+        {store?.primaryAccount?.bankAccountNo || '—'}
+      </Descriptions.Item>
+      <Descriptions.Item label="开户行">
+        {store?.primaryAccount?.bankBranch || '—'}
+      </Descriptions.Item>
       <Descriptions.Item label="权益券号">{coupon?.couponNo ?? '—'}</Descriptions.Item>
       <Descriptions.Item label="关联订单">{coupon?.order?.orderNo ?? '—'}</Descriptions.Item>
       {Array.isArray(detail.allocations) && (detail.allocations as unknown[]).length > 0 ? (

apps/admin-web/src/components/StorePackageAuditPanel.tsx

@@ -174,11 +174,13 @@ function PackageDetailCard({
   pkg,
   change,
   changes,
+  imageSize = 72,
 }: {
   title?: string;
   pkg: StorePackageItemDto | StorePackageViewDto;
   change?: keyof typeof CHANGE_LABELS;
   changes?: FieldChange[];
+  imageSize?: number;
 }) {
   const images = normalizeStorePackageImageUrls(pkg);
   const meta = change ? CHANGE_LABELS[change] : null;
@@ -217,7 +219,7 @@ function PackageDetailCard({
         <Image.PreviewGroup>
           <Space wrap size={8}>
             {images.map((url) => (
-              <Image key={url} src={url} width={72} height={72} style={{ objectFit: 'cover', borderRadius: 4 }} />
+              <Image key={url} src={url} width={imageSize} height={imageSize} style={{ objectFit: 'cover', borderRadius: 4 }} />
             ))}
           </Space>
         </Image.PreviewGroup>
@@ -265,6 +267,7 @@ export type StorePackageAuditPanelProps = {
   requestId: string;
   /** 是否在面板顶部显示通过/驳回（抽屉 extra 另有按钮时可关） */
   showActions?: boolean;
+  fullscreen?: boolean;
   onAudited?: () => void;
   onDetailLoaded?: (detail: StorePackageAuditDetailDto | null) => void;
 };
@@ -273,6 +276,7 @@ export type StorePackageAuditPanelProps = {
 export default function StorePackageAuditPanel({
   requestId,
   showActions = true,
+  fullscreen = false,
   onAudited,
   onDetailLoaded,
 }: StorePackageAuditPanelProps) {
@@ -389,6 +393,7 @@ export default function StorePackageAuditPanel({
                 title={`套餐 ${index + 1}`}
                 pkg={pkg}
                 change={changeByKey.get(packageKey(pkg, index))}
+                imageSize={fullscreen ? 160 : 72}
               />
             ))
           ) : (
@@ -407,6 +412,7 @@ export default function StorePackageAuditPanel({
                 pkg={pkg}
                 change={changeByKey.get(packageKey(pkg, index))}
                 changes={changesByKey.get(packageKey(pkg, index))}
+                imageSize={fullscreen ? 160 : 72}
               />
             ))
           ) : (

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

@@ -196,10 +196,10 @@ function menuAllowed(key: string, permissionKeys: string[]): boolean {
     '/benefit/ledgers': 'benefit',
     '/redeem-records': 'benefit',
     '/redeem-pending': 'benefit',
-    '/redeem/debug': 'benefit',
+    '/redeem/debug': 'benefit_debug',
     'deliveries-group': 'deliveries',
     '/deliveries': 'deliveries',
-    '/deliveries/xiaofeixia': 'deliveries',
+    '/deliveries/xiaofeixia': 'deliveries_debug',
     '/tickets': 'tickets',
     '/tickets/support': 'tech_support',
     'dev-plan-group': 'dev_plan',

apps/admin-web/src/lib/api.ts

@@ -195,6 +195,18 @@ export type AdminOrderRow = {
   quantity?: number;
   receiverName: string;
   receiverPhone: string;
+  receiverProvince?: string;
+  receiverCity?: string;
+  receiverDistrict?: string;
+  receiverAddress?: string;
+  benefitAmount?: number;
+  benefitCoupon?: {
+    couponNo?: string;
+    totalAmount?: number;
+    usedAmount?: number;
+    balance?: number;
+    status?: string;
+  } | null;
   createdAt: string;
   cityId?: string;
   city?: { id: string; name: string; code: string };

apps/admin-web/src/lib/exportExcel.ts

@@ -8,3 +8,19 @@ export function downloadExcelCsv(csv: string, filename: string) {
   a.click();
   URL.revokeObjectURL(url);
 }
+
+/** Download binary file from base64 payload returned by HQ export APIs. */
+export function downloadBase64File(contentBase64: string, filename: string, mimeType: string) {
+  const binary = atob(contentBase64);
+  const bytes = new Uint8Array(binary.length);
+  for (let i = 0; i < binary.length; i += 1) {
+    bytes[i] = binary.charCodeAt(i);
+  }
+  const blob = new Blob([bytes], { type: mimeType });
+  const url = URL.createObjectURL(blob);
+  const a = document.createElement('a');
+  a.href = url;
+  a.download = filename;
+  a.click();
+  URL.revokeObjectURL(url);
+}

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

@@ -2,6 +2,7 @@ import { useEffect, useState } from 'react';
 import {
   Button,
   Form,
+  Image,
   Input,
   Modal,
   Popconfirm,
@@ -18,6 +19,7 @@ import {
   DEV_PLAN_TASK_TYPE_LABELS,
   SUPPORT_TICKET_STATUS_LABELS,
   type DevPlanTaskDto,
+  type DevPlanTaskExportFormat,
   type DevPlanTaskStatusDto,
   type DevPlanTaskTypeDto,
   type DevPlanVersionDto,
@@ -25,7 +27,9 @@ import {
 } from '@dukang/shared-types';
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
+import { downloadBase64File } from '../lib/exportExcel';
 import { useAdminList } from '../lib/useAdminList';
+import OssUpload from '../components/OssUpload';
 
 const TYPE_OPTIONS = (Object.keys(DEV_PLAN_TASK_TYPE_LABELS) as DevPlanTaskTypeDto[]).map((v) => ({
   value: v,
@@ -56,6 +60,8 @@ export default function DevPlanTasksPage() {
   const [editing, setEditing] = useState<DevPlanTaskDto | null>(null);
   const [saving, setSaving] = useState(false);
   const [dispatching, setDispatching] = useState(false);
+  const [exportFormat, setExportFormat] = useState<DevPlanTaskExportFormat>('xlsx');
+  const [exporting, setExporting] = useState(false);
   const [form] = Form.useForm();
   const [dispatchForm] = Form.useForm<{ supplement?: string }>();
   const [batchForm] = Form.useForm<{ status?: DevPlanTaskStatusDto; versionId?: string }>();
@@ -88,24 +94,30 @@ export default function DevPlanTasksPage() {
 
   function openCreate() {
     setEditing(null);
-    form.setFieldsValue({ content: '', type: 'BUG', status: 'TODO', supportTicketId: undefined });
+    form.setFieldsValue({ content: '', type: 'BUG', status: 'TODO', supportTicketId: undefined, attachmentUrls: [''] });
     setModalOpen(true);
   }
 
   function openEdit(row: DevPlanTaskDto) {
     setEditing(row);
-    form.setFieldsValue({ content: row.content, type: row.type, status: row.status });
+    form.setFieldsValue({
+      content: row.content,
+      type: row.type,
+      status: row.status,
+      attachmentUrls: row.attachmentUrls?.length ? row.attachmentUrls : [''],
+    });
     setModalOpen(true);
   }
 
   async function save() {
     const values = await form.validateFields();
+    const attachmentUrls = (values.attachmentUrls ?? []).map((u: string) => u?.trim()).filter(Boolean);
     setSaving(true);
     try {
       if (editing) {
         await request(`/admin/dev-plan/tasks/${editing.id}`, {
           method: 'PUT',
-          body: JSON.stringify(values),
+          body: JSON.stringify({ ...values, attachmentUrls }),
         });
         message.success('已更新');
       } else {
@@ -115,6 +127,7 @@ export default function DevPlanTasksPage() {
             content: values.content,
             type: values.type,
             supportTicketId: values.supportTicketId || undefined,
+            attachmentUrls,
           }),
         });
         message.success('已创建');
@@ -199,6 +212,34 @@ export default function DevPlanTasksPage() {
     }
   }
 
+  async function exportTasks(scope: 'filter' | 'selected') {
+    setExporting(true);
+    try {
+      const result = await request<{
+        filename: string;
+        mimeType: string;
+        contentBase64: string;
+        count: number;
+      }>('/admin/dev-plan/tasks/export', {
+        method: 'POST',
+        body: JSON.stringify({
+          scope,
+          format: exportFormat,
+          ids: scope === 'selected' ? selectedRowKeys : undefined,
+          status: filters.status || undefined,
+          type: filters.type || undefined,
+          keyword: filters.keyword || undefined,
+        }),
+      });
+      downloadBase64File(result.contentBase64, result.filename, result.mimeType);
+      message.success(`已导出 ${result.count} 条任务`);
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '导出失败');
+    } finally {
+      setExporting(false);
+    }
+  }
+
   const columns: ColumnsType<DevPlanTaskDto> = [
     { title: '任务号', dataIndex: 'taskNo', width: 160 },
     {
@@ -216,6 +257,22 @@ export default function DevPlanTasksPage() {
       ),
     },
     { title: '内容', dataIndex: 'content', ellipsis: true },
+    {
+      title: '附件',
+      width: 100,
+      render: (_, row) =>
+        row.attachmentUrls?.length ? (
+          <Image.PreviewGroup>
+            <Space size={4}>
+              {row.attachmentUrls.slice(0, 3).map((url) => (
+                <Image key={url} src={url} width={32} height={32} style={{ objectFit: 'cover' }} />
+              ))}
+            </Space>
+          </Image.PreviewGroup>
+        ) : (
+          '—'
+        ),
+    },
     { title: '来源工单', dataIndex: 'supportTicketNo', width: 140, render: (v) => v || '—' },
     { title: '创建人', dataIndex: 'creatorName', width: 90 },
     { title: '创建时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
@@ -243,7 +300,24 @@ export default function DevPlanTasksPage() {
         <Typography.Title level={4} style={{ margin: 0 }}>
           开发计划 · 任务列表
         </Typography.Title>
-        <Space>
+        <Space wrap>
+          <Select
+            value={exportFormat}
+            style={{ width: 120 }}
+            onChange={setExportFormat}
+            options={[
+              { value: 'markdown', label: 'Markdown' },
+              { value: 'docx', label: 'Word' },
+              { value: 'xlsx', label: 'Excel' },
+              { value: 'pdf', label: 'PDF' },
+            ]}
+          />
+          <Button loading={exporting} disabled={!selectedRowKeys.length} onClick={() => void exportTasks('selected')}>
+            导出已勾选
+          </Button>
+          <Button loading={exporting} onClick={() => void exportTasks('filter')}>
+            导出全部筛选
+          </Button>
           <Button disabled={!selectedRowKeys.length} onClick={openBatchEdit}>
             批量编辑
           </Button>
@@ -333,6 +407,29 @@ export default function DevPlanTasksPage() {
               />
             </Form.Item>
           )}
+          <Form.Item label="附件图片">
+            <Form.List name="attachmentUrls">
+              {(fields, { add, remove }) => (
+                <>
+                  {fields.map((field) => (
+                    <Space key={field.key} align="start" style={{ display: 'flex', marginBottom: 8 }}>
+                      <Form.Item {...field} style={{ flex: 1, marginBottom: 0 }}>
+                        <OssUpload bizType="SUPPORT_TICKET_ATTACHMENT" mediaType="IMAGE" />
+                      </Form.Item>
+                      {fields.length > 1 ? (
+                        <Button type="link" danger onClick={() => remove(field.name)}>
+                          删除
+                        </Button>
+                      ) : null}
+                    </Space>
+                  ))}
+                  <Button type="dashed" onClick={() => add('')} block>
+                    添加图片
+                  </Button>
+                </>
+              )}
+            </Form.List>
+          </Form.Item>
         </Form>
       </Modal>
 

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

@@ -44,6 +44,13 @@ type BillRow = {
   settlementMethod: string;
   status: string;
   paidAt?: string | null;
+  paymentRef?: string | null;
+  fulfillmentProvider?: {
+    bankAccountName?: string | null;
+    bankName?: string | null;
+    bankBranch?: string | null;
+    bankAccountNo?: string | null;
+  };
 };
 
 type BillItem = {
@@ -140,14 +147,30 @@ export default function LogisticsBillsPage() {
   }, [summaryPeriod]);
 
   function confirmPay(ids: string[], amountHint?: number) {
+    let paymentRef = '';
     Modal.confirm({
       title: '确认结算？',
-      content: `将确认 ${ids.length} 笔物流对账单${amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。充值模式将扣减余额，挂账模式标记已打款。`,
+      content: (
+        <div>
+          <div>
+            将确认 {ids.length} 笔物流对账单
+            {amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。充值模式将扣减余额，挂账模式标记已打款。
+          </div>
+          <Input
+            placeholder="打款凭证号（可选）"
+            style={{ marginTop: 8 }}
+            onChange={(e) => {
+              paymentRef = e.target.value;
+            }}
+          />
+        </div>
+      ),
       okText: '确认结算',
       cancelText: '取消',
       onOk: async () => {
+        const body = JSON.stringify({ paymentRef: paymentRef.trim() || undefined });
         if (ids.length === 1) {
-          await request(`/admin/logistics-bills/${ids[0]}/confirm`, { method: 'POST' });
+          await request(`/admin/logistics-bills/${ids[0]}/confirm`, { method: 'POST', body });
         } else {
           await request('/admin/logistics-bills/batch-confirm', {
             method: 'POST',
@@ -217,6 +240,7 @@ export default function LogisticsBillsPage() {
   }
 
   const summary = data?.summary;
+  const providerBank = (r: BillRow) => r.fulfillmentProvider;
   const selectedRows = (data?.items ?? []).filter((r) => selectedKeys.includes(r.id));
   const selectedAmount = selectedRows.reduce((s, r) => s + Number(r.logisticsAmount), 0);
 
@@ -248,6 +272,18 @@ export default function LogisticsBillsPage() {
       width: 110,
       render: (v) => `¥${Number(v).toFixed(2)}`,
     },
+    {
+      title: '收款户名',
+      width: 100,
+      ellipsis: true,
+      render: (_, r) => providerBank(r)?.bankAccountName || '—',
+    },
+    {
+      title: '收款账号',
+      width: 140,
+      ellipsis: true,
+      render: (_, r) => providerBank(r)?.bankAccountNo || '—',
+    },
     {
       title: '状态',
       dataIndex: 'status',
@@ -550,7 +586,31 @@ export default function LogisticsBillsPage() {
               <Descriptions.Item label="结算时间">
                 {detail.paidAt ? fmtTime(detail.paidAt) : '—'}
               </Descriptions.Item>
+              <Descriptions.Item label="打款凭证">
+                {detail.paymentRef ? String(detail.paymentRef) : '—'}
+              </Descriptions.Item>
             </Descriptions>
+            {providerBank(detail) ? (
+              <>
+                <Typography.Title level={5} style={{ marginTop: 16 }}>
+                  收款账户
+                </Typography.Title>
+                <Descriptions column={1} size="small" bordered style={{ marginBottom: 16 }}>
+                  <Descriptions.Item label="户名">
+                    {providerBank(detail)?.bankAccountName || '—'}
+                  </Descriptions.Item>
+                  <Descriptions.Item label="开户银行">
+                    {providerBank(detail)?.bankName || '—'}
+                  </Descriptions.Item>
+                  <Descriptions.Item label="开户支行">
+                    {providerBank(detail)?.bankBranch || '—'}
+                  </Descriptions.Item>
+                  <Descriptions.Item label="账号">
+                    {providerBank(detail)?.bankAccountNo || '—'}
+                  </Descriptions.Item>
+                </Descriptions>
+              </>
+            ) : null}
             <Table
               rowKey="id"
               size="small"

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

@@ -4,7 +4,9 @@ import {
   Alert,
   Button,
   Checkbox,
+  Col,
   Collapse,
+  DatePicker,
   Descriptions,
   Drawer,
   Form,
@@ -12,6 +14,7 @@ import {
   InputNumber,
   Modal,
   Radio,
+  Row,
   Select,
   Space,
   Table,
@@ -20,7 +23,10 @@ import {
   message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
+import dayjs, { type Dayjs } from 'dayjs';
+import { ORDER_TYPE_LABELS } from '@dukang/shared-types';
 import { request, type AdminOrderItem, type AdminOrderRow, type HqProfile, type Paginated } from '../lib/api';
+import { downloadBase64File } from '../lib/exportExcel';
 import {
   ADMIN_OPTIONS_PAGE_SIZE,
   DELIVERY_PROVIDER_LABELS,
@@ -130,6 +136,110 @@ type OrderDetail = AdminOrderRow & {
 
 type ShipMode = 'WAREHOUSE' | 'EXPRESS';
 
+type OrderExportScope = 'filter' | 'selected';
+type OrderExportFormat = 'xlsx' | 'pdf';
+
+type OrderExportFilters = {
+  orderNo?: string;
+  status?: string;
+  orderType?: string;
+  cityId?: string;
+  receiverPhone?: string;
+  fulfillmentHold?: boolean;
+  excludeTest?: boolean;
+  deliveryType?: string;
+  dateRange?: [Dayjs, Dayjs];
+};
+
+type OrderExportResult = {
+  filename: string;
+  mimeType: string;
+  contentBase64: string;
+  count: number;
+};
+
+const ORDER_TYPE_OPTIONS = Object.entries(ORDER_TYPE_LABELS).map(([value, label]) => ({ value, label }));
+
+const DELIVERY_TYPE_OPTIONS = [
+  { value: 'LOCAL', label: '同城' },
+  { value: 'CROSS_CITY', label: '跨城' },
+  { value: 'ON_SITE_PICKUP', label: '现场提货' },
+];
+
+function isOnSitePickupOrder(row: Pick<AdminOrderRow, 'deliveryType' | 'receiverProvince' | 'receiverCity' | 'receiverAddress'>) {
+  return (
+    row.deliveryType === 'ON_SITE_PICKUP' ||
+    row.receiverAddress === '现场取货' ||
+    row.receiverAddress === '现场提货' ||
+    (row.receiverProvince === '现场' && row.receiverCity === '现场')
+  );
+}
+
+function formatReceiverAddress(row: AdminOrderRow) {
+  if (isOnSitePickupOrder(row)) return '现场取货';
+  const region = [row.receiverProvince, row.receiverCity, row.receiverDistrict].filter(Boolean).join('');
+  const detail = row.receiverAddress || '';
+  if (!region) return detail;
+  if (!detail || detail.startsWith(region)) return detail || region;
+  return `${region}${detail}`;
+}
+
+function datePresetRange(kind: 'day' | 'week' | 'month' | 'quarter' | 'year'): [Dayjs, Dayjs] {
+  const now = dayjs();
+  if (kind === 'day') return [now.startOf('day'), now.endOf('day')];
+  if (kind === 'week') {
+    const monday = now.startOf('day').subtract((now.day() + 6) % 7, 'day');
+    return [monday, monday.add(6, 'day').endOf('day')];
+  }
+  if (kind === 'month') return [now.startOf('month'), now.endOf('month')];
+  if (kind === 'quarter') {
+    const start = now.month(Math.floor(now.month() / 3) * 3).startOf('month');
+    return [start, start.add(2, 'month').endOf('month')];
+  }
+  return [now.startOf('year'), now.endOf('year')];
+}
+
+const DATE_PRESETS: Array<{ key: 'day' | 'week' | 'month' | 'quarter' | 'year'; label: string }> = [
+  { key: 'day', label: '当日' },
+  { key: 'week', label: '当周' },
+  { key: 'month', label: '当月' },
+  { key: 'quarter', label: '当季' },
+  { key: 'year', label: '当年' },
+];
+
+function formatBenefitBrief(row: AdminOrderRow) {
+  const coupon = row.benefitCoupon;
+  if (coupon) {
+    return `总额¥${Number(coupon.totalAmount ?? 0).toFixed(0)} / 已用¥${Number(coupon.usedAmount ?? 0).toFixed(0)} / 余¥${Number(coupon.balance ?? 0).toFixed(0)}`;
+  }
+  if (row.benefitAmount != null) return `¥${Number(row.benefitAmount).toFixed(0)}`;
+  return '—';
+}
+
+function buildExportPayload(
+  scope: OrderExportScope,
+  format: OrderExportFormat,
+  filters: OrderExportFilters,
+  selectedIds: string[],
+) {
+  const payload: Record<string, unknown> = { scope, format };
+  if (scope === 'selected') {
+    payload.ids = selectedIds;
+    return payload;
+  }
+  if (filters.orderNo) payload.orderNo = filters.orderNo;
+  if (filters.status) payload.status = filters.status;
+  if (filters.orderType) payload.orderType = filters.orderType;
+  if (filters.cityId) payload.cityId = filters.cityId;
+  if (filters.receiverPhone) payload.receiverPhone = filters.receiverPhone;
+  if (filters.deliveryType) payload.deliveryType = filters.deliveryType;
+  if (filters.fulfillmentHold) payload.fulfillmentHold = true;
+  if (filters.excludeTest) payload.excludeTest = true;
+  if (filters.dateRange?.[0]) payload.createdFrom = filters.dateRange[0].format('YYYY-MM-DD');
+  if (filters.dateRange?.[1]) payload.createdTo = filters.dateRange[1].format('YYYY-MM-DD');
+  return payload;
+}
+
 function orderProductRows(detail: OrderDetail): AdminOrderItem[] {
   if (detail.items?.length) return detail.items;
   if (!detail.productName) return [];
@@ -192,8 +302,11 @@ export default function OrdersPage() {
   const [warehouses, setWarehouses] = useState<WarehouseOption[]>([]);
   const [proxyOpen, setProxyOpen] = useState(false);
   const [trackOpen, setTrackOpen] = useState(false);
+  const [exporting, setExporting] = useState(false);
+  const [exportFormat, setExportFormat] = useState<OrderExportFormat>('xlsx');
   const canDeleteOrders = (profile?.permissionKeys ?? []).includes('orders_delete');
   const canProxyOrder = (profile?.permissionKeys ?? []).includes('orders');
+  const canExportOrders = (profile?.permissionKeys ?? []).includes('orders');
 
   const selectedOrders = useMemo(
     () => (data?.items ?? []).filter((row) => selectedRowKeys.includes(row.id)),
@@ -238,6 +351,7 @@ export default function OrdersPage() {
     try {
       const values = form.getFieldsValue();
       const qs = new URLSearchParams({ page: String(page), pageSize: String(pageSize) });
+      if (initialOrderNo) qs.set('orderNo', initialOrderNo);
       if (values.orderNo) qs.set('orderNo', values.orderNo);
       if (values.status) qs.set('status', values.status);
       if (values.orderType) qs.set('orderType', values.orderType);
@@ -245,12 +359,15 @@ export default function OrdersPage() {
       if (values.receiverPhone) qs.set('receiverPhone', values.receiverPhone);
       if (values.fulfillmentHold) qs.set('fulfillmentHold', 'true');
       if (values.excludeTest) qs.set('excludeTest', 'true');
+      if (values.deliveryType) qs.set('deliveryType', values.deliveryType);
+      if (values.dateRange?.[0]) qs.set('createdFrom', values.dateRange[0].format('YYYY-MM-DD'));
+      if (values.dateRange?.[1]) qs.set('createdTo', values.dateRange[1].format('YYYY-MM-DD'));
       const res = await request<Paginated<AdminOrderRow>>(`/admin/orders?${qs}`);
       setData(res);
     } finally {
       setLoading(false);
     }
-  }, [form, page, pageSize]);
+  }, [form, page, pageSize, initialOrderNo]);
 
   useEffect(() => {
     void load();
@@ -451,79 +568,93 @@ export default function OrdersPage() {
     }
   }
 
+  async function submitExport(scope: OrderExportScope) {
+    const values = form.getFieldsValue() as OrderExportFilters;
+    if (scope === 'selected' && !selectedRowKeys.length) {
+      message.warning('请先勾选要导出的订单');
+      return;
+    }
+    setExporting(true);
+    try {
+      const payload = buildExportPayload(scope, exportFormat, values, selectedRowKeys);
+      const result = await request<OrderExportResult>('/admin/orders/export', {
+        method: 'POST',
+        body: JSON.stringify(payload),
+      });
+      downloadBase64File(result.contentBase64, result.filename, result.mimeType);
+      message.success(`已导出 ${result.count} 条订单`);
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '导出失败');
+    } finally {
+      setExporting(false);
+    }
+  }
+
   const columns: ColumnsType<AdminOrderRow> = [
     {
-      title: '订单号',
-      dataIndex: 'orderNo',
-      width: 200,
-      render: (v, row) => (
-        <Space size={4}>
-          <span>{v}</span>
-          {row.isTest ? <Tag color="orange">测试</Tag> : null}
-        </Space>
+      title: '商品',
+      width: 240,
+      render: (_, row) => (
+        <div>
+          <Space size={4} wrap>
+            <span>{row.productName || '—'}</span>
+            {row.isTest ? <Tag color="orange">测试</Tag> : null}
+            {row.fulfillmentHold ? <Tag color="orange">大单</Tag> : null}
+            {row.orderType === 'PROXY' || row.isProxyOrder ? (
+              <Tag color="purple">代下单</Tag>
+            ) : null}
+          </Space>
+          <div>
+            <Typography.Text type="secondary" style={{ fontSize: 12 }}>
+              {[row.productSpec, row.quantity != null ? `×${row.quantity}` : null]
+                .filter(Boolean)
+                .join(' ')}
+            </Typography.Text>
+          </div>
+        </div>
       ),
     },
     {
-      title: '城市',
-      width: 90,
-      render: (_, row) => row.city?.name || '—',
+      title: '状态 / 实付',
+      width: 130,
+      render: (_, row) => (
+        <div>
+          <Tag color={ORDER_STATUS_COLORS[row.status] || 'default'}>
+            {ORDER_STATUS_LABELS[row.status] || row.status}
+          </Tag>
+          <div>¥{row.payAmount}</div>
+        </div>
+      ),
     },
     {
-      title: '商品',
-      width: 180,
-      ellipsis: true,
+      title: '好客权益',
+      width: 200,
+      render: (_, row) => formatBenefitBrief(row),
+    },
+    {
+      title: '收货信息',
+      width: 240,
       render: (_, row) => {
-        const name = row.productName || '—';
-        const qty = row.quantity != null ? ` ×${row.quantity}` : '';
+        const address = formatReceiverAddress(row);
         return (
-          <span title={row.productSpec ? `${name}（${row.productSpec}）` : name}>
-            {name}{qty}
-          </span>
+          <div>
+            <div>
+              {row.receiverName || '—'} {row.receiverPhone || ''}
+            </div>
+            {address ? (
+              <Typography.Text type="secondary" style={{ fontSize: 12 }}>
+                {address}
+              </Typography.Text>
+            ) : null}
+          </div>
         );
       },
     },
-    {
-      title: '状态',
-      dataIndex: 'status',
-      width: 140,
-      render: (s, row) => (
-        <Space size={4} wrap>
-          <Tag color={ORDER_STATUS_COLORS[s] || 'default'}>{ORDER_STATUS_LABELS[s] || s}</Tag>
-          {row.fulfillmentHold ? <Tag color="orange">大单待确认</Tag> : null}
-          {row.orderType === 'PROXY' || row.isProxyOrder ? (
-            <Tag color="purple" title={row.proxyPartnerName || undefined}>
-              代下单
-            </Tag>
-          ) : null}
-        </Space>
-      ),
-    },
-    {
-      title: '配送',
-      dataIndex: 'deliveryType',
-      width: 90,
-      render: (v) =>
-        v === 'ON_SITE_PICKUP' ? '现场提货' : v === 'LOCAL' ? '同城' : '跨城',
-    },
-    { title: '实付', dataIndex: 'payAmount', width: 90, render: (v) => `¥${v}` },
-    { title: '收货人', dataIndex: 'receiverName', width: 90 },
-    { title: '手机', dataIndex: 'receiverPhone', width: 120 },
-    {
-      title: '用户',
-      dataIndex: ['user', 'userNo'],
-      width: 110,
-      render: (_, row) => row.user?.userNo || '—',
-    },
-    {
-      title: '快递',
-      width: 100,
-      render: (_, row) => row.delivery?.trackingNo || row.delivery?.provider || '—',
-    },
     {
       title: '下单时间',
       dataIndex: 'createdAt',
       width: 170,
-      render: (v) => new Date(v).toLocaleString('zh-CN'),
+      render: fmtTime,
     },
     {
       title: '操作',
@@ -557,24 +688,15 @@ export default function OrdersPage() {
 
   return (
     <div>
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <Space style={{ marginBottom: 20, width: '100%', justifyContent: 'space-between' }}>
         <Typography.Title level={4} style={{ margin: 0 }}>订单监控</Typography.Title>
-        <Space>
+        <Space size={12}>
           <Button onClick={() => window.open('/orders/big-screen', 'dukang-big-screen')}>大屏</Button>
           {canProxyOrder ? (
             <Button type="primary" onClick={() => setProxyOpen(true)}>
               代下单
             </Button>
           ) : null}
-          {canDeleteOrders ? (
-            <Button
-              danger
-              disabled={!selectedRowKeys.length}
-              onClick={() => setBatchDeleteOpen(true)}
-            >
-              批量删除{selectedRowKeys.length ? ` (${selectedRowKeys.length})` : ''}
-            </Button>
-          ) : null}
         </Space>
       </Space>
 
@@ -592,54 +714,115 @@ export default function OrdersPage() {
         />
       ) : null}
 
-      <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={() => { setPage(1); void load(); }}>
-        <Form.Item name="orderNo" label="订单号">
-          <Input placeholder="DK..." allowClear />
-        </Form.Item>
-        <Form.Item name="status" label="状态">
-          <Select allowClear style={{ width: 120 }} options={Object.entries(ORDER_STATUS_LABELS).map(([value, label]) => ({ value, label }))} />
-        </Form.Item>
-        <Form.Item name="orderType" label="类型">
-          <Select
-            allowClear
-            style={{ width: 120 }}
-            placeholder="全部"
-            options={[
-              { value: 'NORMAL', label: '普通订单' },
-              { value: 'PROXY', label: '代下单' },
-            ]}
-          />
-        </Form.Item>
-        <Form.Item name="cityId" label="城市">
-          <Select
-            allowClear
-            showSearch
-            optionFilterProp="label"
-            style={{ width: 140 }}
-            placeholder="全部"
-            options={cities.map((c) => ({ value: c.id, label: c.name }))}
-          />
-        </Form.Item>
-        <Form.Item name="receiverPhone" label="收货手机">
-          <Input allowClear />
-        </Form.Item>
-        <Form.Item name="fulfillmentHold" label="大单拦截" valuePropName="checked">
-          <Select
-            allowClear
-            style={{ width: 140 }}
-            placeholder="全部"
-            options={[{ value: true, label: '仅待确认大单' }]}
-          />
-        </Form.Item>
-        <Form.Item name="excludeTest" valuePropName="checked">
-          <Checkbox>过滤测试账号</Checkbox>
-        </Form.Item>
-        <Form.Item>
-          <Space>
+      <Form form={form} layout="vertical" onFinish={() => { setPage(1); void load(); }}>
+        <Row gutter={[16, 8]}>
+          <Col xs={24} md={14} lg={12}>
+            <Form.Item label="下单日期" style={{ marginBottom: 12 }}>
+              <Space direction="vertical" size={8} style={{ width: '100%' }}>
+                <Form.Item name="dateRange" noStyle>
+                  <DatePicker.RangePicker allowClear style={{ width: '100%' }} />
+                </Form.Item>
+                <Space size={8} wrap>
+                  {DATE_PRESETS.map((preset) => (
+                    <Button
+                      key={preset.key}
+                      size="small"
+                      onClick={() => form.setFieldsValue({ dateRange: datePresetRange(preset.key) })}
+                    >
+                      {preset.label}
+                    </Button>
+                  ))}
+                </Space>
+              </Space>
+            </Form.Item>
+          </Col>
+          <Col xs={12} sm={6} md={5} lg={3}>
+            <Form.Item name="status" label="状态" style={{ marginBottom: 12 }}>
+              <Select
+                allowClear
+                placeholder="全部"
+                options={Object.entries(ORDER_STATUS_LABELS).map(([value, label]) => ({ value, label }))}
+              />
+            </Form.Item>
+          </Col>
+          <Col xs={12} sm={6} md={5} lg={3}>
+            <Form.Item name="orderType" label="类型" style={{ marginBottom: 12 }}>
+              <Select allowClear placeholder="全部" options={ORDER_TYPE_OPTIONS} />
+            </Form.Item>
+          </Col>
+          <Col xs={12} sm={6} md={5} lg={3}>
+            <Form.Item name="deliveryType" label="配送" style={{ marginBottom: 12 }}>
+              <Select allowClear placeholder="全部" options={DELIVERY_TYPE_OPTIONS} />
+            </Form.Item>
+          </Col>
+          <Col xs={12} sm={6} md={5} lg={3}>
+            <Form.Item name="cityId" label="城市" style={{ marginBottom: 12 }}>
+              <Select
+                allowClear
+                showSearch
+                optionFilterProp="label"
+                placeholder="全部"
+                options={cities.map((c) => ({ value: c.id, label: c.name }))}
+              />
+            </Form.Item>
+          </Col>
+          <Col xs={12} sm={8} md={6} lg={6}>
+            <Form.Item name="receiverPhone" label="收货手机" style={{ marginBottom: 12 }}>
+              <Input allowClear placeholder="手机号" />
+            </Form.Item>
+          </Col>
+          <Col xs={12} sm={8} md={8} lg={8}>
+            <Form.Item label=" " colon={false} style={{ marginBottom: 12 }}>
+              <Space size={16} wrap>
+                <Form.Item name="fulfillmentHold" valuePropName="checked" noStyle>
+                  <Checkbox>大单拦截</Checkbox>
+                </Form.Item>
+                <Form.Item name="excludeTest" valuePropName="checked" noStyle>
+                  <Checkbox>过滤测试</Checkbox>
+                </Form.Item>
+              </Space>
+            </Form.Item>
+          </Col>
+        </Row>
+
+        <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', margin: '8px 0 16px', gap: 12, flexWrap: 'wrap' }}>
+          {canExportOrders ? (
+            <Space size={12} wrap>
+              <Radio.Group
+                optionType="button"
+                buttonStyle="solid"
+                value={exportFormat}
+                onChange={(e) => setExportFormat(e.target.value)}
+              >
+                <Radio.Button value="xlsx">Excel</Radio.Button>
+                <Radio.Button value="pdf">PDF</Radio.Button>
+              </Radio.Group>
+              <Button
+                disabled={!selectedRowKeys.length}
+                loading={exporting}
+                onClick={() => void submitExport('selected')}
+              >
+                导出已勾选{selectedRowKeys.length ? `（${selectedRowKeys.length}）` : ''}
+              </Button>
+              <Button loading={exporting} onClick={() => void submitExport('filter')}>
+                导出全部筛选
+              </Button>
+            </Space>
+          ) : <span />}
+          <Space size={12} wrap>
             <Button type="primary" htmlType="submit">查询</Button>
             <Button onClick={() => { form.resetFields(); setPage(1); void load(); }}>重置</Button>
+            {canDeleteOrders ? (
+              <Button
+                danger
+                disabled={!selectedRowKeys.length}
+                onClick={() => setBatchDeleteOpen(true)}
+              >
+                批量删除{selectedRowKeys.length ? `（${selectedRowKeys.length}）` : ''}
+              </Button>
+            ) : null}
           </Space>
-        </Form.Item>
+        </div>
       </Form>
 
       <Table
@@ -647,16 +830,18 @@ export default function OrdersPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 1500 }}
-        rowSelection={canDeleteOrders ? {
+        scroll={{ x: 1100 }}
+        rowSelection={{
           selectedRowKeys,
+          preserveSelectedRowKeys: true,
           onChange: (keys) => setSelectedRowKeys(keys as string[]),
-        } : undefined}
+        }}
         pagination={{
           current: page,
           pageSize,
           total: data?.total ?? 0,
           showSizeChanger: true,
+          showTotal: (total) => `共 ${total} 条`,
           onChange: (p, ps) => {
             setPage(p);
             setPageSize(ps);

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

@@ -3,6 +3,8 @@ import {
   Button,
   Card,
   DatePicker,
+  Descriptions,
+  Drawer,
   Form,
   Input,
   Modal,
@@ -31,8 +33,22 @@ type Row = {
   periodStart: string;
   periodEnd: string;
   rejectReason?: string | null;
-  partner?: { companyName?: string; phone?: string };
-  partnerAccount?: { companyName?: string; phone?: string };
+  paymentRef?: string | null;
+  paidAt?: string | null;
+  partner?: {
+    companyName?: string;
+    phone?: string;
+    bankAccountName?: string | null;
+    bankAccountNo?: string | null;
+    bankBranch?: string | null;
+  };
+  partnerAccount?: {
+    companyName?: string;
+    phone?: string;
+    bankAccountName?: string | null;
+    bankAccountNo?: string | null;
+    bankBranch?: string | null;
+  };
 };
 
 type PartnerOption = { id: string; companyName: string; phone?: string };
@@ -77,6 +93,8 @@ export default function PartnerBillsPage() {
   const [rejectForm] = Form.useForm();
   const [rejecting, setRejecting] = useState(false);
   const [selectedKeys, setSelectedKeys] = useState<React.Key[]>([]);
+  const [detail, setDetail] = useState<Row | null>(null);
+  const [drawerOpen, setDrawerOpen] = useState(false);
 
   useEffect(() => {
     void request<Paginated<PartnerOption>>(`/admin/partners?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
@@ -127,17 +145,30 @@ export default function PartnerBillsPage() {
   }
 
   function markPaid(ids: string[], amountHint?: number) {
+    let paymentRef = '';
     Modal.confirm({
       title: '确认打款？',
-      content: `将标记 ${ids.length} 笔账单为已打款${amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。`,
+      content: (
+        <div>
+          <div>
+            将标记 {ids.length} 笔账单为已打款
+            {amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。
+          </div>
+          <Input
+            placeholder="打款凭证号（可选）"
+            style={{ marginTop: 8 }}
+            onChange={(e) => {
+              paymentRef = e.target.value;
+            }}
+          />
+        </div>
+      ),
       okText: '确认打款',
       cancelText: '取消',
       onOk: async () => {
+        const body = JSON.stringify({ paymentRef: paymentRef.trim() || undefined });
         if (ids.length === 1) {
-          await request(`/admin/partner-bills/${ids[0]}/mark-paid`, {
-            method: 'POST',
-            body: JSON.stringify({ paymentRef: `PAY-${Date.now()}` }),
-          });
+          await request(`/admin/partner-bills/${ids[0]}/mark-paid`, { method: 'POST', body });
         } else {
           await request('/admin/partner-bills/batch-mark-paid', {
             method: 'POST',
@@ -182,6 +213,12 @@ export default function PartnerBillsPage() {
     }
   }
 
+  async function openDetail(id: string) {
+    const d = await request<Row>(`/admin/partner-bills/${id}`);
+    setDetail(d);
+    setDrawerOpen(true);
+  }
+
   async function exportExcel() {
     setExporting(true);
     try {
@@ -201,6 +238,7 @@ export default function PartnerBillsPage() {
 
   const summary = data?.summary;
   const partnerName = (r: Row) => r.partner?.companyName || r.partnerAccount?.companyName || '—';
+  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');
   const canPay = selectedRows.filter((r) => r.status === 'UNPAID');
@@ -238,6 +276,18 @@ export default function PartnerBillsPage() {
       width: 110,
       render: (v) => `¥${Number(v).toFixed(2)}`,
     },
+    {
+      title: '收款户名',
+      width: 100,
+      ellipsis: true,
+      render: (_, r) => partnerBank(r)?.bankAccountName || '—',
+    },
+    {
+      title: '收款账号',
+      width: 140,
+      ellipsis: true,
+      render: (_, r) => partnerBank(r)?.bankAccountNo || '—',
+    },
     {
       title: '状态',
       dataIndex: 'status',
@@ -259,6 +309,9 @@ export default function PartnerBillsPage() {
       fixed: 'right',
       render: (_, row) => (
         <Space size={0} wrap>
+          <Button type="link" size="small" onClick={() => void openDetail(row.id)}>
+            明细
+          </Button>
           {(row.status === 'PENDING_REVIEW' || row.status === 'REJECTED') && (
             <Button type="link" size="small" onClick={() => sendBills([row.id])}>
               发送
@@ -465,6 +518,59 @@ export default function PartnerBillsPage() {
           </Button>
         </Form>
       </Modal>
+
+      <Drawer
+        title="合伙人账单明细"
+        open={drawerOpen}
+        onClose={() => setDrawerOpen(false)}
+        width={560}
+      >
+        {detail && (
+          <>
+            <Descriptions column={1} size="small" bordered>
+              <Descriptions.Item label="账单号">{detail.billNo}</Descriptions.Item>
+              <Descriptions.Item label="合伙人">{partnerName(detail)}</Descriptions.Item>
+              <Descriptions.Item label="账期">
+                {String(detail.periodStart).slice(0, 10)} ~ {String(detail.periodEnd).slice(0, 10)}
+              </Descriptions.Item>
+              <Descriptions.Item label="订单佣金">
+                ¥{Number(detail.orderCommission).toFixed(2)}
+              </Descriptions.Item>
+              <Descriptions.Item label="核销佣金">
+                ¥{Number(detail.redeemCommission).toFixed(2)}
+              </Descriptions.Item>
+              <Descriptions.Item label="应付合计">
+                ¥{Number(detail.totalAmount).toFixed(2)}
+              </Descriptions.Item>
+              <Descriptions.Item label="状态">
+                <Tag color={STATUS_COLORS[detail.status] || 'default'}>
+                  {STATUS_LABELS[detail.status] || detail.status}
+                </Tag>
+              </Descriptions.Item>
+              <Descriptions.Item label="打款时间">
+                {detail.paidAt ? fmtTime(detail.paidAt) : '—'}
+              </Descriptions.Item>
+              <Descriptions.Item label="打款凭证">
+                {detail.paymentRef ? String(detail.paymentRef) : '—'}
+              </Descriptions.Item>
+            </Descriptions>
+            <Typography.Title level={5} style={{ marginTop: 16 }}>
+              收款账户
+            </Typography.Title>
+            <Descriptions column={1} size="small" bordered>
+              <Descriptions.Item label="户名">
+                {partnerBank(detail)?.bankAccountName || '—'}
+              </Descriptions.Item>
+              <Descriptions.Item label="账号">
+                {partnerBank(detail)?.bankAccountNo || '—'}
+              </Descriptions.Item>
+              <Descriptions.Item label="开户行">
+                {partnerBank(detail)?.bankBranch || '—'}
+              </Descriptions.Item>
+            </Descriptions>
+          </>
+        )}
+      </Drawer>
     </div>
   );
 }

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

@@ -21,6 +21,22 @@ type ProductDetailContentDto = {
   features?: Array<{ icon: string; title: string; desc: string }>;
 };
 
+type SkuListRow = {
+  id: string;
+  skuCode: string;
+  barcode69: string;
+  specText: string;
+  price: number;
+  benefitAmount: number;
+  status: string;
+  isDefault?: boolean;
+  allowOnSitePickup?: boolean;
+  allowOnlinePurchase?: boolean;
+  allowCrossCityDelivery?: boolean;
+  soldBottles?: number;
+  virtual?: boolean;
+};
+
 type Row = {
   id: string;
   skuCode: string;
@@ -30,9 +46,15 @@ type Row = {
   aromaType: string;
   spec: string;
   price: number;
+  priceMin?: number;
+  priceMax?: number;
+  soldBottles?: number;
   benefitAmount: number;
   status: string;
   sortOrder: number;
+  skuCount?: number;
+  specEnabled?: boolean;
+  skus?: SkuListRow[];
   allowOnSitePickup?: boolean;
   allowOnlinePurchase?: boolean;
   allowCrossCityDelivery?: boolean;
@@ -214,7 +236,33 @@ function VisibilityWhitelistFields({ form }: { form: FormInstance }) {
   );
 }
 
-function BaseInfoFields({ mode, form }: { mode: 'create' | 'edit'; form: FormInstance }) {
+function FulfillmentTags(row: {
+  allowOnlinePurchase?: boolean;
+  allowCrossCityDelivery?: boolean;
+  allowOnSitePickup?: boolean;
+}) {
+  return (
+    <Space size={[0, 4]} wrap>
+      {row.allowOnlinePurchase !== false ? <Tag color="blue">线上</Tag> : null}
+      {row.allowOnlinePurchase !== false && row.allowCrossCityDelivery !== false ? (
+        <Tag color="cyan">跨城</Tag>
+      ) : null}
+      {row.allowOnSitePickup ? <Tag color="green">现场</Tag> : null}
+      {row.allowOnlinePurchase === false && !row.allowOnSitePickup ? <Tag>无</Tag> : null}
+    </Space>
+  );
+}
+
+function BaseInfoFields({
+  mode,
+  form,
+  hideFulfillment,
+}: {
+  mode: 'create' | 'edit';
+  form: FormInstance;
+  /** 多规格商品：履约只在规格 SKU 上编辑 */
+  hideFulfillment?: boolean;
+}) {
   return (
     <>
       {mode === 'create' && (
@@ -256,39 +304,47 @@ function BaseInfoFields({ mode, form }: { mode: 'create' | 'edit'; form: FormIns
       <Form.Item name="sortOrder" label="排序">
         <InputNumber min={0} style={{ width: '100%' }} />
       </Form.Item>
-      <Form.Item
-        name="allowOnlinePurchase"
-        label="允许线上购买"
-        valuePropName="checked"
-        extra="配送到址（同城）"
-      >
-        <Switch
-          checkedChildren="开"
-          unCheckedChildren="关"
-          onChange={(checked) => {
-            if (!checked) form.setFieldsValue({ allowCrossCityDelivery: false });
-          }}
-        />
-      </Form.Item>
-      <Form.Item noStyle shouldUpdate={(prev, cur) => prev.allowOnlinePurchase !== cur.allowOnlinePurchase}>
-        {() => (
+      {hideFulfillment ? (
+        <Typography.Paragraph type="secondary" style={{ marginBottom: 16 }}>
+          该商品有多种规格，履约（线上 / 跨城 / 现场）请到「规格与 SKU」中按规格设置。
+        </Typography.Paragraph>
+      ) : (
+        <>
           <Form.Item
-            name="allowCrossCityDelivery"
-            label="允许跨城配送"
+            name="allowOnlinePurchase"
+            label="允许线上购买"
             valuePropName="checked"
-            extra="须先开启线上购买"
+            extra="配送到址（同城）"
           >
             <Switch
               checkedChildren="开"
               unCheckedChildren="关"
-              disabled={!form.getFieldValue('allowOnlinePurchase')}
+              onChange={(checked) => {
+                if (!checked) form.setFieldsValue({ allowCrossCityDelivery: false });
+              }}
             />
           </Form.Item>
-        )}
-      </Form.Item>
-      <Form.Item name="allowOnSitePickup" label="允许现场取货" valuePropName="checked">
-        <Switch checkedChildren="开" unCheckedChildren="关" />
-      </Form.Item>
+          <Form.Item noStyle shouldUpdate={(prev, cur) => prev.allowOnlinePurchase !== cur.allowOnlinePurchase}>
+            {() => (
+              <Form.Item
+                name="allowCrossCityDelivery"
+                label="允许跨城配送"
+                valuePropName="checked"
+                extra="须先开启线上购买"
+              >
+                <Switch
+                  checkedChildren="开"
+                  unCheckedChildren="关"
+                  disabled={!form.getFieldValue('allowOnlinePurchase')}
+                />
+              </Form.Item>
+            )}
+          </Form.Item>
+          <Form.Item name="allowOnSitePickup" label="允许现场取货" valuePropName="checked">
+            <Switch checkedChildren="开" unCheckedChildren="关" />
+          </Form.Item>
+        </>
+      )}
       <VisibilityWhitelistFields form={form} />
       <Form.Item name="coverUrl" label="封面">
         <OssUpload bizType="COVER" mediaType="IMAGE" />
@@ -332,12 +388,35 @@ export default function ProductsPage() {
   }
 
   const columns: ColumnsType<Row> = useMemo(() => [
-    { title: 'SKU', dataIndex: 'skuCode', width: 90 },
-    { title: '商品名', dataIndex: 'name', width: 180, ellipsis: true },
     { title: '香型', dataIndex: 'aromaType', width: 80, render: (v) => AROMA_TYPE_LABELS[v] || v },
-    { title: '规格', dataIndex: 'spec', width: 120, ellipsis: true },
-    { title: '售价', dataIndex: 'price', width: 80, render: (v) => `¥${v}` },
-    { title: '权益额', dataIndex: 'benefitAmount', width: 80, render: (v) => `¥${v}` },
+    { title: '品名', dataIndex: 'name', width: 200, ellipsis: true },
+    {
+      title: '累计销售',
+      dataIndex: 'soldBottles',
+      width: 110,
+      render: (v: number | undefined) => `累计 ${v ?? 0} 瓶`,
+    },
+    {
+      title: '售价',
+      key: 'priceRange',
+      width: 120,
+      render: (_, row) => {
+        const min = row.priceMin ?? row.price;
+        const max = row.priceMax ?? row.price;
+        if (min === max) return `¥${min}`;
+        return `¥${min} ~ ¥${max}`;
+      },
+    },
+    {
+      title: '规格数',
+      dataIndex: 'skuCount',
+      width: 80,
+      render: (v: number | undefined, row) => {
+        const real = v ?? 0;
+        if (real > 0) return real;
+        return row.skus?.some((s) => s.virtual) ? 1 : 0;
+      },
+    },
     { title: '状态', dataIndex: 'status', width: 80, render: (s) => (
       <Tag color={s === 'ON_SALE' ? 'green' : undefined}>{PRODUCT_STATUS_LABELS[s] || s}</Tag>
     ) },
@@ -348,23 +427,7 @@ export default function ProductsPage() {
       render: (v: boolean) =>
         v ? <Tag color="orange">限测</Tag> : <Tag>公开</Tag>,
     },
-    {
-      title: '履约',
-      key: 'fulfillment',
-      width: 160,
-      render: (_, row) => (
-        <Space size={[0, 4]} wrap>
-          {row.allowOnlinePurchase !== false ? <Tag color="blue">线上</Tag> : null}
-          {row.allowOnlinePurchase !== false && row.allowCrossCityDelivery !== false ? (
-            <Tag color="cyan">跨城</Tag>
-          ) : null}
-          {row.allowOnSitePickup ? <Tag color="green">现场</Tag> : null}
-          {row.allowOnlinePurchase === false && !row.allowOnSitePickup ? <Tag>无</Tag> : null}
-        </Space>
-      ),
-    },
     { title: '排序', dataIndex: 'sortOrder', width: 60 },
-    { title: '创建', dataIndex: 'createdAt', width: 160, render: fmtTime },
     {
       title: '操作', width: 120,
       render: (_, row) => (
@@ -377,7 +440,7 @@ export default function ProductsPage() {
           }}>编辑</Button>
           <Popconfirm
             title="确认删除该商品？"
-            description={`将永久删除「${row.name}」（${row.skuCode}），此操作不可恢复。`}
+            description={`将永久删除「${row.name}」，此操作不可恢复。`}
             okText="确认删除"
             cancelText="取消"
             okButtonProps={{ danger: true }}
@@ -390,6 +453,46 @@ export default function ProductsPage() {
     },
   ], [detail, editForm]);
 
+  const skuColumns: ColumnsType<SkuListRow> = useMemo(() => [
+    {
+      title: '规格',
+      dataIndex: 'specText',
+      width: 140,
+      ellipsis: true,
+      render: (v: string, row) => (
+        <Space size={4}>
+          <span>{v || '默认'}</span>
+          {row.isDefault ? <Tag color="blue">默认</Tag> : null}
+          {row.virtual ? <Tag>未建SKU</Tag> : null}
+        </Space>
+      ),
+    },
+    { title: 'SKU', dataIndex: 'skuCode', width: 110 },
+    { title: '69码', dataIndex: 'barcode69', width: 160, ellipsis: true },
+    { title: '售价', dataIndex: 'price', width: 90, render: (v) => `¥${v}` },
+    { title: '权益额', dataIndex: 'benefitAmount', width: 90, render: (v) => `¥${v}` },
+    {
+      title: '累计销售',
+      dataIndex: 'soldBottles',
+      width: 100,
+      render: (v: number | undefined) => `${v ?? 0} 瓶`,
+    },
+    {
+      title: '履约',
+      key: 'fulfillment',
+      width: 160,
+      render: (_, row) => <FulfillmentTags {...row} />,
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      width: 90,
+      render: (s) => (
+        <Tag color={s === 'ON_SALE' ? 'green' : undefined}>{PRODUCT_STATUS_LABELS[s] || s}</Tag>
+      ),
+    },
+  ], []);
+
   return (
     <div>
       <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
@@ -397,7 +500,9 @@ export default function ProductsPage() {
         <Button type="primary" onClick={() => setCreateOpen(true)}>新建商品</Button>
       </Space>
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
-        <Form.Item name="name" label="名称"><Input allowClear /></Form.Item>
+        <Form.Item name="name" label="名称">
+          <Input allowClear placeholder="名称 / SKU / 69 码" style={{ width: 200 }} />
+        </Form.Item>
         <Form.Item name="status" label="状态">
           <Select allowClear style={{ width: 110 }} options={Object.entries(PRODUCT_STATUS_LABELS).map(([value, label]) => ({ value, label }))} />
         </Form.Item>
@@ -406,17 +511,46 @@ export default function ProductsPage() {
         </Form.Item>
         <Form.Item><Button type="primary" htmlType="submit">查询</Button></Form.Item>
       </Form>
-      <Table rowKey="id" className="admin-table-nowrap" loading={loading} columns={columns} dataSource={data?.items ?? []} scroll={{ x: 1320 }}
-        pagination={{ current: page, pageSize, total: data?.total ?? 0, showSizeChanger: true, onChange: (p, ps) => { setPage(p); setPageSize(ps); } }} />
-      <Drawer title="编辑商品" width={720} open={drawerOpen} onClose={() => setDrawerOpen(false)}
+      <Table
+        rowKey="id"
+        className="admin-table-nowrap"
+        loading={loading}
+        columns={columns}
+        dataSource={data?.items ?? []}
+        scroll={{ x: 1080 }}
+        expandable={{
+          rowExpandable: () => true,
+          expandedRowRender: (row) => (
+            <div style={{ margin: '-8px -8px -8px 24px', padding: 12, background: '#f5f5f5', borderRadius: 6 }}>
+              <Table
+                size="small"
+                rowKey="id"
+                pagination={false}
+                columns={skuColumns}
+                dataSource={row.skus ?? []}
+                scroll={{ x: 980 }}
+                style={{ background: 'transparent' }}
+              />
+            </div>
+          ),
+        }}
+        pagination={{ current: page, pageSize, total: data?.total ?? 0, showSizeChanger: true, onChange: (p, ps) => { setPage(p); setPageSize(ps); } }}
+      />
+      <Drawer title="编辑商品" width={1100} open={drawerOpen} onClose={() => setDrawerOpen(false)}
         extra={detail && (
           <Button type="primary" onClick={async () => {
             const v = await editForm.validateFields();
-            if (!v.allowOnlinePurchase && !v.allowOnSitePickup) {
+            const multiSku = Array.isArray(detail.skus) && (detail.skus as unknown[]).length > 1;
+            if (!multiSku && !v.allowOnlinePurchase && !v.allowOnSitePickup) {
               message.error('请至少勾选「允许线上购买」或「允许现场取货」之一');
               return;
             }
             const payload = buildProductPayload(v);
+            if (multiSku) {
+              delete (payload as { allowOnlinePurchase?: boolean }).allowOnlinePurchase;
+              delete (payload as { allowCrossCityDelivery?: boolean }).allowCrossCityDelivery;
+              delete (payload as { allowOnSitePickup?: boolean }).allowOnSitePickup;
+            }
             await request(`/admin/products/${detail.id}`, { method: 'PUT', body: JSON.stringify(payload) });
             message.success('已保存');
             setDrawerOpen(false);
@@ -426,13 +560,24 @@ export default function ProductsPage() {
         {detail && (
           <>
             <Descriptions column={1} bordered size="small" style={{ marginBottom: 16 }}>
-              <Descriptions.Item label="SKU">{String(detail.skuCode)}（系统生成）</Descriptions.Item>
+              <Descriptions.Item label="默认 SKU">{String(detail.skuCode)}（系统生成）</Descriptions.Item>
               <Descriptions.Item label="默认 69 码">{String(detail.barcode69)}</Descriptions.Item>
               <Descriptions.Item label="香型">{AROMA_TYPE_LABELS[String(detail.aromaType)] || String(detail.aromaType)}</Descriptions.Item>
+              <Descriptions.Item label="创建时间">{fmtTime(String(detail.createdAt ?? ''))}</Descriptions.Item>
             </Descriptions>
             <Form form={editForm} layout="vertical">
               <Tabs items={[
-                { key: 'base', label: '基础信息', children: <BaseInfoFields mode="edit" form={editForm} /> },
+                {
+                  key: 'base',
+                  label: '基础信息',
+                  children: (
+                    <BaseInfoFields
+                      mode="edit"
+                      form={editForm}
+                      hideFulfillment={Array.isArray(detail.skus) && (detail.skus as unknown[]).length > 1}
+                    />
+                  ),
+                },
                 {
                   key: 'detail',
                   label: '详情页',

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

@@ -44,6 +44,11 @@ type Row = {
   settlementRate?: number | null;
   payoutCount?: number | null;
   store?: { id: string; name: string; cityName: string; phone?: string | null };
+  bankAccount?: {
+    bankAccountName?: string | null;
+    bankAccountNo?: string | null;
+    bankBranch?: string | null;
+  } | null;
 };
 
 type StoreOption = { id: string; name: string; phone: string };
@@ -55,6 +60,11 @@ const STATUS_COLORS: Record<string, string> = {
   REJECTED: 'red',
 };
 
+function settlementStatusColor(kind: StoreSettlementKind, status: string) {
+  if (status === 'PAID') return kind === 'WITHDRAW' ? 'cyan' : 'green';
+  return STATUS_COLORS[status] || 'default';
+}
+
 const KIND_COLORS: Record<StoreSettlementKind, string> = {
   T1_BILL: 'blue',
   WITHDRAW: 'purple',
@@ -118,14 +128,30 @@ export default function StoreBillsPage() {
   }, []);
 
   function confirmPay(ids: string[], amountHint?: number) {
+    let paymentRef = '';
     Modal.confirm({
       title: '确认打款？',
-      content: `将确认 ${ids.length} 笔 T+1 门店对账单${amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。此操作不可撤销。`,
+      content: (
+        <div>
+          <div>
+            将确认 {ids.length} 笔 T+1 门店对账单
+            {amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。此操作不可撤销。
+          </div>
+          <Input
+            placeholder="打款凭证号（可选）"
+            style={{ marginTop: 8 }}
+            onChange={(e) => {
+              paymentRef = e.target.value;
+            }}
+          />
+        </div>
+      ),
       okText: '确认打款',
       cancelText: '取消',
       onOk: async () => {
+        const body = JSON.stringify({ paymentRef: paymentRef.trim() || undefined });
         if (ids.length === 1) {
-          await request(`/admin/store-bills/${ids[0]}/confirm`, { method: 'POST' });
+          await request(`/admin/store-bills/${ids[0]}/confirm`, { method: 'POST', body });
         } else {
           setBatchLoading(true);
           try {
@@ -247,7 +273,9 @@ export default function StoreBillsPage() {
       dataIndex: 'kind',
       width: 100,
       render: (k: StoreSettlementKind) => (
-        <Tag color={KIND_COLORS[k]}>{STORE_SETTLEMENT_KIND_LABELS[k] ?? k}</Tag>
+        <Tag color={KIND_COLORS[k]} style={{ minWidth: 72, textAlign: 'center' }}>
+          {STORE_SETTLEMENT_KIND_LABELS[k] ?? k}
+        </Tag>
       ),
     },
     {
@@ -271,6 +299,20 @@ export default function StoreBillsPage() {
     { title: '门店', dataIndex: ['store', 'name'], width: 140, ellipsis: true },
     { title: '登录手机', dataIndex: ['store', 'phone'], width: 120, render: (v) => v || '—' },
     { title: '城市', dataIndex: ['store', 'cityName'], width: 90 },
+    {
+      title: '收款户名',
+      width: 100,
+      ellipsis: true,
+      render: (_, row) =>
+        row.kind === 'T1_BILL' ? row.bankAccount?.bankAccountName || '—' : '—',
+    },
+    {
+      title: '收款账号',
+      width: 140,
+      ellipsis: true,
+      render: (_, row) =>
+        row.kind === 'T1_BILL' ? row.bankAccount?.bankAccountNo || '—' : '—',
+    },
     {
       title: '笔数',
       width: 80,
@@ -288,7 +330,9 @@ export default function StoreBillsPage() {
       dataIndex: 'status',
       width: 100,
       render: (s: string, row) => (
-        <Tag color={STATUS_COLORS[s] || 'default'}>{storeSettlementStatusLabel(row.kind, s)}</Tag>
+        <Tag color={settlementStatusColor(row.kind, s)}>
+          {storeSettlementStatusLabel(row.kind, s)}
+        </Tag>
       ),
     },
     {
@@ -339,7 +383,8 @@ export default function StoreBillsPage() {
           门店账单
         </Typography.Title>
         <Typography.Text type="secondary">
-          含 T+1 自动出账与门店手动提现；按类型筛选，详情与审核动作沿用原接口
+          含 T+1 自动出账与门店手动提现；按类型筛选，详情与审核动作沿用原接口。
+          「已打款」= T+1 出账终态，「已结算」= 手动提现终态。
         </Typography.Text>
         {overdueSummary && overdueSummary.overdueCount > 0 ? (
           <Typography.Text type="danger">
@@ -503,7 +548,32 @@ export default function StoreBillsPage() {
               <Descriptions.Item label="打款时间">
                 {detail.paidAt ? fmtTime(String(detail.paidAt)) : '—'}
               </Descriptions.Item>
+              <Descriptions.Item label="打款凭证">
+                {detail.paymentRef ? String(detail.paymentRef) : '—'}
+              </Descriptions.Item>
             </Descriptions>
+            {(detail.storeAccount as {
+              bankAccountName?: string;
+              bankAccountNo?: string;
+              bankBranch?: string;
+            } | null) ? (
+              <>
+                <Typography.Title level={5} style={{ marginTop: 16 }}>
+                  收款账户
+                </Typography.Title>
+                <Descriptions column={1} size="small" bordered>
+                  <Descriptions.Item label="户名">
+                    {(detail.storeAccount as { bankAccountName?: string }).bankAccountName || '—'}
+                  </Descriptions.Item>
+                  <Descriptions.Item label="账号">
+                    {(detail.storeAccount as { bankAccountNo?: string }).bankAccountNo || '—'}
+                  </Descriptions.Item>
+                  <Descriptions.Item label="开户行">
+                    {(detail.storeAccount as { bankBranch?: string }).bankBranch || '—'}
+                  </Descriptions.Item>
+                </Descriptions>
+              </>
+            ) : null}
             <Typography.Title level={5} style={{ marginTop: 16 }}>
               核销明细
             </Typography.Title>

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

@@ -55,10 +55,12 @@ function InfoChangeImageDiff({
   field,
   live,
   proposed,
+  imageSize = 72,
 }: {
   field: string;
   live: unknown;
   proposed: unknown;
+  imageSize?: number;
 }) {
   const liveUrls =
     field === 'coverUrl'
@@ -83,7 +85,7 @@ function InfoChangeImageDiff({
           <Image.PreviewGroup>
             <Space wrap size={8}>
               {liveUrls.map((url) => (
-                <Image key={`live-${url}`} src={url} width={72} height={72} style={{ objectFit: 'cover', borderRadius: 4 }} />
+                <Image key={`live-${url}`} src={url} width={imageSize} height={imageSize} style={{ objectFit: 'cover', borderRadius: 4 }} />
               ))}
             </Space>
           </Image.PreviewGroup>
@@ -99,7 +101,7 @@ function InfoChangeImageDiff({
           <Image.PreviewGroup>
             <Space wrap size={8}>
               {proposedUrls.map((url) => (
-                <Image key={`new-${url}`} src={url} width={72} height={72} style={{ objectFit: 'cover', borderRadius: 4 }} />
+                <Image key={`new-${url}`} src={url} width={imageSize} height={imageSize} style={{ objectFit: 'cover', borderRadius: 4 }} />
               ))}
             </Space>
           </Image.PreviewGroup>
@@ -128,6 +130,7 @@ function InfoChangeAuditPanel({
   const [rejectOpen, setRejectOpen] = useState(false);
   const [rejectReason, setRejectReason] = useState('');
   const [activeId, setActiveId] = useState<string | null>(null);
+  const [infoFullscreen, setInfoFullscreen] = useState(false);
 
   async function reload(nextPage = page, nextStatus = status) {
     setLoading(true);
@@ -286,25 +289,33 @@ function InfoChangeAuditPanel({
 
       <Drawer
         title={detail ? `${detail.storeName || detail.storeId} · 信息变更` : '信息变更详情'}
-        width={680}
+        width={infoFullscreen ? '100%' : 680}
         open={detailOpen}
-        onClose={() => setDetailOpen(false)}
+        onClose={() => {
+          setDetailOpen(false);
+          setInfoFullscreen(false);
+        }}
         extra={
-          detail?.status === 'PENDING' ? (
-            <Space>
-              <Button onClick={() => void audit(detail.id, 'APPROVE')}>通过</Button>
-              <Button
-                danger
-                onClick={() => {
-                  setActiveId(detail.id);
-                  setRejectReason('');
-                  setRejectOpen(true);
-                }}
-              >
-                驳回
-              </Button>
-            </Space>
-          ) : null
+          <Space>
+            <Button onClick={() => setInfoFullscreen((v) => !v)}>
+              {infoFullscreen ? '退出全屏' : '全屏查看'}
+            </Button>
+            {detail?.status === 'PENDING' ? (
+              <>
+                <Button onClick={() => void audit(detail.id, 'APPROVE')}>通过</Button>
+                <Button
+                  danger
+                  onClick={() => {
+                    setActiveId(detail.id);
+                    setRejectReason('');
+                    setRejectOpen(true);
+                  }}
+                >
+                  驳回
+                </Button>
+              </>
+            ) : null}
+          </Space>
         }
       >
         {detailLoading ? (
@@ -328,7 +339,12 @@ function InfoChangeAuditPanel({
                     label={STORE_INFO_CHANGEABLE_FIELD_LABELS[d.field] ?? d.field}
                   >
                     {d.field === 'coverUrl' || d.field === 'envPhotoUrls' ? (
-                      <InfoChangeImageDiff field={d.field} live={d.live} proposed={d.proposed} />
+                      <InfoChangeImageDiff
+                        field={d.field}
+                        live={d.live}
+                        proposed={d.proposed}
+                        imageSize={infoFullscreen ? 160 : 72}
+                      />
                     ) : (
                       <span>
                         <Typography.Text delete type="secondary">
@@ -388,6 +404,7 @@ export default function StorePackageAuditsPage() {
   const [detailOpen, setDetailOpen] = useState(false);
   const [activeRequestId, setActiveRequestId] = useState<string | null>(null);
   const [drawerTitle, setDrawerTitle] = useState('套餐变更详情');
+  const [packageFullscreen, setPackageFullscreen] = useState(false);
 
   async function reload(nextPage = page, nextStatus = status) {
     setLoading(true);
@@ -554,14 +571,23 @@ export default function StorePackageAuditsPage() {
 
       <Drawer
         title={drawerTitle}
-        width={880}
+        width={packageFullscreen ? '100%' : 880}
         open={detailOpen}
-        onClose={() => setDetailOpen(false)}
+        onClose={() => {
+          setDetailOpen(false);
+          setPackageFullscreen(false);
+        }}
         destroyOnClose
+        extra={
+          <Button onClick={() => setPackageFullscreen((v) => !v)}>
+            {packageFullscreen ? '退出全屏' : '全屏查看'}
+          </Button>
+        }
       >
         {activeRequestId ? (
           <StorePackageAuditPanel
             requestId={activeRequestId}
+            fullscreen={packageFullscreen}
             onAudited={() => {
               setDetailOpen(false);
               void reload(page, status);

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

@@ -218,8 +218,13 @@ export default function SupportTicketsPage() {
 
     setReviewOpen(false);
     const summary = [detail!.title, detail!.content].filter(Boolean).join('\n').slice(0, 500);
+    const ticketUrls = (detail!.attachmentUrls ?? []).filter(Boolean);
     tasksForm.setFieldsValue({
-      tasks: [{ content: summary || detail!.title, type: mapSupportTicketTypeToDevPlanTask(detail!.ticketType) }],
+      tasks: [{
+        content: summary || detail!.title,
+        type: mapSupportTicketTypeToDevPlanTask(detail!.ticketType),
+        attachmentUrls: ticketUrls,
+      }],
       dispatchToWecom: localStorage.getItem(DISPATCH_WECOM_STORAGE_KEY) !== 'false',
       dispatchSupplement: DEFAULT_DISPATCH_SUPPLEMENT,
     });
@@ -364,7 +369,11 @@ export default function SupportTicketsPage() {
         body: JSON.stringify({
           decision: 'APPROVE',
           note: note?.trim() || undefined,
-          tasks: values.tasks.map((t) => ({ content: t.content.trim(), type: t.type })),
+          tasks: values.tasks.map((t) => ({
+            content: t.content.trim(),
+            type: t.type,
+            attachmentUrls: t.attachmentUrls?.length ? t.attachmentUrls : detail!.attachmentUrls,
+          })),
           dispatchToWecom: !!values.dispatchToWecom,
           dispatchSupplement: values.dispatchSupplement?.trim() || undefined,
         }),

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

@@ -37,6 +37,13 @@ type Row = {
   wineryAmount: number;
   status: string;
   paidAt?: string | null;
+  paymentRef?: string | null;
+  wineryBank?: {
+    bankAccountName?: string | null;
+    bankName?: string | null;
+    bankBranch?: string | null;
+    bankAccountNo?: string | null;
+  };
 };
 
 type BillItem = {
@@ -127,14 +134,30 @@ export default function WineryBillsPage() {
     (profile?.permissionKeys ?? []).includes('system_settings_winery_bank');
 
   function confirmPay(ids: string[], amountHint?: number) {
+    let paymentRef = '';
     Modal.confirm({
       title: '确认打款？',
-      content: `将确认 ${ids.length} 笔酒厂对账单${amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。此操作不可撤销。`,
+      content: (
+        <div>
+          <div>
+            将确认 {ids.length} 笔酒厂对账单
+            {amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。此操作不可撤销。
+          </div>
+          <Input
+            placeholder="打款凭证号（可选）"
+            style={{ marginTop: 8 }}
+            onChange={(e) => {
+              paymentRef = e.target.value;
+            }}
+          />
+        </div>
+      ),
       okText: '确认打款',
       cancelText: '取消',
       onOk: async () => {
+        const body = JSON.stringify({ paymentRef: paymentRef.trim() || undefined });
         if (ids.length === 1) {
-          await request(`/admin/winery-bills/${ids[0]}/confirm`, { method: 'POST' });
+          await request(`/admin/winery-bills/${ids[0]}/confirm`, { method: 'POST', body });
         } else {
           await request('/admin/winery-bills/batch-confirm', {
             method: 'POST',
@@ -399,7 +422,31 @@ export default function WineryBillsPage() {
                 {displayWineryStatus(detail.status, detail.wineryAmount).label}
               </Descriptions.Item>
               <Descriptions.Item label="打款时间">{detail.paidAt ? fmtTime(detail.paidAt) : '—'}</Descriptions.Item>
+              <Descriptions.Item label="打款凭证">
+                {detail.paymentRef ? String(detail.paymentRef) : '—'}
+              </Descriptions.Item>
             </Descriptions>
+            {detail.wineryBank ? (
+              <>
+                <Typography.Title level={5} style={{ marginTop: 16 }}>
+                  收款账户（酒厂）
+                </Typography.Title>
+                <Descriptions column={1} size="small" bordered>
+                  <Descriptions.Item label="户名">
+                    {detail.wineryBank.bankAccountName || '—'}
+                  </Descriptions.Item>
+                  <Descriptions.Item label="开户银行">
+                    {detail.wineryBank.bankName || '—'}
+                  </Descriptions.Item>
+                  <Descriptions.Item label="开户支行">
+                    {detail.wineryBank.bankBranch || '—'}
+                  </Descriptions.Item>
+                  <Descriptions.Item label="账号">
+                    {detail.wineryBank.bankAccountNo || '—'}
+                  </Descriptions.Item>
+                </Descriptions>
+              </>
+            ) : null}
             <Typography.Title level={5} style={{ marginTop: 16 }}>
               订单明细
             </Typography.Title>

apps/mini-user/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dukang/mini-user",
-  "version": "3.4.15",
+  "version": "3.5.4",
   "private": true,
   "description": "杜康好客 · C 端用户微信小程序（Taro）",
   "scripts": {

apps/mini-user/src/lib/client-version.ts

@@ -2,7 +2,7 @@ import Taro from '@tarojs/taro';
 import { fetchClientConfig } from './pay-wechat';
 
 /** 与 package.json version 同步，供服务端 minClientVersion 比对 */
-export const APP_VERSION = '3.4.15';
+export const APP_VERSION = '3.5.4';
 
 export const APP_VERSION_LABEL = `v${APP_VERSION}`;
 

apps/mini-user/src/pages/pay/index.tsx

@@ -16,10 +16,10 @@ import {
   saveWechatLoginResult,
 } from '../../lib/pay-wechat';
 import { applyWechatLoginResult } from '../../lib/wechat-auth';
-import { getBrandAssetsSync, loadBrandAssets } from '../../lib/brand-assets';
 import { isWechatEnv } from '../../lib/weixin';
 import { goLogin } from '../../lib/auth-nav';
 import { request, toast } from '../../lib/api';
+import payLogo from '../../assets/logo2.png';
 
 export default function PayPage() {
   const router = useRouter();
@@ -31,7 +31,6 @@ export default function PayPage() {
   const [orderNo, setOrderNo] = useState('');
   const [payAmount, setPayAmount] = useState('—');
   const [deliveryType, setDeliveryType] = useState('');
-  const [brandMarkUrl, setBrandMarkUrl] = useState(() => getBrandAssetsSync().brandLogoMarkUrl);
 
   const returnPath = orderId
     ? `/pages/pay/index?orderId=${orderId}`
@@ -51,10 +50,6 @@ export default function PayPage() {
     void refreshPayReadiness();
   });
 
-  useEffect(() => {
-    void loadBrandAssets().then((brand) => setBrandMarkUrl(brand.brandLogoMarkUrl));
-  }, []);
-
   useEffect(() => {
     if (!orderId) return;
     if (process.env.TARO_ENV === 'weapp') {
@@ -178,7 +173,7 @@ export default function PayPage() {
       <View className="sub-page-body">
         <View className="pay-status">
           <View className="pay-status-icon">
-            <Image className="pay-status-brand" src={brandMarkUrl} mode="aspectFit" />
+            <Image className="pay-status-brand" src={payLogo} mode="aspectFit" />
           </View>
           <Text className="pay-status-title">
             {needsWechatAuth ? '需完成微信授权' : '待支付'}

apps/mini-user/src/pages/product-detail/index.tsx

@@ -165,6 +165,12 @@ export default function ProductDetailPage() {
         allowOnSitePickup: activeSku.allowOnSitePickup,
       }
     : product;
+  const carouselImages = (() => {
+    const base = getProductCarouselImages(product);
+    const skuImg = activeSku?.imageUrl?.trim();
+    if (!skuImg) return base;
+    return [skuImg, ...base.filter((url) => url !== skuImg)];
+  })();
 
   const sharePayload = useMemo(
     () =>
@@ -172,9 +178,9 @@ export default function ProductDetailPage() {
         path: `/pages/product-detail/index?id=${productId}`,
         dynamicTitle: product?.name,
         dynamicDesc: product?.subtitle,
-        dynamicImageUrl: product ? getProductMainImage(product) : undefined,
+        dynamicImageUrl: (activeSku?.imageUrl?.trim() || (product ? getProductMainImage(product) : undefined)),
       }),
-    [product, productId],
+    [product, productId, activeSku],
   );
 
   useShareAppMessage(() => toWeappShareMessage(sharePayload));
@@ -249,7 +255,6 @@ export default function ProductDetailPage() {
 
   const allowOnline = canBuyOnline(fulfillment ?? {});
   const allowOnSite = canPickupOnSite(fulfillment ?? {});
-  const carouselImages = getProductCarouselImages(product);
   const detailImages = getProductDetailImages(product);
   const detail = product.detailContent ?? {};
   const features = detail.features ?? [];

apps/mini-user/src/pages/store-detail/index.tsx

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { View, Text, Image } from '@tarojs/components';
+import { View, Text, Image, ScrollView } from '@tarojs/components';
 import '../../styles/store-detail.css';
 import Taro, {
   useDidShow,
@@ -444,17 +444,19 @@ export default function StoreDetailPage() {
         </View>
       ) : null}
 
-      {intro ? (
+      {benefitRule ? (
         <View className="store-detail-section">
-          <Text className="store-detail-section-title">门店详情</Text>
-          <Text className="store-detail-intro">{intro}</Text>
+          <Text className="store-detail-section-title store-detail-section-title--rule">使用规则</Text>
+          <Text className="store-detail-intro">{benefitRule}</Text>
         </View>
       ) : null}
 
-      {benefitRule ? (
+      {intro ? (
         <View className="store-detail-section">
-          <Text className="store-detail-section-title">好客权益使用规则</Text>
-          <Text className="store-detail-intro">{benefitRule}</Text>
+          <Text className="store-detail-section-title">门店详情</Text>
+          <ScrollView className="store-detail-intro-scroll" scrollY showScrollbar>
+            <Text className="store-detail-intro">{intro}</Text>
+          </ScrollView>
         </View>
       ) : null}
 

apps/mini-user/src/styles/order.css

@@ -488,12 +488,10 @@
 }
 
 .pay-status-icon {
-  width: 72px;
-  height: 72px;
+  width: 88px;
+  height: 88px;
   border-radius: 50%;
-  background: rgba(166, 29, 36, 0.08);
-  color: var(--color-heritage-red);
-  font-size: 36px;
+  background: #f7f4ee;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -502,8 +500,8 @@
 }
 
 .pay-status-brand {
-  width: 44px;
-  height: 44px;
+  width: 72px;
+  height: 72px;
 }
 
 .pay-status-title {

apps/mini-user/src/styles/product-detail.css

@@ -130,6 +130,7 @@
 
 .product-detail-promo {
   position: relative;
+  margin-top: 8px;
   padding: 16px;
   border-radius: var(--radius-lg);
   background: linear-gradient(135deg, #fff9e6 0%, #fff0c2 100%);
@@ -377,7 +378,7 @@
 }
 
 .product-detail-specs {
-  margin: 12px 0 4px;
+  margin: 16px 0 28px;
   display: flex;
   flex-direction: column;
   gap: 12px;

apps/mini-user/src/styles/store-detail.css

@@ -211,6 +211,17 @@
   color: var(--color-on-surface);
 }
 
+.store-detail-section-title--rule {
+  color: var(--color-heritage-red, #a61d24);
+}
+
+.store-detail-intro-scroll {
+  max-height: 168px;
+  height: 168px;
+  overflow-y: auto;
+  -webkit-overflow-scrolling: touch;
+}
+
 .store-detail-env-grid {
   display: flex;
   flex-direction: column;

deploy/_diag_wx_key.mjs

@@ -1,77 +0,0 @@
-#!/usr/bin/env node
-const fs = require('fs');
-const crypto = require('crypto');
-const path = process.argv[2] || '/opt/dukang/server/dukang-api/.env.production';
-
-function stripQuotes(s) {
-  const t = s.trim();
-  if ((t.startsWith('"') && t.endsWith('"')) || (t.startsWith("'") && t.endsWith("'"))) {
-    return t.slice(1, -1);
-  }
-  return t;
-}
-
-function parseEnvValue(text, key) {
-  const re = new RegExp(`^${key}=(.*)$`, 'm');
-  const m = text.match(re);
-  if (!m) return null;
-  return stripQuotes(m[1]);
-}
-
-function tryKey(name, key) {
-  const literalN = (key.match(/\\n/g) || []).length;
-  const realN = (key.match(/\n/g) || []).length;
-  const hasBegin = /BEGIN (RSA )?PRIVATE KEY/.test(key);
-  try {
-    crypto.createPrivateKey(key);
-    console.log(`${name}: OK begin=${hasBegin} literalN=${literalN} realN=${realN} len=${key.length}`);
-    return true;
-  } catch (e) {
-    console.log(
-      `${name}: FAIL ${e.message} begin=${hasBegin} literalN=${literalN} realN=${realN} len=${key.length} head=${JSON.stringify(key.slice(0, 48))}`,
-    );
-    return false;
-  }
-}
-
-const text = fs.readFileSync(path, 'utf8');
-const raw = parseEnvValue(text, 'WX_MCH_PRIVATE_KEY');
-if (!raw) {
-  console.log('MISSING WX_MCH_PRIVATE_KEY in', path);
-  process.exit(1);
-}
-
-console.log('file=', path);
-console.log('MOCK_PAY=', parseEnvValue(text, 'MOCK_PAY'));
-console.log('WX_MINI_APP_ID=', parseEnvValue(text, 'WX_MINI_APP_ID'));
-console.log('WX_APP_ID=', parseEnvValue(text, 'WX_APP_ID'));
-console.log('WX_MCH_ID=', parseEnvValue(text, 'WX_MCH_ID'));
-console.log('WX_PAY_NOTIFY_URL=', parseEnvValue(text, 'WX_PAY_NOTIFY_URL'));
-
-const variants = {
-  as_is: raw,
-  unescape_n: raw.replace(/\\n/g, '\n'),
-  unescape_twice: raw.replace(/\\\\n/g, '\\n').replace(/\\n/g, '\n'),
-  strip_cr_unesc: raw.replace(/\\n/g, '\n').replace(/\r/g, ''),
-  // dotenv style sometimes leaves surrounding quotes in process.env
-  quoted_unesc: stripQuotes(raw).replace(/\\n/g, '\n'),
-};
-
-let ok = false;
-for (const [name, key] of Object.entries(variants)) {
-  if (tryKey(name, key)) ok = true;
-}
-
-// also simulate dotenv load
-try {
-  const dotenv = require('dotenv');
-  const parsed = dotenv.parse(text);
-  const fromDotenv = parsed.WX_MCH_PRIVATE_KEY || '';
-  console.log('dotenv_raw_literalN=', (fromDotenv.match(/\\n/g) || []).length, 'realN=', (fromDotenv.match(/\n/g) || []).length);
-  tryKey('dotenv_as_is', fromDotenv);
-  tryKey('dotenv_unescape', fromDotenv.replace(/\\n/g, '\n'));
-} catch (e) {
-  console.log('dotenv skip', e.message);
-}
-
-process.exit(ok ? 0 : 2);

deploy/enable-api-lingshi-ssl.sh

@@ -1,65 +0,0 @@
-#!/usr/bin/env bash
-# 为 api.lingshivip.cn 申请 DNS 证书并启用 HTTPS
-set -euo pipefail
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-SSL_DIR="/etc/nginx/ssl/api.lingshivip.cn"
-NGINX_CONF="/etc/nginx/conf.d/dukang-lingshivip.conf"
-
-mkdir -p "$SSL_DIR" /var/www/certbot/.well-known/acme-challenge
-
-echo "==> 1. 发起 DNS 验证（需先在 DNSPod 添加 TXT 记录）"
-~/.acme.sh/acme.sh --issue -d api.lingshivip.cn --dns \
-  --yes-I-know-dns-manual-mode-enough-go-ahead-please \
-  --server letsencrypt || true
-
-echo ""
-echo "请在 DNSPod 添加上述 TXT 记录后，执行："
-echo "  $0 --renew"
-echo ""
-
-if [[ "${1:-}" != "--renew" ]]; then
-  exit 0
-fi
-
-echo "==> 2. 继续 DNS 验证并签发证书"
-~/.acme.sh/acme.sh --renew -d api.lingshivip.cn --yes-I-know-dns-manual-mode-enough-go-ahead-please
-
-echo "==> 3. 安装证书到 nginx 目录"
-install -m 644 ~/.acme.sh/api.lingshivip.cn_ecc/fullchain.cer "$SSL_DIR/fullchain.cer"
-install -m 600 ~/.acme.sh/api.lingshivip.cn_ecc/api.lingshivip.cn.key "$SSL_DIR/api.lingshivip.cn.key"
-
-echo "==> 4. 更新 nginx 并重载"
-cp "$SCRIPT_DIR/nginx-lingshivip.conf" "$NGINX_CONF"
-python3 - <<'PY'
-from pathlib import Path
-p = Path("/etc/nginx/conf.d/dukang-lingshivip.conf")
-text = p.read_text()
-old = """    location / {
-        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 "";
-    }
-}
-
-# API 独立域名 HTTPS"""
-new = """    location / {
-        return 301 https://$host$request_uri;
-    }
-}
-
-# API 独立域名 HTTPS"""
-if old not in text:
-    raise SystemExit("nginx api http redirect patch failed")
-p.write_text(text.replace(old, new, 1))
-PY
-
-nginx -t
-systemctl reload nginx
-
-echo "==> 5. 健康检查"
-curl -sf -o /dev/null -w "api-https:%{http_code}\n" https://api.lingshivip.cn/api/v1/health
-echo "==> api.lingshivip.cn HTTPS 已启用"

deploy/enable-runxian-apex-ssl.sh

@@ -1,59 +0,0 @@
-#!/usr/bin/env bash
-# runxian.top 裸域名申请 Let's Encrypt 并启用 HTTPS
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-DOMAIN=runxian.top
-EMAIL="${CERTBOT_EMAIL:-admin@runxian.top}"
-
-echo "==> 检查 DNS: $DOMAIN"
-ip="$(dig +short "$DOMAIN" A @223.5.5.5 | tail -1)"
-if [[ -z "$ip" ]]; then
-  echo "ERROR: $DOMAIN 无 A 记录，请先在 DNS 添加指向本机公网 IP（当前服务器: $(curl -sf ifconfig.me || echo unknown)）"
-  exit 1
-fi
-echo "  $DOMAIN -> $ip"
-
-mkdir -p /var/www/certbot /var/log/nginx/dukang
-
-# 若尚未有证书，先部署仅 HTTP 的配置以便 ACME 校验
-if [[ ! -f /etc/letsencrypt/live/runxian.top/fullchain.pem ]]; then
-  echo "==> 临时 HTTP 配置（用于 ACME）..."
-  cat > /etc/nginx/conf.d/dukang-runxian-apex.conf <<'EOF'
-server {
-    listen 80;
-    server_name runxian.top;
-    root /opt/dukang-haoke/public;
-    index index.html;
-    location ^~ /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-        default_type "text/plain";
-    }
-    location ~ ^/MP_verify_.*\.txt$ {
-        default_type text/plain;
-        access_log off;
-    }
-    location / {
-        try_files $uri $uri/ =404;
-    }
-}
-EOF
-  nginx -t
-  systemctl reload nginx
-fi
-
-echo "==> 申请证书..."
-certbot certonly --webroot -w /var/www/certbot \
-  --cert-name runxian.top \
-  -d runxian.top \
-  --non-interactive --agree-tos -m "$EMAIL"
-
-echo "==> 切换 HTTPS 配置..."
-install -m 644 "$SCRIPT_DIR/nginx-runxian-apex.conf" /etc/nginx/conf.d/dukang-runxian-apex.conf
-nginx -t
-systemctl reload nginx
-
-echo "==> 验证..."
-code="$(curl -sf -o /dev/null -w '%{http_code}' "https://$DOMAIN/MP_verify_ayPJ4CQqbUcec3jX.txt" || echo fail)"
-echo "  https://$DOMAIN/MP_verify_ayPJ4CQqbUcec3jX.txt -> $code"
-echo "==> runxian.top HTTPS 已启用"

deploy/enable-runxian-dukang-ssl.sh

@@ -1,57 +0,0 @@
-#!/usr/bin/env bash
-# 为杜康 runxian.top 申请 Let's Encrypt 并切换 HTTPS 配置
-# 三端 H5 统一入口 user.runxian.top/{user,shop,partner}/
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-DOMAINS=(
-  user.runxian.top
-  shop.runxian.top
-  partner.runxian.top
-  webadmin.runxian.top
-  dkapi.runxian.top
-)
-
-echo "==> 检查 DNS 解析到本机..."
-for d in "${DOMAINS[@]}"; do
-  ip="$(dig +short "$d" @223.5.5.5 | tail -1)"
-  if [[ -z "$ip" ]]; then
-    echo "ERROR: $d 无 A 记录，请先在 DNS 添加指向本机公网 IP"
-    exit 1
-  fi
-  echo "  $d -> $ip"
-done
-
-mkdir -p /var/www/certbot /var/log/nginx/dukang
-
-echo "==> 申请证书..."
-certbot certonly --webroot -w /var/www/certbot \
-  --cert-name user.runxian.top \
-  -d user.runxian.top \
-  -d shop.runxian.top \
-  -d partner.runxian.top \
-  -d webadmin.runxian.top \
-  -d dkapi.runxian.top \
-  --non-interactive --agree-tos -m admin@runxian.top || {
-  echo "certbot 失败，请确认 DNS 已生效且 80 端口可从公网访问"
-  exit 1
-}
-
-echo "==> 切换 nginx HTTPS 配置..."
-install -m 644 "$SCRIPT_DIR/nginx-runxian-dukang-ssl.conf" /etc/nginx/conf.d/dukang-runxian.conf
-nginx -t
-systemctl reload nginx
-
-echo "==> 验证..."
-for url in \
-  https://user.runxian.top/user/ \
-  https://user.runxian.top/shop/ \
-  https://user.runxian.top/partner/ \
-  https://shop.runxian.top/ \
-  https://webadmin.runxian.top/ \
-  https://dkapi.runxian.top/api/v1/health; do
-  code="$(curl -sf -o /dev/null -w '%{http_code}' "$url" || echo fail)"
-  echo "  $url -> $code"
-done
-
-echo "==> runxian.top 杜康域名 HTTPS 已启用（H5 统一入口 user.runxian.top）"

deploy/nginx-ai-mirror-http.conf

@@ -1,33 +0,0 @@
-map $host $dukang_h5_port {
-    user.ai-mirror.xyz    8091;
-    shop.ai-mirror.xyz    8092;
-    partner.ai-mirror.xyz 8093;
-}
-
-# HTTP — 证书申请期间先提供 HTTP 服务
-server {
-    listen 80;
-    server_name user.ai-mirror.xyz shop.ai-mirror.xyz partner.ai-mirror.xyz;
-
-    location /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-    }
-
-    location /api/ {
-        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;
-    }
-
-    location / {
-        proxy_pass http://127.0.0.1:$dukang_h5_port;
-        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;
-    }
-}

deploy/nginx-ai-mirror.conf

@@ -1,54 +0,0 @@
-# 杜康好客 H5 三端 — ai-mirror.xyz
-# API 内部端口 8090；H5 分别 8091/8092/8093
-
-map $host $dukang_h5_port {
-    user.ai-mirror.xyz    8091;
-    shop.ai-mirror.xyz    8092;
-    partner.ai-mirror.xyz 8093;
-}
-
-# HTTP → HTTPS
-server {
-    listen 80;
-    server_name user.ai-mirror.xyz shop.ai-mirror.xyz partner.ai-mirror.xyz;
-    location /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-    }
-    location / {
-        return 301 https://$host$request_uri;
-    }
-}
-
-server {
-    listen 443 ssl;
-    server_name user.ai-mirror.xyz shop.ai-mirror.xyz partner.ai-mirror.xyz;
-
-    access_log /var/log/nginx/dukang/access.log main;
-    error_log  /var/log/nginx/dukang/error.log warn;
-
-    ssl_certificate     /etc/letsencrypt/live/user.ai-mirror.xyz/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/user.ai-mirror.xyz/privkey.pem;
-    ssl_protocols       TLSv1.2 TLSv1.3;
-    ssl_prefer_server_ciphers on;
-
-    client_max_body_size 20m;
-
-    location /api/ {
-        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 "";
-    }
-
-    location / {
-        proxy_pass http://127.0.0.1:$dukang_h5_port;
-        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;
-    }
-}

deploy/nginx-lingshivip-http.conf

@@ -1,105 +0,0 @@
-# 证书申请期间 — lingshivip.cn HTTP（api HTTPS 证书就绪后换 nginx-lingshivip.conf）
-
-map $host $dukang_lingshi_port {
-    user.lingshivip.cn     8091;
-    shop.lingshivip.cn     8092;
-    partner.lingshivip.cn  8093;
-    admin.lingshivip.cn    8094;
-}
-
-server {
-    listen 80;
-    server_name user.lingshivip.cn shop.lingshivip.cn partner.lingshivip.cn;
-
-    location ^~ /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-        default_type "text/plain";
-    }
-
-    location / {
-        return 301 https://$host$request_uri;
-    }
-}
-
-server {
-    listen 80;
-    server_name api.lingshivip.cn;
-
-    location ^~ /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-        default_type "text/plain";
-    }
-
-    location / {
-        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 "";
-    }
-}
-
-server {
-    listen 80;
-    server_name admin.lingshivip.cn;
-
-    location ^~ /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-        default_type "text/plain";
-    }
-
-    location /api/ {
-        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 "";
-    }
-
-    location / {
-        proxy_pass http://127.0.0.1:8094;
-        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;
-    }
-}
-
-server {
-    listen 443 ssl;
-    server_name user.lingshivip.cn shop.lingshivip.cn partner.lingshivip.cn;
-
-    access_log /var/log/nginx/dukang/lingshi.access.log main;
-    error_log  /var/log/nginx/dukang/lingshi.error.log warn;
-
-    ssl_certificate     /etc/letsencrypt/live/user.lingshivip.cn/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/user.lingshivip.cn/privkey.pem;
-    ssl_protocols       TLSv1.2 TLSv1.3;
-    ssl_prefer_server_ciphers on;
-
-    client_max_body_size 20m;
-
-    location /api/ {
-        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 "";
-    }
-
-    location / {
-        proxy_pass http://127.0.0.1:$dukang_lingshi_port;
-        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;
-    }
-}

deploy/nginx-lingshivip.conf

@@ -1,135 +0,0 @@
-# 杜康好客 — lingshivip.cn 五端 + API
-# API 8090；H5 8091/8092/8093；admin-web 8094
-
-map $host $dukang_lingshi_port {
-    user.lingshivip.cn     8091;
-    shop.lingshivip.cn     8092;
-    partner.lingshivip.cn  8093;
-    admin.lingshivip.cn    8094;
-}
-
-# HTTP → HTTPS（H5 三端）
-server {
-    listen 80;
-    server_name user.lingshivip.cn shop.lingshivip.cn partner.lingshivip.cn;
-
-    location ^~ /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-        default_type "text/plain";
-    }
-
-    location / {
-        return 301 https://$host$request_uri;
-    }
-}
-
-# API：证书就绪前 HTTP 直连；就绪后改走 HTTPS server
-server {
-    listen 80;
-    server_name api.lingshivip.cn;
-
-    location ^~ /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-        default_type "text/plain";
-    }
-
-    location / {
-        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 "";
-    }
-}
-
-# admin 待 DNS + 证书就绪前先走 HTTP
-server {
-    listen 80;
-    server_name admin.lingshivip.cn;
-
-    location ^~ /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-        default_type "text/plain";
-    }
-
-    location /api/ {
-        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 "";
-    }
-
-    location / {
-        proxy_pass http://127.0.0.1:8094;
-        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;
-    }
-}
-
-# API 独立域名 HTTPS（证书：/etc/nginx/ssl/api.lingshivip.cn/）
-server {
-    listen 443 ssl;
-    server_name api.lingshivip.cn;
-
-    access_log /var/log/nginx/dukang/lingshi-api.access.log main;
-    error_log  /var/log/nginx/dukang/lingshi-api.error.log warn;
-
-    ssl_certificate     /etc/nginx/ssl/api.lingshivip.cn/fullchain.cer;
-    ssl_certificate_key /etc/nginx/ssl/api.lingshivip.cn/api.lingshivip.cn.key;
-    ssl_protocols       TLSv1.2 TLSv1.3;
-    ssl_prefer_server_ciphers on;
-
-    client_max_body_size 20m;
-
-    location / {
-        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 "";
-    }
-}
-
-server {
-    listen 443 ssl;
-    server_name user.lingshivip.cn shop.lingshivip.cn partner.lingshivip.cn;
-
-    access_log /var/log/nginx/dukang/lingshi.access.log main;
-    error_log  /var/log/nginx/dukang/lingshi.error.log warn;
-
-    ssl_certificate     /etc/letsencrypt/live/user.lingshivip.cn/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/user.lingshivip.cn/privkey.pem;
-    ssl_protocols       TLSv1.2 TLSv1.3;
-    ssl_prefer_server_ciphers on;
-
-    client_max_body_size 20m;
-
-    location /api/ {
-        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 "";
-    }
-
-    location / {
-        proxy_pass http://127.0.0.1:$dukang_lingshi_port;
-        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;
-    }
-}

deploy/nginx-runxian-apex.conf

@@ -1,53 +0,0 @@
-# runxian.top 裸域名 — 静态公共资源（微信域名校验等）
-# HTTP: 保留 MP_verify + ACME；其余跳转 HTTPS
-# HTTPS: deploy/enable-runxian-apex-ssl.sh 申请证书后启用
-
-server {
-    listen 80;
-    server_name runxian.top;
-
-    access_log /var/log/nginx/dukang/runxian-apex.access.log main;
-    error_log  /var/log/nginx/dukang/runxian-apex.error.log warn;
-
-    root /opt/dukang-haoke/public;
-    index index.html;
-
-    location ^~ /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-        default_type "text/plain";
-    }
-
-    location ~ ^/MP_verify_.*\.txt$ {
-        default_type text/plain;
-        access_log off;
-    }
-
-    location / {
-        return 301 https://$host$request_uri;
-    }
-}
-
-server {
-    listen 443 ssl;
-    server_name runxian.top;
-
-    access_log /var/log/nginx/dukang/runxian-apex.access.log main;
-    error_log  /var/log/nginx/dukang/runxian-apex.error.log warn;
-
-    ssl_certificate     /etc/letsencrypt/live/runxian.top/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/runxian.top/privkey.pem;
-    ssl_protocols       TLSv1.2 TLSv1.3;
-    ssl_prefer_server_ciphers on;
-
-    root /opt/dukang-haoke/public;
-    index index.html;
-
-    location ~ ^/MP_verify_.*\.txt$ {
-        default_type text/plain;
-        access_log off;
-    }
-
-    location / {
-        try_files $uri $uri/ =404;
-    }
-}

deploy/nginx-runxian-dukang-ssl.conf

@@ -1,218 +0,0 @@
-# 杜康好客 — runxian.top HTTPS
-# 执行: deploy/enable-runxian-dukang-ssl.sh
-# 三端 H5 统一入口 user.runxian.top/{user,shop,partner}/
-
-server {
-    listen 80;
-    server_name user.runxian.top shop.runxian.top partner.runxian.top m.runxian.top;
-
-    location ^~ /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-        default_type "text/plain";
-    }
-
-    location / {
-        return 301 https://user.runxian.top$request_uri;
-    }
-}
-
-server {
-    listen 443 ssl;
-    server_name m.runxian.top;
-
-    ssl_certificate     /etc/letsencrypt/live/user.runxian.top/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/user.runxian.top/privkey.pem;
-    ssl_protocols       TLSv1.2 TLSv1.3;
-
-    return 301 https://user.runxian.top$request_uri;
-}
-
-server {
-    listen 443 ssl;
-    server_name user.runxian.top;
-
-    access_log /var/log/nginx/dukang/runxian-h5.access.log main;
-    error_log  /var/log/nginx/dukang/runxian-h5.error.log warn;
-
-    ssl_certificate     /etc/letsencrypt/live/user.runxian.top/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/user.runxian.top/privkey.pem;
-    ssl_protocols       TLSv1.2 TLSv1.3;
-    ssl_prefer_server_ciphers on;
-
-    client_max_body_size 20m;
-
-    location ~ ^/MP_verify_.*\.txt$ {
-        root /opt/dukang-haoke/apps/mini-user/dist;
-        default_type text/plain;
-        access_log off;
-    }
-
-    location /api/ {
-        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 "";
-    }
-
-    location = / {
-        return 302 /user/;
-    }
-
-    # Taro 路由页是 /pages/xxx/index；补全短路径，避免 UniversalRouter 404 白屏
-    location ~ ^/user/pages/([^/]+)/?$ {
-        return 302 /user/pages/$1/index$is_args$args;
-    }
-
-    location /user/ {
-        rewrite ^/user/(.*)$ /$1 break;
-        proxy_pass http://127.0.0.1:8091;
-        proxy_http_version 1.1;
-        # serve 若仍发出绝对 Location:/pages/...，补回 /user 前缀
-        proxy_redirect / /user/;
-        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;
-    }
-
-    location /shop/ {
-        rewrite ^/shop/(.*)$ /$1 break;
-        proxy_pass http://127.0.0.1:8092;
-        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;
-    }
-
-    location /partner/ {
-        rewrite ^/partner/(.*)$ /$1 break;
-        proxy_pass http://127.0.0.1:8093;
-        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;
-    }
-
-    # 旧 C 端根路径书签（无 /user 前缀）→ /user/...
-    location / {
-        return 302 /user$request_uri;
-    }
-}
-
-server {
-    listen 443 ssl;
-    server_name shop.runxian.top;
-
-    ssl_certificate     /etc/letsencrypt/live/user.runxian.top/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/user.runxian.top/privkey.pem;
-    ssl_protocols       TLSv1.2 TLSv1.3;
-
-    return 301 https://user.runxian.top/shop$request_uri;
-}
-
-server {
-    listen 443 ssl;
-    server_name partner.runxian.top;
-
-    ssl_certificate     /etc/letsencrypt/live/user.runxian.top/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/user.runxian.top/privkey.pem;
-    ssl_protocols       TLSv1.2 TLSv1.3;
-
-    return 301 https://user.runxian.top/partner$request_uri;
-}
-
-server {
-    listen 80;
-    server_name dkapi.runxian.top;
-
-    location ^~ /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-        default_type "text/plain";
-    }
-
-    include /opt/dukang-haoke/deploy/nginx-deploy-webhook.conf;
-
-    location / {
-        return 301 https://$host$request_uri;
-    }
-}
-
-server {
-    listen 443 ssl;
-    server_name dkapi.runxian.top;
-
-    access_log /var/log/nginx/dukang/runxian-api.access.log main;
-    error_log  /var/log/nginx/dukang/runxian-api.error.log warn;
-
-    ssl_certificate     /etc/letsencrypt/live/user.runxian.top/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/user.runxian.top/privkey.pem;
-    ssl_protocols       TLSv1.2 TLSv1.3;
-    ssl_prefer_server_ciphers on;
-
-    client_max_body_size 20m;
-
-    include /opt/dukang-haoke/deploy/nginx-deploy-webhook.conf;
-
-    location / {
-        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 "";
-    }
-}
-
-server {
-    listen 80;
-    server_name webadmin.runxian.top;
-
-    location ^~ /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-        default_type "text/plain";
-    }
-
-    location / {
-        return 301 https://$host$request_uri;
-    }
-}
-
-server {
-    listen 443 ssl;
-    server_name webadmin.runxian.top;
-
-    access_log /var/log/nginx/dukang/runxian-admin.access.log main;
-    error_log  /var/log/nginx/dukang/runxian-admin.error.log warn;
-
-    ssl_certificate     /etc/letsencrypt/live/user.runxian.top/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/user.runxian.top/privkey.pem;
-    ssl_protocols       TLSv1.2 TLSv1.3;
-    ssl_prefer_server_ciphers on;
-
-    client_max_body_size 20m;
-
-    location /api/ {
-        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 "";
-    }
-
-    location / {
-        proxy_pass http://127.0.0.1:8094;
-        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;
-    }
-}

deploy/nginx-runxian-dukang.conf

@@ -1,154 +0,0 @@
-# 杜康好客 — runxian.top（HTTP）
-# 三端 H5 统一入口 user.runxian.top/{user,shop,partner}/（微信网页授权单域名）
-# shop/partner 子域名 301 到 user.runxian.top 路径；webadmin → 8094；dkapi → 8090
-
-server {
-    listen 80;
-    server_name user.runxian.top;
-
-    access_log /var/log/nginx/dukang/runxian-h5.access.log main;
-    error_log  /var/log/nginx/dukang/runxian-h5.error.log warn;
-
-    client_max_body_size 20m;
-
-    location ^~ /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-        default_type "text/plain";
-    }
-
-    location ~ ^/MP_verify_.*\.txt$ {
-        root /opt/dukang-haoke/apps/mini-user/dist;
-        default_type text/plain;
-        access_log off;
-    }
-
-    location /api/ {
-        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 "";
-    }
-
-    location = / {
-        return 302 /user/;
-    }
-
-    location ~ ^/user/pages/([^/]+)/?$ {
-        return 302 /user/pages/$1/index$is_args$args;
-    }
-
-    location /user/ {
-        rewrite ^/user/(.*)$ /$1 break;
-        proxy_pass http://127.0.0.1:8091;
-        proxy_http_version 1.1;
-        proxy_redirect / /user/;
-        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;
-    }
-
-    location /shop/ {
-        rewrite ^/shop/(.*)$ /$1 break;
-        proxy_pass http://127.0.0.1:8092;
-        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;
-    }
-
-    location /partner/ {
-        rewrite ^/partner/(.*)$ /$1 break;
-        proxy_pass http://127.0.0.1:8093;
-        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;
-    }
-
-    location / {
-        return 302 /user$request_uri;
-    }
-}
-
-server {
-    listen 80;
-    server_name shop.runxian.top;
-    return 301 http://user.runxian.top/shop$request_uri;
-}
-
-server {
-    listen 80;
-    server_name partner.runxian.top;
-    return 301 http://user.runxian.top/partner$request_uri;
-}
-
-server {
-    listen 80;
-    server_name m.runxian.top;
-    return 301 http://user.runxian.top$request_uri;
-}
-
-server {
-    listen 80;
-    server_name dkapi.runxian.top;
-
-    access_log /var/log/nginx/dukang/runxian-api.access.log main;
-    error_log  /var/log/nginx/dukang/runxian-api.error.log warn;
-
-    client_max_body_size 20m;
-
-    location ^~ /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-        default_type "text/plain";
-    }
-
-    location / {
-        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 "";
-    }
-}
-
-server {
-    listen 80;
-    server_name webadmin.runxian.top;
-
-    access_log /var/log/nginx/dukang/runxian-admin.access.log main;
-    error_log  /var/log/nginx/dukang/runxian-admin.error.log warn;
-
-    client_max_body_size 20m;
-
-    location ^~ /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-        default_type "text/plain";
-    }
-
-    location /api/ {
-        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 "";
-    }
-
-    location / {
-        proxy_pass http://127.0.0.1:8094;
-        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;
-    }
-}

deploy/remote-continue-m-domain.sh

@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-# 续部署：user.runxian.top 统一路径入口 + nginx 切换
-set -euo pipefail
-
-APP_ROOT="${APP_ROOT:-/opt/dukang-haoke}"
-H5_BASE="https://user.runxian.top"
-
-cd "$APP_ROOT"
-
-echo "==> 1. PM2 重启（H5 dist 已含 /user|shop|partner/ 路径）"
-pm2 restart dukang-api dukang-h5-user dukang-h5-shop dukang-h5-partner dukang-admin-web
-pm2 save
-
-echo "==> 2. 安装 nginx HTTPS 配置"
-install -m 644 "$APP_ROOT/deploy/nginx-runxian-dukang-ssl.conf" /etc/nginx/conf.d/dukang-runxian.conf
-nginx -t
-systemctl reload nginx
-
-echo "==> 3. 更新 USER_H5_URL"
-ENV_FILE="$APP_ROOT/server/dukang-api/.env.production"
-if grep -q '^USER_H5_URL=' "$ENV_FILE"; then
-  sed -i "s|^USER_H5_URL=.*|USER_H5_URL=${H5_BASE}/user|" "$ENV_FILE"
-else
-  echo "USER_H5_URL=${H5_BASE}/user" >> "$ENV_FILE"
-fi
-pm2 restart dukang-api
-
-echo "==> 4. 验证"
-for url in \
-  "${H5_BASE}/user/" \
-  "${H5_BASE}/shop/" \
-  "${H5_BASE}/partner/" \
-  "https://shop.runxian.top/" \
-  "https://dkapi.runxian.top/api/v1/health"; do
-  code="$(curl -sk -o /dev/null -w '%{http_code}' "$url" || echo fail)"
-  echo "  $url -> $code"
-done
-
-echo "==> user.runxian.top 统一部署完成"

deploy/remote-continue.sh

@@ -1,57 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-APP_ROOT="/opt/dukang-haoke"
-DEPLOY_DIR="$APP_ROOT/deploy"
-
-echo "==> install api deps only"
-cd "$APP_ROOT"
-export NODE_OPTIONS="--max-old-space-size=1024"
-pnpm install --filter @dukang/api... --filter @dukang/domain --filter @dukang/shared-types
-
-echo "==> env"
-cat > "$APP_ROOT/server/dukang-api/.env.production" <<'ENV'
-DATABASE_URL="mysql://dukang:Dukang2026!@localhost:3306/dukang_haoke"
-REDIS_URL="redis://localhost:6379"
-JWT_SECRET="gky4CNZgwdrYoDIDy4AWBiJRa4WX2ax8STe3TEG93Ht"
-JWT_EXPIRES_IN="7d"
-PORT=8090
-MOCK_SMS=true
-MOCK_SMS_CODE=123456
-MOCK_PAY=true
-MOCK_DELIVERY_AUTO=true
-AUTO_APPROVE_STORE=true
-ENV
-
-echo "==> prisma"
-cd "$APP_ROOT/server/dukang-api"
-pnpm prisma:generate
-npx prisma db push --accept-data-loss
-pnpm prisma:seed
-
-echo "==> serve"
-npm install -g serve
-
-echo "==> pm2"
-mkdir -p /var/log/nginx/dukang /var/www/certbot
-pm2 delete dukang-api dukang-h5-user dukang-h5-shop dukang-h5-partner 2>/dev/null || true
-pm2 start "$DEPLOY_DIR/ecosystem.config.cjs"
-pm2 save
-
-echo "==> ssl"
-if [ ! -f /etc/letsencrypt/live/user.ai-mirror.xyz/fullchain.pem ]; then
-  certbot certonly --webroot -w /var/www/certbot \
-    -d user.ai-mirror.xyz -d shop.ai-mirror.xyz -d partner.ai-mirror.xyz \
-    --non-interactive --agree-tos -m admin@ai-mirror.xyz
-fi
-
-echo "==> nginx"
-cp "$DEPLOY_DIR/nginx-ai-mirror.conf" /etc/nginx/conf.d/dukang-ai-mirror.conf
-nginx -t
-systemctl reload nginx
-
-echo "==> DONE"
-pm2 list
-ss -tlnp | grep -E '809[0-3]' || true
-curl -s -o /dev/null -w "user:%{http_code}\n" http://127.0.0.1:8091/
-curl -s -o /dev/null -w "api:%{http_code}\n" http://127.0.0.1:8090/api/v1/health 2>/dev/null || curl -s -o /dev/null -w "api:%{http_code}\n" http://127.0.0.1:8090/

deploy/remote-setup.sh

@@ -1,79 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-APP_ROOT="/opt/dukang-haoke"
-DEPLOY_DIR="$(cd "$(dirname "$0")" && pwd)"
-
-echo "==> 1. 安装 MySQL（如未安装）"
-if ! command -v mysqld &>/dev/null; then
-  dnf install -y mysql-server
-  systemctl enable --now mysqld
-  sleep 3
-fi
-
-echo "==> 2. 配置 MySQL 数据库"
-mysql -uroot -e "CREATE DATABASE IF NOT EXISTS dukang_haoke CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;" 2>/dev/null || true
-mysql -uroot -e "CREATE USER IF NOT EXISTS 'dukang'@'localhost' IDENTIFIED BY 'Dukang2026!';" 2>/dev/null || \
-  mysql -uroot -e "ALTER USER 'dukang'@'localhost' IDENTIFIED BY 'Dukang2026!';" 2>/dev/null || true
-mysql -uroot -e "GRANT ALL PRIVILEGES ON dukang_haoke.* TO 'dukang'@'localhost'; FLUSH PRIVILEGES;" 2>/dev/null || true
-
-echo "==> 3. 启用 pnpm"
-corepack enable
-corepack prepare pnpm@11.2.2 --activate
-
-echo "==> 4. 安装依赖并构建"
-cd "$APP_ROOT"
-pnpm install --frozen-lockfile 2>/dev/null || pnpm install
-pnpm build
-
-echo "==> 5. 写入 API 生产环境变量"
-cat > "$APP_ROOT/server/dukang-api/.env.production" <<'ENV'
-DATABASE_URL="mysql://dukang:Dukang2026!@localhost:3306/dukang_haoke"
-REDIS_URL="redis://localhost:6379"
-JWT_SECRET="gky4CNZgwdrYoDIDy4AWBiJRa4WX2ax8STe3TEG93Ht"
-JWT_EXPIRES_IN="7d"
-PORT=8090
-MOCK_SMS=true
-MOCK_SMS_CODE=123456
-MOCK_PAY=true
-MOCK_DELIVERY_AUTO=true
-AUTO_APPROVE_STORE=true
-ENV
-
-echo "==> 6. 初始化数据库"
-cd "$APP_ROOT/server/dukang-api"
-pnpm prisma:generate
-npx prisma db push --accept-data-loss
-pnpm prisma:seed
-
-echo "==> 7. 安装 serve（静态服务）"
-npm install -g serve
-
-echo "==> 8. 启动 PM2 进程"
-mkdir -p /var/log/nginx/dukang /var/www/certbot
-pm2 delete dukang-api dukang-h5-user dukang-h5-shop dukang-h5-partner 2>/dev/null || true
-pm2 start "$DEPLOY_DIR/ecosystem.config.cjs"
-pm2 save
-
-echo "==> 9. 申请 SSL 证书"
-if [ ! -f /etc/letsencrypt/live/user.ai-mirror.xyz/fullchain.pem ]; then
-  certbot certonly --webroot -w /var/www/certbot \
-    -d user.ai-mirror.xyz \
-    -d shop.ai-mirror.xyz \
-    -d partner.ai-mirror.xyz \
-    --non-interactive --agree-tos -m admin@ai-mirror.xyz || \
-  certbot certonly --nginx \
-    -d user.ai-mirror.xyz \
-    -d shop.ai-mirror.xyz \
-    -d partner.ai-mirror.xyz \
-    --non-interactive --agree-tos -m admin@ai-mirror.xyz
-fi
-
-echo "==> 10. 配置 Nginx"
-cp "$DEPLOY_DIR/nginx-ai-mirror.conf" /etc/nginx/conf.d/dukang-ai-mirror.conf
-nginx -t
-systemctl reload nginx
-
-echo "==> 部署完成"
-pm2 list
-ss -tlnp | grep -E '809[0-3]' || true

deploy/server.env.machine

@@ -1,4 +0,0 @@
-# 服务器机器相关（可合并到 .env.production 的参考项）
-PORT=8090
-DATABASE_URL="mysql://dukang:Dukang2026!@localhost:3306/dukang_haoke"
-REDIS_URL="redis://localhost:6379"

deploy/setup-webhook.sh

@@ -2,7 +2,7 @@
 # 在服务器上执行：安装 Webhook 自动发版
 set -euo pipefail
 
-APP_ROOT="${APP_ROOT:-/opt/dukang-haoke}"
+APP_ROOT="${APP_ROOT:-/opt/dukang}"
 DEPLOY_DIR="$APP_ROOT/deploy"
 ENV_FILE="$DEPLOY_DIR/auto-release.env"
 LOG_DIR="/var/log/dukang"
@@ -30,28 +30,14 @@ HOOK_CONF="$DEPLOY_DIR/nginx-deploy-webhook.conf"
 rm -f /etc/nginx/conf.d/dukang-deploy-webhook.conf
 
 MARKER="include $HOOK_CONF;"
-for conf in \
-  /etc/nginx/sites-available/dukang \
-  /etc/nginx/conf.d/dukang-runxian.conf \
-  /etc/nginx/conf.d/dukang-runxian-ssl.conf
-do
-  if [[ ! -f "$conf" ]]; then
-    continue
+NGINX_SITE="/etc/nginx/sites-available/dukang"
+if [[ -f "$NGINX_SITE" ]]; then
+  sed -i '\|include /etc/nginx/conf.d/dukang-deploy-webhook.conf;|d' "$NGINX_SITE"
+  if grep -q 'server_name api.dukanghaoke.com' "$NGINX_SITE" && ! grep -qF "$MARKER" "$NGINX_SITE"; then
+    sed -i "/server_name api.dukanghaoke.com;/a\\    $MARKER" "$NGINX_SITE"
+    echo "    已 patch $NGINX_SITE (api.dukanghaoke.com)"
   fi
-  # 清理旧错误 include
-  sed -i '\|include /etc/nginx/conf.d/dukang-deploy-webhook.conf;|d' "$conf"
-  if grep -q 'server_name api.dukanghaoke.com' "$conf"; then
-    if ! grep -qF "$MARKER" "$conf"; then
-      sed -i "/server_name api.dukanghaoke.com;/a\\    $MARKER" "$conf"
-      echo "    已 patch $conf (api.dukanghaoke.com)"
-    fi
-  elif grep -q 'server_name dkapi.runxian.top' "$conf"; then
-    if ! grep -qF "$MARKER" "$conf"; then
-      sed -i "/server_name dkapi.runxian.top;/a\\    $MARKER" "$conf"
-      echo "    已 patch $conf (dkapi.runxian.top)"
-    fi
-  fi
-done
+fi
 
 nginx -t
 systemctl reload nginx

docs/杜康好客-v3-PRD.md

@@ -23,6 +23,9 @@
 | 3.4.15 | 08-07 | mini-user 门店列表卡片；HQ 门店照片替换/删除；套餐多图上限 20 | [`v3.4.15`](./杜康好客-v3.4.15-mini-user门店列表优化.md) |
 | 3.4.16 | 08-09 | 联系电话分离；取消自动 ST；套餐 UI；合伙人列表/入驻客服门槛；HQ 门店列表表格 | [`v3.4.16`](./杜康好客-v3.4.16-门店联系电话与体验优化.md) |
 | 3.5.3 | 08-20 | 门店照片/企微审核/分享；核销金额序列化与提现补建；测试流水计结算；核销浮动提示；权益金额门店图标 | [`v3.5.3`](./杜康好客-v3.5.3-开发文档.md) |
+| 3.5.4 | 08-21 | 商品 SPU+SKU 规格；DK 码/独立 69 码/规格主图；下单兼容回落；发票品类；权益文案与门店详情/收银台 UI；客户端版本号 | [`v3.5.4`](./杜康好客-v3.5.4-开发文档.md) |
+| 3.5.5 | 08-23 | HQ 订单监控导出 Excel/PDF + 列表页布局优化 | [`v3.5.5`](./杜康好客-v3.5.5-开发文档.md) |
+| 3.5.6 | 08-23 | HQ 任务导出；核销/财务银行信息；工单图片入任务；运营去调试；门店审核全屏 | [`v3.5.6`](./杜康好客-v3.5.6-开发文档.md) |
 
 ---
 
@@ -68,6 +71,13 @@
 
 `待付款 → 已付款 → 已完成`；30min 未付取消。同城自动推小飞侠（有仓+API）；**≥10箱(60瓶)** 大单待 HQ 确认。跨城总部物流到付。现场提货支付即完成。
 
+**HQ 订单导出**（`admin-web` 订单监控）：
+
+- 支持按筛选（下单日期、状态、类型、城市、配送、收货手机等）或勾选订单导出
+- 格式：Excel（`.xlsx`）/ PDF（`.pdf`）
+- 单次上限 5000 条；按筛选且未指定日期时默认近 30 天
+- 权限：`orders`；操作审计 `ORDER_EXPORT`
+
 ### 3.3 佣金与结算
 
 | 类型 | 默认 | 释放 |
@@ -80,6 +90,13 @@
 **FIN-001~003**：白名单未出账提现 · 单店日限 ¥5000 · T+0 审完预警。  
 合伙人 **T+30** 独立月账/打款。
 
+**HQ 财务打款信息**（`admin-web` 财务四页，v3.5.6）：
+
+- 门店/合伙人/酒厂/物流账单列表、详情、导出展示收款账户（户名、账号、开户行）
+- 确认打款时可填写打款凭证号（`paymentRef`），已打款后在详情与导出中展示
+- 门店账单统一列表：T+1 终态「已打款」、手动提现终态「已结算」（均为 `PAID`，文案区分业务类型）
+- 核销详情展示核销门店主账户收款信息
+
 ### 3.4~3.8 Wave 能力
 
 - **3.4** 门店一号多店、主账号、店员子账号(W2)
@@ -93,7 +110,7 @@
 | § | 主题 | 文档 |
 |---|------|------|
 | 3.9 | 门店套餐 ≤10 条、独立审核 | v3.4.10 |
-| 3.10 | 开发计划/任务/版本/技术支持联动 | v3.4.11 |
+| 3.10 | 开发计划/任务/版本/技术支持联动；任务导出 md/docx/xlsx/pdf；任务附件 | v3.4.11 / v3.5.6 |
 | 3.11 | 企微智能机器人 + 消息推送 Webhook | v3.4.11 |
 | 3.12 | **登录手机号 ≠ 对外联系电话**；体验优化 | v3.4.16 |
 

docs/杜康好客-v3-现状对照.md

@@ -9,7 +9,7 @@
 |------|------|
 | 主链路 | 登录→下单支付→权益→扫码核销→payout→HQ 打款 **可跑通** |
 | C 端 | `mini-user` 小程序 + h5-user；v3.4.13 版本门控/门店/物流已上 |
-| 近期版本 | … · v3.4.16 · **v3.5.3 门店照片/企微审核/分享 + 核销金额/提现补修 + 权益图标** |
+| 近期版本 | … · v3.5.3 · **v3.5.4 商品规格 SPU+SKU + 发票品类 + 权益/门店详情 UI** |
 | 冒烟 | `scripts/smoke-v3.mjs` 窄路径 ≠ 全量 ACC |
 | REQ 明细 | PRD §4 + `.cursor/skills/dukang-v3/reference-req-index.md` |
 
@@ -32,7 +32,7 @@
 | **mini-user** | 购酒/权益/核销/门店/物流/版本门控 | 规则弹窗、发票、四类型工单、问卷 |
 | **h5-shop** | 扫码核销、记录、营业、iOS 扫码 OAuth | 手机号核销、提现、子账号、弱网兜底 |
 | **h5-partner** | 子账号、拓店、订单/账单、套餐 | 试核销100、负责人复核、代下单 |
-| **admin-web** | 商品/开城/门店/订单/权益/核销/结算/推广码 metrics/开发计划/技术支持 | 完整 SOP 审核 UI、发票、热力图 |
+| **admin-web** | 商品/开城/门店/订单（含 Excel/PDF 导出）/权益/核销/结算/推广码 metrics/开发计划/技术支持 | 完整 SOP 审核 UI、发票、热力图 |
 | **后端** | 主模块、支付、权益、核销、payout、Courier 适配 | 30min 取消 job、部分 Wave3 |
 
 ## 3. 场景 SC-01~09
@@ -57,10 +57,16 @@
 | 3.4.13 | [`体验优化`](./杜康好客-v3.4.13-体验优化开发文档.md) | ✅ 生产 |
 | 3.4.14 | [`mini-user 门店体验 + 小程序可配置 + 测试白名单`](./杜康好客-v3.4.14-mini-user门店体验开发文档.md) | ✅ 生产 |
 | 3.4.15 | [`mini-user 门店列表 + HQ 照片/套餐多图`](./杜康好客-v3.4.15-mini-user门店列表优化.md) | ✅ 生产 |
-| 3.5.3 | [`门店照片/企微审核/分享 + 核销金额与提现补修`](./杜康好客-v3.5.3-开发文档.md) | 🔶 开发中 |
+| 3.5.3 | [`门店照片/企微审核/分享 + 核销金额与提现补修`](./杜康好客-v3.5.3-开发文档.md) | ✅ 生产 |
+| 3.5.4 | [`商品规格 SPU+SKU + 发票/文案 UI`](./杜康好客-v3.5.4-开发文档.md) | ✅ 生产（weapp 版本号需单独上传） |
+| 3.5.5 | [`HQ 订单导出 + 订单监控页优化`](./杜康好客-v3.5.5-开发文档.md) | 🔶 开发完成，待发版 |
+| 3.5.6 | [`HQ 任务导出/财务银行信息/工单图片/运营去调试/审核全屏`](./杜康好客-v3.5.6-开发文档.md) | ✅ 已交付 |
 
 | 日期 | 说明 |
 |------|------|
+| 2026-08-23 | v3.5.6：开发计划任务导出；核销/财务银行信息与打款凭证；工单图片入任务；运营去调试；门店审核全屏 |
+| 2026-08-23 | HQ 订单监控：筛选/勾选导出 Excel（xlsx）与 PDF；`POST /admin/orders/export` |
+| 2026-08-21 | v3.5.4 发生产：规格表/回填 SKU/DK 码/主图列/发票品类；H5+API 200 |
 | 2026-08-20 | v3.5.3 增补：Decimal 序列化/提现补建、测试流水计结算、核销浮动提示、好客权益金额图标 |
 | 2026-08-08 | v3.4.14 / v3.4.15 已发生产，更新状态 |
 | 2026-08-07 | v3.4.14 增补统一测试白名单（限测可见 / Mock 旁路；测试流水计入结算） |

docs/杜康好客-v3.5.4-开发文档.md

@@ -1,62 +1,145 @@
-# 杜康好客 · v3.5.4 商品规格（SPU + SKU）
+# 杜康好客 · v3.5.4 开发文档
 
 > **2026-08-21** · mini-user / admin-web / h5-partner / API / Prisma  
-> 目标：商品详情页内可选销售规格；价格、权益、69 码、履约、上下架按 SKU；箱装按瓶当量起购与物流。
+> **生产 commit**：`5fdddae`（规格主图与门店使用规则合并入 `main`）及后续客户端版本号 `3.5.4`  
+> **主题**：商品规格（SPU + SKU）上线 + 同批次发票 / 文案 / 门店详情体验
 
-## 范围
+---
 
-| # | 项 | 交付 |
+## 1. 版本目标
+
+1. 商品由单规格升级为 **SPU + 多 SKU**：价格、权益、69 码、履约、上下架、主图按规格。
+2. 箱装按 **瓶当量** 起购与物流，不改城市起购阈值口径。
+3. **旧客户端兼容**：不传 `skuId` 仍可下单；无 SKU 回落 SPU，禁止「商品暂无可售规格」误伤。
+4. 同批次补齐：发票品类、权益文案、收银台 logo、门店详情「使用规则」、C 端版本号。
+
+**不做**：SKU 库存、把现有酒祖 10/15/20 合并为一个 SPU。
+
+---
+
+## 2. 功能清单（完整）
+
+### 2.1 商品规格（核心）
+
+| # | 模块 | 交付说明 |
+|---|------|----------|
+| 1 | 数据模型 | `common_product_item` 作 SPU；新增 `spec_attr` / `spec_value` / `sku` / `sku_spec`；订单快照 `sku_id` / `sale_unit` / `bottles_per_unit` |
+| 2 | 存量迁移 | 每商品默认 1 个瓶装 SKU；SQL `migrate-product-sku-v354.sql`；脚本 `backfill-product-skus.ts` |
+| 3 | Catalog | 列表 `specEnabled`/`saleUnit`；详情 `specAttrs`/`skus`/`defaultSkuId`；旧字段拍平保留 |
+| 4 | Trade | preview/create 可选 `skuId`；有可售 SKU → 默认/唯一；**0 可售 → 回落 SPU**；订单 `sku_id` 可空 |
+| 5 | Domain | 起购/大单/物流按 `quantity × bottlesPerUnit` 瓶当量 |
+| 6 | Admin | `PUT .../specs`、`PUT .../skus`；抽屉加宽；「填写」弹窗；规格轴 + SKU 矩阵 |
+| 7 | mini-user | 详情规格 chips；确认页带 `skuId`；箱装数量文案；选规格切主图 |
+| 8 | 代下单 | HQ / 合伙人可选规格 SKU |
+
+### 2.2 SKU 码与 69 码
+
+| # | 项 | 说明 |
 |---|----|------|
-| 1 | 数据模型 | `common_product_item` 升级为 SPU；新增 `spec_attr` / `spec_value` / `sku` / `sku_spec`；订单快照 `sku_id` / `sale_unit` / `bottles_per_unit` |
-| 2 | 存量迁移 | 每商品 1 个默认瓶装 SKU；SQL：`prisma/migrate-product-sku-v354.sql`；脚本：`prisma/backfill-product-skus.ts` |
-| 3 | Catalog | 列表附加 `specEnabled`/`saleUnit`；详情附加 `specAttrs`/`skus`/`defaultSkuId`；旧字段拍平保留 |
-| 4 | Trade | preview/create 可选 `skuId`；单可售 SKU 自动回落；起购按瓶当量 |
-| 5 | Admin | `PUT /admin/products/:id/specs`、`PUT .../skus`；商品抽屉「规格与 SKU」 |
-| 6 | mini-user | 详情规格 chips；确认页带 `skuId`；箱装数量文案 |
-| 7 | 代下单 | HQ / 合伙人可选规格 SKU |
-| 8 | 权益文案 | 「好客权益券」→「好客权益」；首页角标「享{amount}好客权益」（去掉门店 icon） |
+| 9 | SKU 码 | 系统生成 `DK` + 6 位数字，后台不可手填；脚本 `rewrite-sku-codes-dk.ts` 改存量 |
+| 10 | 69 码 | **每规格独立**；同商品内 + 跨商品唯一；不可与其它 SKU 冲突 |
 
-**不做**：SKU 规格图、库存、把现有酒祖 10/15/20 合并为一个 SPU。
+### 2.3 规格主图
 
-## 兼容规则（线上）
+| # | 项 | 说明 |
+|---|----|------|
+| 11 | DB | `common_product_sku.image_url`（`migrate-sku-image.sql`） |
+| 12 | Admin | 弹窗可为每 SKU 上传主图 |
+| 13 | C 端 | 选规格优先 SKU 主图，空则回落商品封面 |
 
-- 不改 `/api/v1` 前缀；**只增字段，不删旧字段语义**。
-- 旧客户端不传 `skuId`：若该 SPU **恰好 1 个可售 SKU** → 自动使用（现网行为）；多个可售 → `400 请选择规格`。
-- 旧 admin `PUT /admin/products/:id` 不传规格时：仅同步**唯一**默认 SKU（多规格时不同步，防误改）。
-- SPU 上 `sku_code` / `barcode_69` 去掉唯一约束，唯一下沉到 `common_product_sku`；SPU 列保留为默认 SKU 冗余。
+### 2.4 发票（同批次）
 
-## 发版顺序
+| # | 项 | 说明 |
+|---|----|------|
+| 14 | 品类 | `user_invoice.invoice_category`：`LIQUOR` 酒水类 / `CATERING` 餐饮类 |
+| 15 | C 端申请 | 票种写死「增值税普通发票」；类型选酒水/餐饮；备注写入申请 |
+| 16 | 抬头 | 必填项打 `*`；强调邮箱必填 |
+| 17 | Admin | 发票列表展示品类；专票仍可走后台 |
 
-1. API + DB 迁移（每商品仅默认 SKU）。**此时不要给任何商品加第二 SKU。**
-2. 发布新 mini-user + admin 规格页 + 代下单 SKU 选择。
-3. 运营再配置「单瓶 / 整箱」等第二规格。
+### 2.5 文案与 UI（同批次）
 
-## 起购与物流
+| # | 位置 | 变更 |
+|---|------|------|
+| 18 | 全局权益文案 | 「好客权益券」→「好客权益」 |
+| 19 | 首页角标 | 「享{amount}好客权益」，去掉门店 icon |
+| 20 | 商品详情 | 规格区与「好客权益」说明加大间距 |
+| 21 | 待支付/收银台 | 顶部 logo 用 `logo2.png`（杜康印章） |
+| 22 | 门店详情 | 「使用规则」红色，置于「门店详情」上方；详情正文限高可滚动 |
+| 23 | 客户端版本号 | `package.json` + `client-version.ts` → **3.5.4**（「我的」页展示） |
+
+---
+
+## 3. 兼容规则（线上）
+
+- 不改 `/api/v1`；**只增字段，不删旧字段语义**。
+- 旧客户端不传 `skuId`：
+  - ≥1 个可售 SKU → 默认（或第一个）可售 SKU
+  - **0 个可售 SKU → 回落 SPU，照常下单**
+- 新客户端传 `skuId` → 按该 SKU 校验。
+- 旧 admin 不传规格：仅同步**唯一**默认 SKU；不覆盖已生成的 DK 码。
+- SPU 上 `sku_code` / `barcode_69` 唯一约束下沉到 SKU；SPU 列保留冗余。
+
+---
+
+## 4. 发版与生产执行记录
+
+按序在目标库执行（先测后产）。本机脚本只打本地 `.env`。
+
+| 步骤 | 动作 | 生产状态（2026-08-21） |
+|------|------|------------------------|
+| 1 | `migrate-product-sku-v354.sql` / Prisma sync | ✅ `db push` 已对齐 |
+| 2 | `backfill-product-skus.ts` | ✅ 回填 9 个默认 SKU（扫 10 商品） |
+| 3 | `migrate-sku-image.sql` / schema `image_url` | ✅ |
+| 4 | `rewrite-sku-codes-dk.ts` | ✅ 13 条均已 DK，改写 0 |
+| 5 | `migrate-invoice-category.sql` | ✅ schema 已含 |
+| 6 | 发 API + mini-user H5 + admin | ✅ `mini-user 200` / `api 200` |
+| 7 | 微信小程序 weapp 上传 | ⚠️ 需单独上传后「我的」页才见 v3.5.4 |
+
+运营注意：新包上线前**不要**给商品加第二规格；上线后再配「单瓶 / 整箱」。
+
+---
+
+## 5. 起购与物流
 
 - `bottleQty = quantity × bottlesPerUnit`
-- 城市起购阈值仍是瓶；箱装 SKU（`bottlesPerUnit=6`）数量 1 即可过同城 2 / 跨城 6。
-- 大单拦截、承运商 `goodsNum` 使用瓶当量。
+- 城市起购仍按瓶；箱装（`bottlesPerUnit=6`）数量 1 即可过同城 2 / 跨城 6
+- 大单拦截、承运商 `goodsNum` 用瓶当量
 
-## 关键表摘要
+---
+
+## 6. 关键表 / 字段摘要
 
 - `common_product_spec_attr` / `common_product_spec_value`
-- `common_product_sku`（`sale_unit`=`BOTTLE|BOX`，`bottles_per_unit`）
+- `common_product_sku`（`sale_unit`、`bottles_per_unit`、`image_url`）
 - `common_product_sku_spec`
 - `user_order.sku_id` / `sale_unit` / `bottles_per_unit`
+- `user_invoice.invoice_category`
 
-## 权益文案（mini-user）
+---
 
-| 位置 | 变更 |
-|------|------|
-| 门店详情等 | 「好客权益券」→「好客权益」（如「好客权益使用规则」） |
-| 首页商品角标 `CouponBadge` | 由「享 + 门店 icon + 金额 + 好客权益」改为纯文案 **「享{amount}好客权益」** |
+## 7. 关键路径（便于排查）
 
-其它页 `BenefitFigure`（我的/权益/核销等）仍保留门店核销图标，仅首页角标去 icon。
+| 域 | 路径 |
+|----|------|
+| Prisma / 脚本 | `server/dukang-api/prisma/migrate-product-sku-v354.sql`、`backfill-product-skus.ts`、`rewrite-sku-codes-dk.ts`、`migrate-sku-image.sql`、`migrate-invoice-category.sql` |
+| 规格工具 | `server/.../catalog/product-sku.util.ts` |
+| Admin 规格 | `apps/admin-web/src/components/ProductSpecsEditor.tsx` |
+| C 端详情 | `apps/mini-user/src/pages/product-detail/` |
+| 版本号 | `apps/mini-user/src/lib/client-version.ts` |
+| 门店详情 | `apps/mini-user/src/pages/store-detail/` |
+| 发票 | `apps/mini-user/src/pages/invoice-apply/`、`invoice-titles/` |
 
-## 验收
+---
 
-- [ ] 未配规格：旧小程序/H5/代下单路径与现网一致
-- [ ] 多规格：详情选规格后价格/权益/履约变化；漏选下单 400
-- [ ] 整箱 SKU：数量 1 过起购；订单快照 `bottles_per_unit=6`
-- [ ] `GET /catalog/products/:id` 仍含 `id/name/price/spec/skuCode/...`
-- [ ] 小程序无「好客权益券」字样；首页角标为「享{金额}好客权益」且无门店 icon
+## 8. 验收清单
+
+- [ ] 未配规格：旧端下单与现网一致（无 SKU 也能下）
+- [ ] 多规格：选规格后价格/权益/履约/主图变化；漏选 400
+- [ ] 整箱：数量 1 过起购；订单 `bottles_per_unit=6`
+- [ ] 详情 API 仍含 `id/name/price/spec/skuCode/...`
+- [ ] 后台 SKU 码 DK 开头不可手填；每规格独立 69 码与主图
+- [ ] 无「好客权益券」；首页角标「享{金额}好客权益」无门店 icon
+- [ ] 门店详情「使用规则」红色且在详情上方；详情超长可滚
+- [ ] 待支付页为 logo2 印章
+- [ ] 发票：普票固定 + 酒水/餐饮品类 + 邮箱必填
+- [ ] 「我的」页版本 **杜康好客 v3.5.4**（需 weapp 新包）

docs/杜康好客-v3.5.5-开发文档.md

@@ -0,0 +1,170 @@
+# 杜康好客 · v3.5.5 开发文档
+
+> **2026-08-23** · admin-web / API  
+> **主题**：HQ 订单监控导出（Excel / PDF）+ 订单列表页布局优化
+
+---
+
+## 1. 版本目标
+
+1. 总部 **订单监控** 支持按筛选或勾选导出 **Excel（.xlsx）** / **PDF（.pdf）**。
+2. 导出内容聚焦运营履约：**商品明细、收货信息、好客权益摘要**；次要字段从列表与导出列中精简。
+3. **订单列表页** 筛选区改为网格布局，支持日期快捷选择；导出、查询、重置、批量删除同一操作行。
+4. 修复现场取货订单地址展示为「现场现场取货现场取货」的问题。
+
+**不做**：C 端 / 合伙人 / 门店端改动；无 Prisma 迁移。
+
+---
+
+## 2. 功能清单
+
+### 2.1 HQ 订单导出（核心）
+
+| # | 模块 | 交付说明 |
+|---|------|----------|
+| 1 | API | `POST /api/v1/admin/orders/export` — 生成文件，响应 `{ filename, mimeType, contentBase64, count }` |
+| 2 | 预览 | `POST /api/v1/admin/orders/export/preview` — 返回 `{ count, max, exceeds }`（上限 5000） |
+| 3 | 导出范围 | `scope=filter` 按当前筛选；`scope=selected` 仅导出勾选 `ids` |
+| 4 | 格式 | `format=xlsx`（exceljs）/ `format=pdf`（pdfkit，横向 A4） |
+| 5 | 权限 | `HqAuthGuard` + `orders`；操作审计 `ORDER_EXPORT` |
+| 6 | 筛选复用 | `buildOrderWhere()` 与列表查询共用；新增 `deliveryType` 筛选 |
+
+**导出列**（11 列）：
+
+订单号、下单时间、状态、商品、规格、数量、实付、好客权益、收货人、手机、收货地址。
+
+好客权益列：有权益券时 `总额¥X / 已用¥Y / 余¥Z`；否则回落订单 `benefitAmount`。
+
+### 2.2 订单列表页（admin-web）
+
+| # | 项 | 说明 |
+|---|----|------|
+| 7 | 筛选布局 | 网格表单：下单日期、状态、类型、配送、城市、收货手机；大单拦截 / 过滤测试 |
+| 8 | 日期快捷 | 当日、当周（周一至周日）、当月、当季、当年 |
+| 9 | 列表列 | 商品（含规格/数量/标签）、状态+实付、好客权益、收货信息、下单时间、操作 |
+| 10 | 勾选导出 | 列表常驻勾选；左侧 Excel/PDF +「导出已勾选」「导出全部筛选」 |
+| 11 | 操作行 | 右侧同一行：查询、重置、批量删除（有权限时） |
+| 12 | 现场取货 | 收货地址识别 `ON_SITE_PICKUP` 或省市区占位后，统一显示「现场取货」 |
+
+### 2.3 列表数据增强
+
+| # | 项 | 说明 |
+|---|----|------|
+| 13 | 权益关联 | `GET /admin/orders` include `benefitCoupon`（券号、总额/已用/余额、状态） |
+| 14 | 收货字段 | `AdminOrderRow` 增加省市区、地址、`benefitAmount`、`benefitCoupon` 类型 |
+
+---
+
+## 3. API 契约
+
+### 3.1 导出请求体 `AdminOrdersExportDto`
+
+```json
+{
+  "scope": "filter",
+  "format": "xlsx",
+  "ids": ["123"],
+  "status": "PENDING_SHIP",
+  "orderType": "NORMAL",
+  "cityId": "1",
+  "receiverPhone": "138",
+  "deliveryType": "LOCAL",
+  "fulfillmentHold": true,
+  "excludeTest": true,
+  "createdFrom": "2026-08-01",
+  "createdTo": "2026-08-23"
+}
+```
+
+| 字段 | 说明 |
+|------|------|
+| `scope` | `filter` \| `selected`（勾选时仅传 `ids`，忽略其它筛选） |
+| `format` | `xlsx` \| `pdf` |
+| `createdFrom` / `createdTo` | 按筛选导出且均未填时，服务端默认近 30 天 |
+
+### 3.2 错误码
+
+| 场景 | HTTP | message |
+|------|------|---------|
+| 超过 5000 条 | 400 | 超过 5000 条，请缩小日期或筛选条件 |
+| 无数据 | 400 | 没有可导出的订单 |
+| 勾选为空 | 400 | 请先勾选要导出的订单 |
+| PDF 无字体 | 500 | 未找到可用于 PDF 的中文字体… |
+
+### 3.3 列表查询增量
+
+`GET /admin/orders` 查询参数新增（与导出筛选一致）：
+
+- `deliveryType`：`LOCAL` \| `CROSS_CITY` \| `ON_SITE_PICKUP`
+- `createdFrom` / `createdTo`：下单日期（已有 DTO，本版接 UI）
+
+---
+
+## 4. 依赖与部署
+
+### 4.1 新增 npm 依赖（仅 API）
+
+- `exceljs` — xlsx 生成
+- `pdfkit` + `@types/pdfkit` — pdf 生成
+
+### 4.2 PDF 中文字体
+
+路径：`server/dukang-api/assets/fonts/`（见 `README.md`）。
+
+解析顺序：
+
+1. 环境变量 `EXPORT_PDF_FONT_PATH`
+2. `assets/fonts/NotoSansSC-Regular.otf` / `simhei.ttf` / `msyh.ttc`
+3. Linux 系统 Noto CJK
+4. Windows 系统字体（开发机）
+
+> 字体二进制已加入 `.gitignore`；生产部署需放置字体或安装 `fonts-noto-cjk`。
+
+### 4.3 发版步骤
+
+| 步骤 | 动作 |
+|------|------|
+| 1 | `pnpm install`（根目录，拉取 exceljs/pdfkit） |
+| 2 | 确认 `server/dukang-api/assets/fonts/` 有中文字体（PDF 必需） |
+| 3 | `pnpm build`（API + admin-web） |
+| 4 | 发 `dukang-api` + `admin-web`；**无需** `prisma migrate` |
+
+---
+
+## 5. 关键路径（便于排查）
+
+| 域 | 路径 |
+|----|------|
+| 导出工具 | `server/dukang-api/src/modules/ops/admin-order-export.util.ts` |
+| 订单服务 | `server/dukang-api/src/modules/ops/admin-orders.service.ts` |
+| 控制器 | `server/dukang-api/src/modules/ops/admin-orders.controller.ts` |
+| DTO | `server/dukang-api/src/modules/ops/dto/admin-query.dto.ts` |
+| 审计常量 | `server/dukang-api/src/common/hq-operation/hq-operation.constants.ts`（`ORDER_EXPORT`） |
+| 前端页面 | `apps/admin-web/src/pages/OrdersPage.tsx` |
+| 下载工具 | `apps/admin-web/src/lib/exportExcel.ts`（`downloadBase64File`） |
+| 类型 | `apps/admin-web/src/lib/api.ts`（`AdminOrderRow`） |
+| 需求 | `docs/杜康好客-v3-PRD.md` §3.2 HQ 订单导出 |
+| 现状 | `docs/杜康好客-v3-现状对照.md` |
+
+---
+
+## 6. 验收清单
+
+- [ ] 订单列表：网格筛选 + 日期快捷（当日/当周/当月/当季/当年）可用
+- [ ] 列表展示：商品（规格×数量）、状态/实付、好客权益、收货人+手机+地址
+- [ ] 现场取货订单地址仅显示「现场取货」，不出现重复拼接
+- [ ] 勾选若干订单 →「导出已勾选」→ xlsx / pdf 条数与勾选一致
+- [ ] 设筛选条件 →「导出全部筛选」→ 文件含筛选范围内全部订单（≤5000）
+- [ ] 超 5000 条时导出全部筛选返回明确错误
+- [ ] Excel / PDF 中文正常；PDF 表头与分页可读
+- [ ] 无 `orders` 权限账号无法调用导出接口
+- [ ] HQ 操作日志有 `ORDER_EXPORT` 记录
+- [ ] 无删除权限账号仍可勾选并导出；有删除权限时批量删除与导出/查询同一行
+
+---
+
+## 7. 与 v3.5.4 关系
+
+- **仅 HQ 内部工具**，不影响 C 端小程序版本号。
+- 商品规格（SPU/SKU）、发票等 v3.5.4 能力保持不变。
+- PRD §3.2 已补充 HQ 订单导出业务规则；本版为实现与 UI 落地说明。

docs/杜康好客-v3.5.6-开发文档.md

@@ -0,0 +1,129 @@
+# 杜康好客 · v3.5.6 开发文档
+
+> **2026-08-23** · admin-web / API  
+> **主题**：HQ 运营与财务体验增强（任务导出、核销/账单银行信息、工单图片、权限、审核全屏）
+
+---
+
+## 1. 版本目标
+
+1. **开发计划** 任务列表支持导出 Markdown / DOCX / Excel / PDF。
+2. **好客权益 · 核销详情** 展示核销门店收款账户（户名/账号/开户行）。
+3. **门店账单** 保留「已打款」「已结算」文案，用颜色与类型标签区分；页头说明两类终态含义。
+4. **财务四页**（门店/合伙人/酒厂/物流）统一展示收款账户与打款凭证；确认打款可填凭证号。
+5. **技术支持 → 开发任务** 审批创建任务时带入工单图片；新建任务支持上传图片。
+6. **运营权限** 去掉调试模块（核销调试、小飞侠联调），仅超级管理员可见。
+7. **门店审核对比** 支持全屏查看详情。
+
+**不做**：C 端 / 合伙人 / 门店端改动；不升小程序版本号。
+
+---
+
+## 2. 功能清单
+
+### 2.1 开发计划任务导出
+
+| # | 项 | 说明 |
+|---|----|------|
+| 1 | API | `POST /api/v1/admin/dev-plan/tasks/export` |
+| 2 | 范围 | `scope=filter` 按筛选；`scope=selected` 仅勾选 `ids` |
+| 3 | 格式 | `markdown` / `docx` / `xlsx` / `pdf` |
+| 4 | 列 | 任务编号、类型、状态、内容、关联工单、创建人、创建时间、完成时间、附件 |
+| 5 | 权限 | `dev_plan` |
+
+### 2.2 核销详情 · 门店收款账户
+
+| # | 项 | 说明 |
+|---|----|------|
+| 6 | API | `GET /admin/redeem-records/:id` 增加 `store.primaryAccount` |
+| 7 | UI | `RedeemRecordDetailDescriptions` 增加「收款账户」区块 |
+
+### 2.3 门店账单状态区分
+
+| 类型 | 终态 | 颜色 | 含义 |
+|------|------|------|------|
+| T+1 出账 | 已打款 | 绿 | HQ 确认已对公打款 |
+| 手动提现 | 已结算 | 青 | HQ 审核通过并完成结算 |
+
+两类单据终态枚举均为 `PAID`，故文案不同；本版不改文案，仅强化视觉区分。
+
+### 2.4 财务四页 · 银行卡打款信息
+
+| 页 | 收款账户来源 | 打款凭证 |
+|----|-------------|----------|
+| 门店账单 | 主 `StoreAccount` | `StoreBill.paymentRef`（T+1）；提现沿用 `StoreWithdrawRequest` |
+| 合伙人账单 | `PartnerAccount` | `PartnerBill.paymentRef` |
+| 酒厂账单 | `WINERY_BANK_*` 系统配置 | `WineryBill.paymentRef` |
+| 物流对账 | `FulfillmentProvider` | `LogisticsBill.paymentRef`（挂账模式） |
+
+列表 / 详情 / 导出均展示户名、账号、开户行（及酒厂开户银行）；确认打款弹窗可选填凭证号。
+
+### 2.5 工单 → 任务图片
+
+| # | 项 | 说明 |
+|---|----|------|
+| 8 | DB | `dev_plan_task.attachment_urls` JSON |
+| 9 | 审批创建 | 默认拷贝工单 `attachmentUrls` |
+| 10 | 新建任务 | `DevPlanTasksPage` 支持 `OssUpload` |
+
+### 2.6 运营去掉调试模块
+
+| 菜单 | 路由 | 新权限键 |
+|------|------|----------|
+| 核销调试 | `/redeem/debug` | `benefit_debug` |
+| 小飞侠联调 | `/deliveries/xiaofeixia` | `deliveries_debug` |
+
+仅 `SUPER_ADMIN` 默认拥有；调试 API 同步鉴权。
+
+### 2.7 门店审核全屏
+
+`StorePackageAuditsPage` 套餐对比 / 信息变更 Drawer 支持「全屏查看」切换 `width=100%`；全屏时图片放大。
+
+---
+
+## 3. Prisma 迁移
+
+- `store_bill.payment_ref`
+- `partner_bill.payment_ref`
+- `winery_bill.payment_ref`
+- `logistics_bill.payment_ref`
+- `dev_plan_task.attachment_urls`
+
+脚本：`prisma/migrate-finance-payment-ref-v356.sql`、`prisma/migrate-dev-plan-attachments-v356.sql`
+
+---
+
+## 4. 发版步骤
+
+| 步骤 | 动作 |
+|------|------|
+| 1 | `pnpm install`（新增 `docx`） |
+| 2 | 执行 Prisma 迁移 |
+| 3 | `pnpm build`（API + admin-web） |
+| 4 | 发 `dukang-api` + `admin-web` |
+
+---
+
+## 5. 关键路径
+
+| 域 | 路径 |
+|----|------|
+| 任务导出 | `server/.../dev-plan/admin-dev-plan-export.util.ts` |
+| 核销详情 | `admin-redeem.service.ts` + `RedeemRecordDetailDescriptions.tsx` |
+| 门店账单 | `StoreBillsPage.tsx` + `settlement.service.ts` |
+| 合伙人/酒厂/物流 | `PartnerBillsPage` / `WineryBillsPage` / `LogisticsBillsPage` |
+| 工单图片 | `dev-plan.service.ts` + `SupportTicketsPage.tsx` + `DevPlanTasksPage.tsx` |
+| 权限 | `hq-permissions.ts` + `AdminLayout.tsx` |
+| 审核全屏 | `StorePackageAuditsPage.tsx` + `StorePackageAuditPanel.tsx` |
+
+---
+
+## 6. 验收清单
+
+- [ ] 开发计划：勾选/筛选导出 md/docx/xlsx/pdf，中文正常
+- [ ] 核销详情：有主账户时展示户名/账号/开户行
+- [ ] 门店账单：T+1「已打款」绿色、提现「已结算」青色；类型 Tag 醒目
+- [ ] 财务四页：列表/详情/导出含收款账户；确认打款可填凭证；已打款后可见凭证
+- [ ] 工单审批创建任务：图片带入；新建任务可上传图
+- [ ] 运营账号无「核销调试」「小飞侠联调」菜单；直链 403
+- [ ] 门店审核对比可全屏；图片放大可预览

packages/shared-types/src/catalog.ts

@@ -35,6 +35,8 @@ export interface ProductSkuDto {
   saleUnit: ProductSaleUnit;
   bottlesPerUnit: number;
   isDefault: boolean;
+  /** 规格主图；无则详情页回落商品封面/轮播 */
+  imageUrl?: string | null;
 }
 
 export interface ProductDto {
@@ -142,4 +144,5 @@ export interface AdminProductSkuInput {
   bottlesPerUnit?: number;
   isDefault?: boolean;
   sortOrder?: number;
+  imageUrl?: string | null;
 }

packages/shared-types/src/dev-plan.ts

@@ -92,6 +92,8 @@ export interface DevPlanTaskDto {
 
   completedAt?: string | null;
 
+  attachmentUrls?: string[] | null;
+
 }
 
 
@@ -148,6 +150,8 @@ export interface CreateDevPlanTaskInput {
 
   supportTicketId?: string;
 
+  attachmentUrls?: string[];
+
 }
 
 
@@ -160,6 +164,8 @@ export interface UpdateDevPlanTaskInput {
 
   status?: DevPlanTaskStatusDto;
 
+  attachmentUrls?: string[];
+
 }
 
 
@@ -228,7 +234,23 @@ export interface DevPlanLinkedTaskSummary {
 
 
 
-/** 技术支持工单类型 → 开发任务类型 */
+export type DevPlanTaskExportFormat = 'markdown' | 'docx' | 'xlsx' | 'pdf';
+
+export interface DevPlanTaskExportRequest {
+  scope: 'filter' | 'selected';
+  format: DevPlanTaskExportFormat;
+  ids?: string[];
+  status?: string;
+  type?: string;
+  keyword?: string;
+}
+
+export interface DevPlanTaskExportResponse {
+  filename: string;
+  mimeType: string;
+  contentBase64: string;
+  count: number;
+}
 
 export function mapSupportTicketTypeToDevPlanTask(
 

packages/shared-types/src/hq-permissions.ts

@@ -10,7 +10,9 @@ export const HQ_PERMISSION_CATALOG = [
   { key: 'partners', label: '开城管理', group: '业务' },
   { key: 'finance', label: '财务', group: '业务' },
   { key: 'benefit', label: '好客权益', group: '业务' },
+  { key: 'benefit_debug', label: '核销调试', group: '业务' },
   { key: 'deliveries', label: '配送单', group: '业务' },
+  { key: 'deliveries_debug', label: '小飞侠联调', group: '业务' },
   { key: 'tickets', label: '工单中心', group: '业务' },
   { key: 'tech_support', label: '技术支持', group: '业务' },
   { key: 'invoices', label: '发票管理', group: '业务' },
@@ -41,6 +43,11 @@ export const HQ_PERMISSION_CATALOG = [
 export type HqPermissionKey = (typeof HQ_PERMISSION_CATALOG)[number]['key'];
 
 /** 危险操作：非超管角色默认不含，需在权限分配中显式勾选；超管默认拥有 */
+export const HQ_DEBUG_PERMISSION_KEYS = [
+  'benefit_debug',
+  'deliveries_debug',
+] as const satisfies readonly HqPermissionKey[];
+
 export const HQ_DANGEROUS_PERMISSION_KEYS = [
   'users_delete',
   'orders_delete',
@@ -51,8 +58,14 @@ export function isHqDangerousPermission(key: string): boolean {
   return (HQ_DANGEROUS_PERMISSION_KEYS as readonly string[]).includes(key);
 }
 
+export function isHqDebugPermission(key: string): boolean {
+  return (HQ_DEBUG_PERMISSION_KEYS as readonly string[]).includes(key);
+}
+
 export function hqBasePermissionKeys(): HqPermissionKey[] {
-  return HQ_PERMISSION_CATALOG.map((p) => p.key).filter((k) => !isHqDangerousPermission(k));
+  return HQ_PERMISSION_CATALOG.map((p) => p.key).filter(
+    (k) => !isHqDangerousPermission(k) && !isHqDebugPermission(k),
+  );
 }
 
 /** 系统配置 registry group → 权限 key */
@@ -100,7 +113,7 @@ export const HQ_ADMIN_ROLES = [
 ] as const;
 
 export const HQ_ROLE_DEFAULT_PERMISSIONS: Record<string, HqPermissionKey[]> = {
-  SUPER_ADMIN: hqBasePermissionKeys(),
+  SUPER_ADMIN: [...hqBasePermissionKeys(), ...HQ_DEBUG_PERMISSION_KEYS],
   OPS: [
     'dashboard',
     'users',

packages/shared-types/src/support-ticket.ts

@@ -96,6 +96,7 @@ export interface RejectSupportTicketRequest {
 export interface CreateDevPlanTaskFromTicketInput {
   content: string;
   type: 'BUG' | 'REQUIREMENT' | 'OPTIMIZATION';
+  attachmentUrls?: string[];
 }
 
 export interface ReviewSupportTicketRequest {

server/dukang-api/assets/fonts/README.md

@@ -0,0 +1,12 @@
+# PDF 导出字体
+
+订单 PDF 导出需要支持中文的 TTF/OTF/TTC 字体。按优先级尝试：
+
+1. 环境变量 `EXPORT_PDF_FONT_PATH`
+2. `assets/fonts/NotoSansSC-Regular.otf`（推荐，SIL OFL）
+3. `assets/fonts/simhei.ttf`
+4. `assets/fonts/msyh.ttc`
+5. Linux 系统字体（如 `fonts-noto-cjk`）
+6. Windows 系统字体（开发机）
+
+本地开发可将 `C:\Windows\Fonts\simhei.ttf` 复制到本目录。

server/dukang-api/nest-cli.json

@@ -3,6 +3,7 @@
   "collection": "@nestjs/schematics",
   "sourceRoot": "src",
   "compilerOptions": {
-    "deleteOutDir": true
+    "deleteOutDir": true,
+    "assets": [{ "include": "../assets/**/*", "outDir": "dist", "watchAssets": true }]
   }
 }

server/dukang-api/package.json

@@ -21,7 +21,8 @@
     "prisma:seed-wecom-push": "ts-node --transpile-only prisma/seed-wecom-message-push.ts",
     "prisma:migrate-wecom-push": "ts-node --transpile-only prisma/migrate-wecom-message-push.ts",
     "prisma:upsert-super-admin": "ts-node --transpile-only scripts/upsert-super-admin.ts",
-    "prisma:sync-benefit": "ts-node --transpile-only prisma/sync-benefit-to-price.ts"
+    "prisma:sync-benefit": "ts-node --transpile-only prisma/sync-benefit-to-price.ts",
+    "prisma:merge-spu-dk000007-008": "ts-node --transpile-only prisma/merge-spu-dk000007-008.ts"
   },
   "dependencies": {
     "@alicloud/dysmsapi20170525": "^4.6.0",
@@ -42,10 +43,13 @@
     "bullmq": "^5.12.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
+    "docx": "^9.5.0",
     "dotenv": "^17.4.2",
+    "exceljs": "^4.4.0",
     "express": "^4.21.0",
     "ioredis": "^5.4.1",
     "ip2region": "^2.3.0",
+    "pdfkit": "^0.19.1",
     "qrcode": "^1.5.4",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.1"
@@ -57,6 +61,7 @@
     "@types/express": "^4.17.21",
     "@types/multer": "^2.1.0",
     "@types/node": "^20.14.0",
+    "@types/pdfkit": "^0.17.6",
     "@types/qrcode": "^1.5.6",
     "prisma": "^5.18.0",
     "ts-node": "^10.9.2",

server/dukang-api/prisma/merge-spu-dk000007-008.ts

@@ -0,0 +1,352 @@
+/**
+ * 方案 A：把 DK000007 / DK000008 合并为同一 SPU，保留原 SKU id 与 DK 码，订单改绑到对应 SKU。
+ *
+ * 用法：cd server/dukang-api && npx ts-node --transpile-only prisma/merge-spu-dk000007-008.ts
+ * 预览：npx ts-node --transpile-only prisma/merge-spu-dk000007-008.ts --dry-run
+ *
+ * 幸存 SPU = DK000007 所在商品；默认规格 = 国标特级20。
+ */
+import { PrismaClient } from '@prisma/client';
+
+const prisma = new PrismaClient();
+
+const CODES = ['DK000007', 'DK000008'] as const;
+const SURVIVOR_CODE = 'DK000007';
+const SPEC_ATTR_NAME = '规格';
+const SPU_NAME = '酒祖杜康（国标特级）';
+const SPEC_LABEL: Record<(typeof CODES)[number], string> = {
+  DK000007: '国标特级20',
+  DK000008: '国标特级30',
+};
+
+const dryRun = process.argv.includes('--dry-run');
+
+function buildSpecKey(valueIds: bigint[]): string {
+  if (!valueIds.length) return '';
+  return [...valueIds]
+    .map((id) => id.toString())
+    .sort((a, b) => (BigInt(a) < BigInt(b) ? -1 : BigInt(a) > BigInt(b) ? 1 : 0))
+    .join('_');
+}
+
+async function ensureSkuImageColumn() {
+  const rows = await prisma.$queryRaw<Array<{ cnt: bigint | number }>>`
+    SELECT COUNT(*) AS cnt
+    FROM information_schema.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE()
+      AND TABLE_NAME = 'common_product_sku'
+      AND COLUMN_NAME = 'image_url'
+  `;
+  const cnt = Number(rows[0]?.cnt ?? 0);
+  if (cnt > 0) return;
+  await prisma.$executeRawUnsafe(
+    'ALTER TABLE `common_product_sku` ADD COLUMN `image_url` VARCHAR(512) NULL AFTER `sort_order`',
+  );
+  console.log('added column common_product_sku.image_url');
+}
+
+async function resolveProductByCode(skuCode: string) {
+  const sku = await prisma.commonProductSku.findUnique({
+    where: { skuCode },
+    include: { product: true },
+  });
+  if (sku) return { product: sku.product, sku };
+  const product = await prisma.commonProductItem.findFirst({
+    where: { skuCode },
+  });
+  if (!product) {
+    throw new Error(`找不到商品/SKU：${skuCode}`);
+  }
+  return { product, sku: null as null };
+}
+
+async function coverUrlOf(productId: bigint, coverResourceId: bigint | null) {
+  if (coverResourceId) {
+    const res = await prisma.commonResource.findUnique({
+      where: { id: coverResourceId },
+      select: { url: true },
+    });
+    if (res?.url) return res.url;
+  }
+  const fallback = await prisma.commonResource.findFirst({
+    where: { ownerType: 'PRODUCT', ownerId: productId, bizType: 'COVER', status: 'ACTIVE' },
+    orderBy: { id: 'asc' },
+    select: { url: true },
+  });
+  return fallback?.url ?? null;
+}
+
+async function ensureSkuFromProduct(
+  tx: PrismaClient,
+  product: {
+    id: bigint;
+    skuCode: string;
+    barcode69: string;
+    spec: string;
+    price: unknown;
+    benefitAmount: unknown;
+    status: 'DRAFT' | 'ON_SALE' | 'OFF_SALE';
+    allowOnSitePickup: boolean;
+    allowOnlinePurchase: boolean;
+    allowCrossCityDelivery: boolean;
+  },
+) {
+  const existing =
+    (await tx.commonProductSku.findUnique({ where: { skuCode: product.skuCode } })) ??
+    (await tx.commonProductSku.findFirst({
+      where: { productId: product.id, isDefault: true },
+    }));
+  if (existing) return existing;
+  return tx.commonProductSku.create({
+    data: {
+      productId: product.id,
+      skuCode: product.skuCode,
+      barcode69: product.barcode69,
+      specKey: '',
+      specText: product.spec,
+      price: product.price as never,
+      benefitAmount: product.benefitAmount as never,
+      status: product.status,
+      allowOnSitePickup: product.allowOnSitePickup,
+      allowOnlinePurchase: product.allowOnlinePurchase,
+      allowCrossCityDelivery: product.allowCrossCityDelivery,
+      saleUnit: 'BOTTLE',
+      bottlesPerUnit: 1,
+      isDefault: true,
+      sortOrder: 0,
+    },
+  });
+}
+
+async function main() {
+  await ensureSkuImageColumn();
+
+  const rows = [];
+  for (const code of CODES) {
+    const resolved = await resolveProductByCode(code);
+    rows.push({ code, ...resolved });
+  }
+
+  const survivorRow = rows.find((r) => r.code === SURVIVOR_CODE);
+  if (!survivorRow) throw new Error(`缺少幸存码 ${SURVIVOR_CODE}`);
+  const discardRows = rows.filter((r) => r.product.id !== survivorRow.product.id);
+  const survivorId = survivorRow.product.id;
+
+  console.log(
+    JSON.stringify(
+      {
+        dryRun,
+        survivor: {
+          productId: survivorId.toString(),
+          name: survivorRow.product.name,
+          skuCode: survivorRow.product.skuCode,
+        },
+        items: await Promise.all(
+          rows.map(async (r) => {
+            const orderCount = await prisma.order.count({ where: { productId: r.product.id } });
+            const nullSku = await prisma.order.count({
+              where: { productId: r.product.id, skuId: null },
+            });
+            return {
+              code: r.code,
+              productId: r.product.id.toString(),
+              name: r.product.name,
+              skuId: r.sku?.id.toString() ?? null,
+              orders: orderCount,
+              nullSkuOrders: nullSku,
+            };
+          }),
+        ),
+      },
+      null,
+      2,
+    ),
+  );
+
+  if (discardRows.length === 0 && survivorRow.sku) {
+    const sibling = await prisma.commonProductSku.findMany({
+      where: { productId: survivorId, skuCode: { in: [...CODES] } },
+    });
+    if (sibling.length === CODES.length) {
+      console.log('SKU 已在同一 SPU 上，继续核对订单 product_id / sku_id');
+    }
+  }
+
+  if (dryRun) {
+    console.log('[dry-run] skip writes');
+    return;
+  }
+
+  await prisma.$transaction(
+    async (tx) => {
+      const db = tx as unknown as PrismaClient;
+      const skuByCode = new Map<string, { id: bigint }>();
+
+      for (const row of rows) {
+        const sku = await ensureSkuFromProduct(db, row.product);
+        skuByCode.set(row.code, sku);
+        console.log(`ensured sku ${row.code} id=${sku.id} fromProduct=${row.product.id}`);
+      }
+
+      let attr = await db.commonProductSpecAttr.findFirst({
+        where: { productId: survivorId, name: SPEC_ATTR_NAME },
+      });
+      if (!attr) {
+        attr = await db.commonProductSpecAttr.create({
+          data: { productId: survivorId, name: SPEC_ATTR_NAME, sortOrder: 0 },
+        });
+      }
+
+      const valueIdByCode = new Map<string, bigint>();
+      for (let i = 0; i < CODES.length; i++) {
+        const code = CODES[i];
+        const label = SPEC_LABEL[code];
+        let value = await db.commonProductSpecValue.findFirst({
+          where: { attrId: attr.id, name: label },
+        });
+        if (!value) {
+          value = await db.commonProductSpecValue.create({
+            data: { attrId: attr.id, name: label, sortOrder: i },
+          });
+        }
+        valueIdByCode.set(code, value.id);
+      }
+
+      for (let i = 0; i < CODES.length; i++) {
+        const code = CODES[i];
+        const sku = skuByCode.get(code)!;
+        const valueId = valueIdByCode.get(code)!;
+        const specKey = buildSpecKey([valueId]);
+        const specText = SPEC_LABEL[code];
+        const sourceProduct = rows.find((r) => r.code === code)!.product;
+        const imageUrl = await coverUrlOf(sourceProduct.id, sourceProduct.coverResourceId);
+        const isDefault = code === SURVIVOR_CODE;
+
+        await db.commonProductSkuSpec.deleteMany({ where: { skuId: sku.id } });
+        await db.commonProductSku.update({
+          where: { id: sku.id },
+          data: {
+            product: { connect: { id: survivorId } },
+            specKey,
+            specText,
+            isDefault,
+            sortOrder: i,
+            imageUrl,
+            status: sourceProduct.status,
+          },
+        });
+        await db.commonProductSkuSpec.create({
+          data: { skuId: sku.id, valueId },
+        });
+
+        const orderRes = await db.order.updateMany({
+          where: {
+            OR: [{ skuId: sku.id }, { productId: sourceProduct.id, skuId: null }],
+          },
+          data: { productId: survivorId, skuId: sku.id },
+        });
+        console.log(
+          `bound ${code} → product ${survivorId} sku ${sku.id} spec=${specText} orders=${orderRes.count}`,
+        );
+      }
+
+      const leftover = await db.order.findMany({
+        where: { productId: { in: discardRows.map((r) => r.product.id) } },
+        select: { id: true, orderNo: true, productId: true, skuId: true },
+      });
+      if (leftover.length) {
+        throw new Error(
+          `仍有订单绑在被合并 SPU 上：${leftover.map((o) => o.orderNo).join(', ')}`,
+        );
+      }
+
+      for (const discard of discardRows) {
+        const phones = await db.commonProductVisibilityPhone.findMany({
+          where: { productId: discard.product.id },
+        });
+        for (const p of phones) {
+          await db.commonProductVisibilityPhone.upsert({
+            where: { productId_phone: { productId: survivorId, phone: p.phone } },
+            create: { productId: survivorId, phone: p.phone },
+            update: {},
+          });
+        }
+        await db.commonProductVisibilityPhone.deleteMany({
+          where: { productId: discard.product.id },
+        });
+        await db.commonProductSkuSpec.deleteMany({
+          where: { sku: { productId: discard.product.id } },
+        });
+        await db.commonProductSku.deleteMany({ where: { productId: discard.product.id } });
+        await db.commonProductSpecAttr.deleteMany({ where: { productId: discard.product.id } });
+        await db.commonResource.deleteMany({
+          where: { ownerType: 'PRODUCT', ownerId: discard.product.id },
+        });
+        await db.commonProductItem.update({
+          where: { id: discard.product.id },
+          data: { status: 'OFF_SALE', coverResourceId: null },
+        });
+        await db.commonProductItem.delete({ where: { id: discard.product.id } });
+        console.log(`deleted discard SPU ${discard.product.id} ${discard.code}`);
+      }
+
+      const defaultSku = await db.commonProductSku.findUniqueOrThrow({
+        where: { skuCode: SURVIVOR_CODE },
+      });
+      await db.commonProductItem.update({
+        where: { id: survivorId },
+        data: {
+          name: SPU_NAME,
+          skuCode: defaultSku.skuCode,
+          barcode69: defaultSku.barcode69,
+          spec: defaultSku.specText,
+          price: defaultSku.price,
+          benefitAmount: defaultSku.benefitAmount,
+          allowOnSitePickup: defaultSku.allowOnSitePickup,
+          allowOnlinePurchase: defaultSku.allowOnlinePurchase,
+          allowCrossCityDelivery: defaultSku.allowCrossCityDelivery,
+          status: 'ON_SALE',
+        },
+      });
+    },
+    { timeout: 30000 },
+  );
+
+  const skus = await prisma.commonProductSku.findMany({
+    where: { skuCode: { in: [...CODES] } },
+    orderBy: { sortOrder: 'asc' },
+  });
+  const orders = await prisma.order.groupBy({
+    by: ['productId', 'skuId'],
+    where: { sku: { skuCode: { in: [...CODES] } } },
+    _count: true,
+  });
+  console.log(
+    JSON.stringify(
+      {
+        done: true,
+        skus: skus.map((s) => ({
+          id: s.id.toString(),
+          productId: s.productId.toString(),
+          skuCode: s.skuCode,
+          specText: s.specText,
+          isDefault: s.isDefault,
+        })),
+        orders: orders.map((o) => ({
+          productId: o.productId.toString(),
+          skuId: o.skuId?.toString() ?? null,
+          count: o._count,
+        })),
+      },
+      null,
+      2,
+    ),
+  );
+}
+
+main()
+  .catch((e) => {
+    console.error(e);
+    process.exit(1);
+  })
+  .finally(() => prisma.$disconnect());

server/dukang-api/prisma/migrate-dev-plan-attachments-v356.sql

@@ -0,0 +1,2 @@
+-- v3.5.6: 开发计划任务附件
+ALTER TABLE `dev_plan_task` ADD COLUMN `attachment_urls` JSON NULL AFTER `support_ticket_id`;

server/dukang-api/prisma/migrate-finance-payment-ref-v356.sql

@@ -0,0 +1,5 @@
+-- v3.5.6: 财务账单打款凭证
+ALTER TABLE `store_bill` ADD COLUMN `payment_ref` VARCHAR(128) NULL AFTER `status`;
+ALTER TABLE `partner_bill` ADD COLUMN `payment_ref` VARCHAR(128) NULL AFTER `status`;
+ALTER TABLE `winery_bill` ADD COLUMN `payment_ref` VARCHAR(128) NULL AFTER `status`;
+ALTER TABLE `logistics_bill` ADD COLUMN `payment_ref` VARCHAR(128) NULL AFTER `status`;

server/dukang-api/prisma/migrate-sku-image.sql

@@ -0,0 +1,3 @@
+-- SKU 规格主图（可选；空则 C 端回落商品封面）
+ALTER TABLE `common_product_sku`
+  ADD COLUMN `image_url` VARCHAR(512) NULL AFTER `sort_order`;

server/dukang-api/prisma/schema.prisma

@@ -733,6 +733,7 @@ model DevPlanTask {
   status               DevPlanTaskStatus @default(TODO)
   creatorHqAccountId   BigInt            @map("creator_hq_account_id") @db.UnsignedBigInt
   supportTicketId      BigInt?           @map("support_ticket_id") @db.UnsignedBigInt
+  attachmentUrls       Json?             @map("attachment_urls")
   lastDispatchedAt     DateTime?         @map("last_dispatched_at") @db.DateTime(3)
   createdAt            DateTime          @default(now()) @map("created_at") @db.DateTime(3)
   completedAt          DateTime?         @map("completed_at") @db.DateTime(3)
@@ -894,6 +895,8 @@ model CommonProductSku {
   bottlesPerUnit         Int             @default(1) @map("bottles_per_unit")
   isDefault              Boolean         @default(false) @map("is_default")
   sortOrder              Int             @default(0) @map("sort_order")
+  /// 规格主图；空则回落商品封面
+  imageUrl               String?         @map("image_url") @db.VarChar(512)
   createdAt              DateTime        @default(now()) @map("created_at") @db.DateTime(3)
   updatedAt              DateTime        @updatedAt @map("updated_at") @db.DateTime(3)
 
@@ -1071,6 +1074,7 @@ model LogisticsBill {
   settlementMethod       LogisticsSettlementMethod @map("settlement_method")
   pricingSnapshotJson    String?                   @map("pricing_snapshot_json") @db.Text
   status                 FinancePayStatus          @default(UNPAID)
+  paymentRef             String?                   @map("payment_ref") @db.VarChar(128)
   paidAt                 DateTime?                 @map("paid_at") @db.DateTime(3)
   createdAt              DateTime                  @default(now()) @map("created_at") @db.DateTime(3)
 
@@ -1213,6 +1217,7 @@ model PartnerBill {
   redeemCommission  Decimal           @default(0) @map("redeem_commission") @db.Decimal(10, 2)
   totalAmount       Decimal           @map("total_amount") @db.Decimal(10, 2)
   status            PartnerBillStatus @default(PENDING_REVIEW)
+  paymentRef        String?           @map("payment_ref") @db.VarChar(128)
   confirmedAt       DateTime?         @map("confirmed_at") @db.DateTime(3)
   sentAt            DateTime?         @map("sent_at") @db.DateTime(3)
   paidAt            DateTime?         @map("paid_at") @db.DateTime(3)
@@ -1861,6 +1866,7 @@ model StoreBill {
   settlementRate Decimal          @map("settlement_rate") @db.Decimal(5, 4)
   payoutAmount   Decimal          @map("payout_amount") @db.Decimal(10, 2)
   status         FinancePayStatus @default(UNPAID)
+  paymentRef     String?          @map("payment_ref") @db.VarChar(128)
   paidAt         DateTime?        @map("paid_at") @db.DateTime(3)
   createdAt      DateTime         @default(now()) @map("created_at") @db.DateTime(3)
 
@@ -1944,6 +1950,7 @@ model WineryBill {
   wineryRate   Decimal          @map("winery_rate") @db.Decimal(5, 4)
   wineryAmount Decimal          @map("winery_amount") @db.Decimal(10, 2)
   status       FinancePayStatus @default(UNPAID)
+  paymentRef   String?          @map("payment_ref") @db.VarChar(128)
   paidAt       DateTime?        @map("paid_at") @db.DateTime(3)
   createdAt    DateTime         @default(now()) @map("created_at") @db.DateTime(3)
 

server/dukang-api/src/common/hq-operation/hq-operation.constants.ts

@@ -24,6 +24,7 @@ export const HqOperationAction = {
   ORDER_BATCH_DELETE: 'ORDER_BATCH_DELETE',
   ORDER_DELETE: 'ORDER_DELETE',
   ORDER_PROXY_CREATE: 'ORDER_PROXY_CREATE',
+  ORDER_EXPORT: 'ORDER_EXPORT',
   STORE_CREATE: 'STORE_CREATE',
   STORE_UPDATE: 'STORE_UPDATE',
   STORE_STATUS: 'STORE_STATUS',
@@ -147,6 +148,7 @@ export const HQ_OPERATION_ACTION_LABELS: Record<string, string> = {
   [HqOperationAction.ORDER_BATCH_DELETE]: '批量删除订单',
   [HqOperationAction.ORDER_DELETE]: '删除订单',
   [HqOperationAction.ORDER_PROXY_CREATE]: '总部代下单',
+  [HqOperationAction.ORDER_EXPORT]: '导出订单',
   [HqOperationAction.STORE_CREATE]: '新增门店',
   [HqOperationAction.STORE_UPDATE]: '编辑门店',
   [HqOperationAction.STORE_STATUS]: '变更门店状态',

server/dukang-api/src/common/store/store-bank.util.ts

@@ -0,0 +1,86 @@
+import type { PrismaClient } from '@prisma/client';
+
+export type StoreBankAccountSnapshot = {
+  bankAccountName: string | null;
+  bankAccountNo: string | null;
+  bankBranch: string | null;
+};
+
+export async function loadStorePrimaryBank(
+  prisma: PrismaClient,
+  storeId: bigint,
+): Promise<StoreBankAccountSnapshot | null> {
+  const binding = await prisma.storeAccountStore.findFirst({
+    where: { storeId, storeAccount: { isPrimary: 1 } },
+    include: {
+      storeAccount: {
+        select: { bankAccountName: true, bankAccountNo: true, bankBranch: true },
+      },
+    },
+  });
+  if (binding) return binding.storeAccount;
+  const fallback = await prisma.storeAccountStore.findFirst({
+    where: { storeId },
+    orderBy: { storeAccountId: 'asc' },
+    include: {
+      storeAccount: {
+        select: { bankAccountName: true, bankAccountNo: true, bankBranch: true },
+      },
+    },
+  });
+  return fallback?.storeAccount ?? null;
+}
+
+export async function loadStorePrimaryBanksMap(
+  prisma: PrismaClient,
+  storeIds: bigint[],
+): Promise<Map<string, StoreBankAccountSnapshot>> {
+  const map = new Map<string, StoreBankAccountSnapshot>();
+  if (!storeIds.length) return map;
+  const bindings = await prisma.storeAccountStore.findMany({
+    where: { storeId: { in: storeIds } },
+    include: {
+      storeAccount: {
+        select: {
+          isPrimary: true,
+          bankAccountName: true,
+          bankAccountNo: true,
+          bankBranch: true,
+        },
+      },
+    },
+    orderBy: [{ storeAccount: { isPrimary: 'desc' } }, { storeAccountId: 'asc' }],
+  });
+  for (const binding of bindings) {
+    const key = String(binding.storeId);
+    if (map.has(key)) continue;
+    map.set(key, {
+      bankAccountName: binding.storeAccount.bankAccountName,
+      bankAccountNo: binding.storeAccount.bankAccountNo,
+      bankBranch: binding.storeAccount.bankBranch,
+    });
+  }
+  return map;
+}
+
+export async function loadWineryBankConfig(
+  prisma: PrismaClient,
+): Promise<StoreBankAccountSnapshot & { bankName?: string | null }> {
+  const keys = [
+    'WINERY_BANK_ACCOUNT_NAME',
+    'WINERY_BANK_NAME',
+    'WINERY_BANK_BRANCH',
+    'WINERY_BANK_ACCOUNT_NO',
+  ];
+  const rows = await prisma.systemConfig.findMany({
+    where: { configKey: { in: keys } },
+    select: { configKey: true, value: true },
+  });
+  const map = new Map(rows.map((r) => [r.configKey, r.value]));
+  return {
+    bankAccountName: map.get('WINERY_BANK_ACCOUNT_NAME') ?? null,
+    bankName: map.get('WINERY_BANK_NAME') ?? null,
+    bankBranch: map.get('WINERY_BANK_BRANCH') ?? null,
+    bankAccountNo: map.get('WINERY_BANK_ACCOUNT_NO') ?? null,
+  };
+}

server/dukang-api/src/modules/catalog/product-sku.util.ts

@@ -188,6 +188,7 @@ export function mapSkuDto(sku: SkuWithSpecs) {
     isDefault: sku.isDefault,
     skuCode: sku.skuCode,
     barcode69: sku.barcode69,
+    imageUrl: (sku as { imageUrl?: string | null }).imageUrl || undefined,
     sortOrder: sku.sortOrder,
   };
 }

server/dukang-api/src/modules/dev-plan/admin-dev-plan-export.util.ts

@@ -0,0 +1,270 @@
+import {
+  DEV_PLAN_TASK_STATUS_LABELS,
+  DEV_PLAN_TASK_TYPE_LABELS,
+  type DevPlanTaskStatusDto,
+  type DevPlanTaskTypeDto,
+} from '@dukang/shared-types';
+import ExcelJS from 'exceljs';
+import * as fs from 'fs';
+import * as path from 'path';
+import PDFDocument from 'pdfkit';
+import {
+  Document,
+  HeadingLevel,
+  ImageRun,
+  Packer,
+  Paragraph,
+  Table,
+  TableCell,
+  TableRow,
+  TextRun,
+  WidthType,
+} from 'docx';
+
+const EXPORT_HEADERS = [
+  '任务编号',
+  '类型',
+  '状态',
+  '内容',
+  '关联工单',
+  '创建人',
+  '创建时间',
+  '完成时间',
+  '附件',
+] as const;
+
+export type DevPlanTaskExportRow = {
+  taskNo: string;
+  type: string;
+  status: string;
+  content: string;
+  supportTicketNo: string;
+  creatorName: string;
+  createdAt: string;
+  completedAt: string;
+  attachmentUrls: string[];
+};
+
+export type DevPlanExportFormat = 'markdown' | 'docx' | 'xlsx' | 'pdf';
+
+export function mapTaskToExportRow(task: {
+  taskNo: string;
+  type: DevPlanTaskTypeDto;
+  status: DevPlanTaskStatusDto;
+  content: string;
+  supportTicketNo?: string | null;
+  creatorName?: string | null;
+  createdAt: string;
+  completedAt?: string | null;
+  attachmentUrls?: string[] | null;
+}): DevPlanTaskExportRow {
+  return {
+    taskNo: task.taskNo,
+    type: DEV_PLAN_TASK_TYPE_LABELS[task.type] ?? task.type,
+    status: DEV_PLAN_TASK_STATUS_LABELS[task.status] ?? task.status,
+    content: task.content,
+    supportTicketNo: task.supportTicketNo ?? '',
+    creatorName: task.creatorName ?? '',
+    createdAt: task.createdAt.slice(0, 19).replace('T', ' '),
+    completedAt: task.completedAt ? task.completedAt.slice(0, 19).replace('T', ' ') : '',
+    attachmentUrls: task.attachmentUrls ?? [],
+  };
+}
+
+function rowToCells(row: DevPlanTaskExportRow): string[] {
+  return [
+    row.taskNo,
+    row.type,
+    row.status,
+    row.content,
+    row.supportTicketNo,
+    row.creatorName,
+    row.createdAt,
+    row.completedAt,
+    row.attachmentUrls.join(' '),
+  ];
+}
+
+function resolvePdfFontPath(): string {
+  const candidates = [
+    process.env.EXPORT_PDF_FONT_PATH,
+    path.join(process.cwd(), 'assets', 'fonts', 'NotoSansSC-Regular.otf'),
+    path.join(process.cwd(), 'assets', 'fonts', 'simhei.ttf'),
+    path.join(process.cwd(), 'assets', 'fonts', 'msyh.ttc'),
+    path.join(process.cwd(), 'dist', 'assets', 'fonts', 'simhei.ttf'),
+    '/usr/share/fonts/truetype/noto/NotoSansCJK-Regular.ttc',
+    'C:\\Windows\\Fonts\\simhei.ttf',
+    'C:\\Windows\\Fonts\\msyh.ttc',
+  ].filter(Boolean) as string[];
+  for (const candidate of candidates) {
+    if (fs.existsSync(candidate)) return candidate;
+  }
+  throw new Error('未找到可用于 PDF 的中文字体，请将字体文件放到 server/dukang-api/assets/fonts/');
+}
+
+export function buildDevPlanMarkdown(rows: DevPlanTaskExportRow[]): Buffer {
+  const lines: string[] = ['# 开发计划任务导出', ''];
+  rows.forEach((row, index) => {
+    lines.push(`## ${index + 1}. ${row.taskNo} [${row.type}] ${row.status}`);
+    lines.push('');
+    lines.push(row.content);
+    lines.push('');
+    if (row.supportTicketNo) lines.push(`- 关联工单：${row.supportTicketNo}`);
+    if (row.creatorName) lines.push(`- 创建人：${row.creatorName}`);
+    lines.push(`- 创建时间：${row.createdAt}`);
+    if (row.completedAt) lines.push(`- 完成时间：${row.completedAt}`);
+    if (row.attachmentUrls.length) {
+      lines.push('- 附件：');
+      for (const url of row.attachmentUrls) {
+        lines.push(`  ![附件](${url})`);
+        lines.push(`  ${url}`);
+      }
+    }
+    lines.push('');
+  });
+  return Buffer.from(lines.join('\n'), 'utf8');
+}
+
+async function fetchImageBuffer(url: string): Promise<Buffer | null> {
+  try {
+    const res = await fetch(url, { signal: AbortSignal.timeout(8000) });
+    if (!res.ok) return null;
+    const buf = Buffer.from(await res.arrayBuffer());
+    return buf.length > 0 && buf.length < 5 * 1024 * 1024 ? buf : null;
+  } catch {
+    return null;
+  }
+}
+
+export async function buildDevPlanDocx(rows: DevPlanTaskExportRow[]): Promise<Buffer> {
+  const children: (Paragraph | Table)[] = [
+    new Paragraph({ text: '开发计划任务导出', heading: HeadingLevel.HEADING_1 }),
+  ];
+
+  for (const row of rows) {
+    children.push(
+      new Paragraph({
+        text: `${row.taskNo} [${row.type}] ${row.status}`,
+        heading: HeadingLevel.HEADING_2,
+      }),
+      new Paragraph({ children: [new TextRun(row.content)] }),
+      new Paragraph({
+        children: [
+          new TextRun(`创建人：${row.creatorName || '—'}  创建：${row.createdAt}`),
+        ],
+      }),
+    );
+    if (row.supportTicketNo) {
+      children.push(new Paragraph({ children: [new TextRun(`关联工单：${row.supportTicketNo}`)] }));
+    }
+    if (row.completedAt) {
+      children.push(new Paragraph({ children: [new TextRun(`完成时间：${row.completedAt}`)] }));
+    }
+    for (const url of row.attachmentUrls) {
+      const img = await fetchImageBuffer(url);
+      if (img) {
+        children.push(
+          new Paragraph({
+            children: [
+              new ImageRun({
+                data: img,
+                transformation: { width: 320, height: 240 },
+                type: 'png',
+              }),
+            ],
+          }),
+        );
+      } else {
+        children.push(new Paragraph({ children: [new TextRun(url)] }));
+      }
+    }
+    children.push(new Paragraph({ text: '' }));
+  }
+
+  const doc = new Document({
+    sections: [{ children }],
+  });
+  return Packer.toBuffer(doc);
+}
+
+export async function buildDevPlanXlsx(rows: DevPlanTaskExportRow[]): Promise<Buffer> {
+  const workbook = new ExcelJS.Workbook();
+  const sheet = workbook.addWorksheet('开发任务');
+  sheet.addRow([...EXPORT_HEADERS]);
+  for (const row of rows) {
+    sheet.addRow(rowToCells(row));
+  }
+  sheet.columns.forEach((col, i) => {
+    col.width = i === 3 || i === 8 ? 40 : 16;
+  });
+  const buffer = await workbook.xlsx.writeBuffer();
+  return Buffer.from(buffer);
+}
+
+export async function buildDevPlanPdf(rows: DevPlanTaskExportRow[]): Promise<Buffer> {
+  const fontPath = resolvePdfFontPath();
+  const chunks: Buffer[] = [];
+
+  return new Promise((resolve, reject) => {
+    const doc = new PDFDocument({ size: 'A4', layout: 'landscape', margin: 24, bufferPages: true });
+    doc.on('data', (chunk) => chunks.push(chunk as Buffer));
+    doc.on('end', () => resolve(Buffer.concat(chunks)));
+    doc.on('error', reject);
+    doc.registerFont('zh', fontPath);
+    doc.font('zh');
+
+    const pageWidth = doc.page.width - doc.page.margins.left - doc.page.margins.right;
+    const colWidths = [72, 48, 48, 180, 72, 56, 78, 78, 120];
+    const scale = pageWidth / colWidths.reduce((s, w) => s + w, 0);
+    const widths = colWidths.map((w) => w * scale);
+    const rowHeight = 36;
+    let y = doc.page.margins.top;
+
+    const drawRow = (cells: string[], isHeader = false) => {
+      let x = doc.page.margins.left;
+      const height = isHeader ? 24 : rowHeight;
+      if (y + height > doc.page.height - doc.page.margins.bottom) {
+        doc.addPage({ size: 'A4', layout: 'landscape', margin: 24 });
+        y = doc.page.margins.top;
+      }
+      doc.fontSize(isHeader ? 8 : 7);
+      cells.forEach((cell, index) => {
+        doc.rect(x, y, widths[index], height).stroke('#dddddd');
+        doc.text(cell || '', x + 2, y + 4, {
+          width: widths[index] - 4,
+          height: height - 6,
+          lineBreak: true,
+        });
+        x += widths[index];
+      });
+      y += height;
+    };
+
+    drawRow([...EXPORT_HEADERS], true);
+    for (const row of rows) {
+      drawRow(rowToCells(row));
+    }
+    doc.end();
+  });
+}
+
+export function buildDevPlanExportFilename(format: DevPlanExportFormat, count: number): string {
+  const stamp = new Date().toISOString().slice(0, 10);
+  const ext = format === 'markdown' ? 'md' : format === 'docx' ? 'docx' : format;
+  return `开发任务导出_${stamp}_${count}条.${ext}`;
+}
+
+export function devPlanExportMimeType(format: DevPlanExportFormat): string {
+  switch (format) {
+    case 'markdown':
+      return 'text/markdown;charset=utf-8';
+    case 'docx':
+      return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
+    case 'xlsx':
+      return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+    case 'pdf':
+      return 'application/pdf';
+    default:
+      return 'application/octet-stream';
+  }
+}

server/dukang-api/src/modules/dev-plan/admin-dev-plan.controller.ts

@@ -31,6 +31,7 @@ import {
   UpdateDevPlanTaskDto,
   UpdateDevPlanVersionDto,
   DevPlanTaskBatchUpdateDto,
+  DevPlanTaskExportDto,
 } from './dto/dev-plan.dto';
 
 @Controller('admin/dev-plan')
@@ -98,6 +99,11 @@ export class AdminDevPlanController {
     return this.service.batchUpdateTasks(body);
   }
 
+  @Post('tasks/export')
+  exportTasks(@Body() body: DevPlanTaskExportDto) {
+    return this.service.exportTasks(body);
+  }
+
   @Get('versions')
   listVersions(
     @Query('status') status?: string,

server/dukang-api/src/modules/dev-plan/dev-plan.service.ts

@@ -59,6 +59,26 @@ import type {
   UpdateDevPlanVersionDto,
 
 } from './dto/dev-plan.dto';
+import {
+  buildDevPlanDocx,
+  buildDevPlanExportFilename,
+  buildDevPlanMarkdown,
+  buildDevPlanPdf,
+  buildDevPlanXlsx,
+  devPlanExportMimeType,
+  mapTaskToExportRow,
+  type DevPlanExportFormat,
+} from './admin-dev-plan-export.util';
+
+function parseAttachmentUrls(value: unknown): string[] {
+  if (!Array.isArray(value)) return [];
+  return value.map((u) => String(u).trim()).filter(Boolean);
+}
+
+function attachmentUrlsInput(urls?: string[]): Prisma.InputJsonValue | undefined {
+  const list = (urls ?? []).map((u) => u.trim()).filter(Boolean);
+  return list.length ? (list as unknown as Prisma.InputJsonValue) : undefined;
+}
 
 
 
@@ -132,6 +152,8 @@ export class DevPlanService {
 
       completedAt: Date | null;
 
+      attachmentUrls?: unknown;
+
     },
 
     extras?: { creatorName?: string | null; supportTicketNo?: string | null },
@@ -164,6 +186,8 @@ export class DevPlanService {
 
       completedAt: row.completedAt?.toISOString() ?? null,
 
+      attachmentUrls: parseAttachmentUrls(row.attachmentUrls),
+
     };
 
   }
@@ -378,6 +402,8 @@ export class DevPlanService {
 
         supportTicketId: dto.supportTicketId ? BigInt(dto.supportTicketId) : null,
 
+        attachmentUrls: attachmentUrlsInput(dto.attachmentUrls),
+
       },
 
     });
@@ -400,6 +426,12 @@ export class DevPlanService {
 
     if (!tasks.length) throw new BadRequestException('至少创建 1 条开发任务');
 
+    const ticket = await this.prisma.commonSupportTicket.findUnique({
+      where: { id: ticketId },
+      select: { attachmentUrls: true },
+    });
+    const ticketUrls = parseAttachmentUrls(ticket?.attachmentUrls);
+
     const created = await this.prisma.$transaction(
 
       tasks.map((t) =>
@@ -418,6 +450,10 @@ export class DevPlanService {
 
             supportTicketId: ticketId,
 
+            attachmentUrls: attachmentUrlsInput(
+              t.attachmentUrls?.length ? t.attachmentUrls : ticketUrls,
+            ),
+
           },
 
         }),
@@ -464,6 +500,10 @@ export class DevPlanService {
 
     }
 
+    if (dto.attachmentUrls !== undefined) {
+      data.attachmentUrls = attachmentUrlsInput(dto.attachmentUrls);
+    }
+
 
 
     await this.prisma.devPlanTask.update({ where: { id }, data });
@@ -1157,6 +1197,114 @@ export class DevPlanService {
 
   }
 
+  private buildTaskExportWhere(query: {
+    status?: string;
+    type?: string;
+    keyword?: string;
+  }): Prisma.DevPlanTaskWhereInput {
+    const where: Prisma.DevPlanTaskWhereInput = {};
+    if (query.status) where.status = query.status as DevPlanTaskStatus;
+    if (query.type) where.type = query.type as DevPlanTaskType;
+    if (query.keyword?.trim()) {
+      where.OR = [
+        { taskNo: { contains: query.keyword.trim() } },
+        { content: { contains: query.keyword.trim() } },
+      ];
+    }
+    return where;
+  }
+
+  async exportTasks(dto: {
+    scope: 'filter' | 'selected';
+    format: DevPlanExportFormat;
+    ids?: string[];
+    status?: string;
+    type?: string;
+    keyword?: string;
+  }) {
+    let rows: Array<{
+      id: bigint;
+      taskNo: string;
+      content: string;
+      type: DevPlanTaskType;
+      status: DevPlanTaskStatus;
+      creatorHqAccountId: bigint;
+      supportTicketId: bigint | null;
+      attachmentUrls: unknown;
+      createdAt: Date;
+      completedAt: Date | null;
+    }>;
+
+    if (dto.scope === 'selected') {
+      if (!dto.ids?.length) throw new BadRequestException('请先勾选要导出的任务');
+      const ids = dto.ids.map(BigInt);
+      rows = await this.prisma.devPlanTask.findMany({
+        where: { id: { in: ids } },
+        orderBy: { createdAt: 'desc' },
+      });
+      if (rows.length !== ids.length) throw new BadRequestException('部分任务不存在');
+    } else {
+      rows = await this.prisma.devPlanTask.findMany({
+        where: this.buildTaskExportWhere(dto),
+        orderBy: { createdAt: 'desc' },
+      });
+    }
+
+    if (!rows.length) throw new BadRequestException('没有可导出的任务');
+
+    const creatorIds = rows.map((r) => r.creatorHqAccountId);
+    const ticketIds = rows.map((r) => r.supportTicketId).filter((id): id is bigint => id != null);
+    const [names, tickets] = await Promise.all([
+      this.loadHqNames(creatorIds),
+      ticketIds.length
+        ? this.prisma.commonSupportTicket.findMany({
+            where: { id: { in: ticketIds } },
+            select: { id: true, ticketNo: true },
+          })
+        : Promise.resolve([]),
+    ]);
+    const ticketMap = new Map(tickets.map((t) => [String(t.id), t.ticketNo] as [string, string]));
+
+    const exportRows = rows.map((r) =>
+      mapTaskToExportRow({
+        taskNo: r.taskNo,
+        type: r.type,
+        status: r.status,
+        content: r.content,
+        supportTicketNo: r.supportTicketId != null ? ticketMap.get(String(r.supportTicketId)) ?? null : null,
+        creatorName: names.get(String(r.creatorHqAccountId)) ?? null,
+        createdAt: r.createdAt.toISOString(),
+        completedAt: r.completedAt?.toISOString() ?? null,
+        attachmentUrls: parseAttachmentUrls(r.attachmentUrls),
+      }),
+    );
+
+    let buffer: Buffer;
+    switch (dto.format) {
+      case 'markdown':
+        buffer = buildDevPlanMarkdown(exportRows);
+        break;
+      case 'docx':
+        buffer = await buildDevPlanDocx(exportRows);
+        break;
+      case 'xlsx':
+        buffer = await buildDevPlanXlsx(exportRows);
+        break;
+      case 'pdf':
+        buffer = await buildDevPlanPdf(exportRows);
+        break;
+      default:
+        throw new BadRequestException('不支持的导出格式');
+    }
+
+    return {
+      filename: buildDevPlanExportFilename(dto.format, exportRows.length),
+      mimeType: devPlanExportMimeType(dto.format),
+      contentBase64: buffer.toString('base64'),
+      count: exportRows.length,
+    };
+  }
+
 }
 
 

server/dukang-api/src/modules/dev-plan/dto/dev-plan.dto.ts

@@ -37,6 +37,11 @@ export class CreateDevPlanTaskDto {
   @IsOptional()
   @IsString()
   supportTicketId?: string;
+
+  @IsOptional()
+  @IsArray()
+  @IsString({ each: true })
+  attachmentUrls?: string[];
 }
 
 export class UpdateDevPlanTaskDto {
@@ -52,6 +57,11 @@ export class UpdateDevPlanTaskDto {
   @IsOptional()
   @IsIn(DEV_PLAN_TASK_STATUSES)
   status?: string;
+
+  @IsOptional()
+  @IsArray()
+  @IsString({ each: true })
+  attachmentUrls?: string[];
 }
 
 export class CreateDevPlanVersionDto {
@@ -131,6 +141,11 @@ export class DevPlanTaskFromTicketDto {
 
   @IsIn(DEV_PLAN_TASK_TYPES)
   type!: 'BUG' | 'REQUIREMENT' | 'OPTIMIZATION';
+
+  @IsOptional()
+  @IsArray()
+  @IsString({ each: true })
+  attachmentUrls?: string[];
 }
 
 export class ReviewSupportTicketDto {
@@ -177,6 +192,32 @@ export class DevPlanTaskBatchUpdateDto {
   versionId?: string | null;
 }
 
+export class DevPlanTaskExportDto {
+  @IsIn(['filter', 'selected'])
+  scope!: 'filter' | 'selected';
+
+  @IsIn(['markdown', 'docx', 'xlsx', 'pdf'])
+  format!: 'markdown' | 'docx' | 'xlsx' | 'pdf';
+
+  @ValidateIf((o: DevPlanTaskExportDto) => o.scope === 'selected')
+  @IsArray()
+  @ArrayMinSize(1)
+  @IsString({ each: true })
+  ids?: string[];
+
+  @IsOptional()
+  @IsString()
+  status?: string;
+
+  @IsOptional()
+  @IsString()
+  type?: string;
+
+  @IsOptional()
+  @IsString()
+  keyword?: string;
+}
+
 export class BatchReviewPreviewDto {
   @IsArray()
   @IsString({ each: true })

server/dukang-api/src/modules/ops/admin-order-export.util.ts

@@ -0,0 +1,211 @@
+import { ORDER_STATUS_LABELS } from '@dukang/shared-types';
+import ExcelJS from 'exceljs';
+import * as fs from 'fs';
+import * as path from 'path';
+import PDFDocument from 'pdfkit';
+
+const EXPORT_HEADERS = [
+  '订单号',
+  '下单时间',
+  '状态',
+  '商品',
+  '规格',
+  '数量',
+  '实付',
+  '好客权益',
+  '收货人',
+  '手机',
+  '收货地址',
+] as const;
+
+export type OrderExportRow = {
+  orderNo: string;
+  createdAt: string;
+  status: string;
+  productName: string;
+  productSpec: string;
+  quantity: number;
+  payAmount: number;
+  benefitBrief: string;
+  receiverName: string;
+  receiverPhone: string;
+  address: string;
+};
+
+function formatBenefitBrief(order: {
+  benefitAmount?: { toString(): string } | number | null;
+  benefitCoupon?: {
+    totalAmount?: { toString(): string } | number;
+    usedAmount?: { toString(): string } | number;
+    balance?: { toString(): string } | number;
+  } | null;
+}): string {
+  const coupon = order.benefitCoupon;
+  if (coupon) {
+    return `总额¥${Number(coupon.totalAmount).toFixed(2)} / 已用¥${Number(coupon.usedAmount).toFixed(2)} / 余¥${Number(coupon.balance).toFixed(2)}`;
+  }
+  if (order.benefitAmount != null) return `¥${Number(order.benefitAmount).toFixed(2)}`;
+  return '';
+}
+
+export function formatExportDateTime(value?: Date | null): string {
+  if (!value) return '';
+  return value.toISOString().slice(0, 19).replace('T', ' ');
+}
+
+export function mapOrderToExportRow(order: {
+  orderNo: string;
+  createdAt: Date;
+  status: string;
+  productName: string;
+  productSpec: string;
+  quantity: number;
+  payAmount: { toString(): string } | number;
+  benefitAmount?: { toString(): string } | number | null;
+  receiverName: string;
+  receiverPhone: string;
+  receiverProvince: string;
+  receiverCity: string;
+  receiverDistrict: string;
+  receiverAddress: string;
+  benefitCoupon?: {
+    totalAmount?: { toString(): string } | number;
+    usedAmount?: { toString(): string } | number;
+    balance?: { toString(): string } | number;
+  } | null;
+  deliveryType?: string;
+}): OrderExportRow {
+  const isOnSite =
+    order.deliveryType === 'ON_SITE_PICKUP' ||
+    order.receiverAddress === '现场取货' ||
+    order.receiverAddress === '现场提货' ||
+    (order.receiverProvince === '现场' && order.receiverCity === '现场');
+  const address = isOnSite
+    ? '现场取货'
+    : `${order.receiverProvince}${order.receiverCity}${order.receiverDistrict}${order.receiverAddress}`;
+  return {
+    orderNo: order.orderNo,
+    createdAt: formatExportDateTime(order.createdAt),
+    status: ORDER_STATUS_LABELS[order.status] || order.status,
+    productName: order.productName,
+    productSpec: order.productSpec,
+    quantity: order.quantity,
+    payAmount: Number(order.payAmount),
+    benefitBrief: formatBenefitBrief(order),
+    receiverName: order.receiverName,
+    receiverPhone: order.receiverPhone,
+    address,
+  };
+}
+
+export function rowToCells(row: OrderExportRow): string[] {
+  return [
+    row.orderNo,
+    row.createdAt,
+    row.status,
+    row.productName,
+    row.productSpec,
+    String(row.quantity),
+    row.payAmount.toFixed(2),
+    row.benefitBrief,
+    row.receiverName,
+    row.receiverPhone,
+    row.address,
+  ];
+}
+
+function resolvePdfFontPath(): string {
+  const candidates = [
+    process.env.EXPORT_PDF_FONT_PATH,
+    path.join(process.cwd(), 'assets', 'fonts', 'NotoSansSC-Regular.otf'),
+    path.join(process.cwd(), 'assets', 'fonts', 'simhei.ttf'),
+    path.join(process.cwd(), 'assets', 'fonts', 'msyh.ttc'),
+    path.join(process.cwd(), 'dist', 'assets', 'fonts', 'simhei.ttf'),
+    '/usr/share/fonts/truetype/noto/NotoSansCJK-Regular.ttc',
+    '/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc',
+    'C:\\Windows\\Fonts\\simhei.ttf',
+    'C:\\Windows\\Fonts\\msyh.ttc',
+  ].filter(Boolean) as string[];
+
+  for (const candidate of candidates) {
+    if (fs.existsSync(candidate)) return candidate;
+  }
+  throw new Error('未找到可用于 PDF 的中文字体，请将字体文件放到 server/dukang-api/assets/fonts/');
+}
+
+export async function buildOrdersXlsx(rows: OrderExportRow[]): Promise<Buffer> {
+  const workbook = new ExcelJS.Workbook();
+  const sheet = workbook.addWorksheet('订单');
+  sheet.addRow([...EXPORT_HEADERS]);
+  for (const row of rows) {
+    sheet.addRow(rowToCells(row));
+  }
+  sheet.columns.forEach((col) => {
+    col.width = 16;
+  });
+  sheet.getColumn(4).width = 22;
+  sheet.getColumn(8).width = 36;
+  sheet.getColumn(11).width = 36;
+  const buffer = await workbook.xlsx.writeBuffer();
+  return Buffer.from(buffer);
+}
+
+export async function buildOrdersPdf(rows: OrderExportRow[]): Promise<Buffer> {
+  const fontPath = resolvePdfFontPath();
+  const chunks: Buffer[] = [];
+
+  return new Promise((resolve, reject) => {
+    const doc = new PDFDocument({
+      size: 'A4',
+      layout: 'landscape',
+      margin: 24,
+      bufferPages: true,
+    });
+    doc.on('data', (chunk) => chunks.push(chunk as Buffer));
+    doc.on('end', () => resolve(Buffer.concat(chunks)));
+    doc.on('error', reject);
+
+    doc.registerFont('zh', fontPath);
+    doc.font('zh');
+
+    const pageWidth = doc.page.width - doc.page.margins.left - doc.page.margins.right;
+    const colWidths = [72, 78, 48, 88, 64, 32, 48, 110, 48, 72, 120];
+    const scale = pageWidth / colWidths.reduce((sum, w) => sum + w, 0);
+    const widths = colWidths.map((w) => w * scale);
+    const rowHeight = 28;
+    const fontSize = 7;
+    let y = doc.page.margins.top;
+
+    const drawRow = (cells: string[], isHeader = false) => {
+      let x = doc.page.margins.left;
+      const height = isHeader ? 24 : rowHeight;
+      if (y + height > doc.page.height - doc.page.margins.bottom) {
+        doc.addPage({ size: 'A4', layout: 'landscape', margin: 24 });
+        y = doc.page.margins.top;
+      }
+      doc.fontSize(isHeader ? 8 : fontSize);
+      cells.forEach((cell, index) => {
+        doc.rect(x, y, widths[index], height).stroke('#dddddd');
+        doc.text(cell || '', x + 2, y + 4, {
+          width: widths[index] - 4,
+          height: height - 6,
+          lineBreak: true,
+        });
+        x += widths[index];
+      });
+      y += height;
+    };
+
+    drawRow([...EXPORT_HEADERS], true);
+    for (const row of rows) {
+      drawRow(rowToCells(row));
+    }
+
+    doc.end();
+  });
+}
+
+export function buildExportFilename(format: 'xlsx' | 'pdf', count: number): string {
+  const stamp = new Date().toISOString().slice(0, 10);
+  return `订单导出_${stamp}_${count}条.${format}`;
+}

server/dukang-api/src/modules/ops/admin-orders.controller.ts

@@ -8,7 +8,7 @@ import { HqOperation } from '../../common/hq-operation/hq-operation.decorator';
 import { HqOperationAction } from '../../common/hq-operation/hq-operation.constants';
 import { AdminOrdersService } from './admin-orders.service';
 import { AdminShipOrderDto, BatchDeleteOrdersDto, HqLogisticsShipDto, UpdateOrderStatusDto } from './dto/admin-mutate.dto';
-import { AdminOrdersQueryDto } from './dto/admin-query.dto';
+import { AdminOrdersExportDto, AdminOrdersQueryDto } from './dto/admin-query.dto';
 
 @Controller('admin/orders')
 @UseGuards(HqAuthGuard)
@@ -26,6 +26,25 @@ export class AdminOrdersController {
     return this.ordersService.listBigScreen(limit);
   }
 
+  @Post('export/preview')
+  @UseGuards(HqPermissionGuard)
+  @RequireHqPermissions('orders')
+  previewExport(@Body() dto: AdminOrdersExportDto) {
+    return this.ordersService.previewExport(dto);
+  }
+
+  @Post('export')
+  @UseGuards(HqPermissionGuard)
+  @RequireHqPermissions('orders')
+  @HqOperation({
+    action: HqOperationAction.ORDER_EXPORT,
+    refType: 'ORDER',
+    includeBody: true,
+  })
+  exportOrders(@Body() dto: AdminOrdersExportDto) {
+    return this.ordersService.exportOrders(dto);
+  }
+
   @Post('batch-delete')
   @UseGuards(HqPermissionGuard)
   @RequireHqPermissions('orders_delete')

server/dukang-api/src/modules/ops/admin-orders.service.ts

@@ -7,12 +7,35 @@ import { orderStatusLogWhere } from '../../common/event/event.helpers';
 import { mapOrderCompat, mapStatusLogCompat } from '../../common/compat/v31-compat';
 import { TradeService } from '../trade/trade.service';
 import { AdminXiaofeixiaService } from './admin-xiaofeixia.service';
-import type { AdminOrdersQueryDto } from './dto/admin-query.dto';
+import type { AdminOrdersExportDto, AdminOrdersQueryDto } from './dto/admin-query.dto';
 import type { AdminShipOrderDto, HqLogisticsShipDto } from './dto/admin-mutate.dto';
 import type { XiaofeixiaCreateShipmentDto } from './dto/admin-courier.dto';
 import { FulfillmentService } from '../fulfillment/fulfillment.service';
 import { FulfillmentProviderService } from '../fulfillment/fulfillment-provider.service';
 import { AdminRedeemService } from './admin-redeem.service';
+import {
+  buildExportFilename,
+  buildOrdersPdf,
+  buildOrdersXlsx,
+  mapOrderToExportRow,
+} from './admin-order-export.util';
+
+const ORDER_EXPORT_MAX = 5000;
+
+type OrderFilterInput = Pick<
+  AdminOrdersQueryDto,
+  | 'orderNo'
+  | 'status'
+  | 'orderType'
+  | 'userId'
+  | 'cityId'
+  | 'receiverPhone'
+  | 'fulfillmentHold'
+  | 'createdFrom'
+  | 'createdTo'
+  | 'excludeTest'
+  | 'deliveryType'
+>;
 
 @Injectable()
 export class AdminOrdersService {
@@ -60,23 +83,7 @@ export class AdminOrdersService {
   async list(query: AdminOrdersQueryDto) {
     const page = query.page ?? 1;
     const pageSize = query.pageSize ?? 20;
-    const where: Prisma.OrderWhereInput = {};
-
-    if (query.orderNo) where.orderNo = { contains: query.orderNo };
-    if (query.status) where.status = query.status as Prisma.EnumOrderStatusFilter['equals'];
-    if (query.orderType) where.orderType = query.orderType as Prisma.EnumOrderTypeFilter['equals'];
-    if (query.userId) where.userId = BigInt(query.userId);
-    if (query.cityId) where.cityId = BigInt(query.cityId);
-    if (query.receiverPhone) where.receiverPhone = { contains: query.receiverPhone };
-    if (query.fulfillmentHold === true || query.fulfillmentHold === 'true') {
-      where.fulfillmentHold = true;
-    }
-    if (query.createdFrom || query.createdTo) {
-      where.createdAt = {};
-      if (query.createdFrom) where.createdAt.gte = new Date(query.createdFrom);
-      if (query.createdTo) where.createdAt.lte = new Date(query.createdTo);
-    }
-    if (query.excludeTest) where.isTest = false;
+    const where = this.buildOrderWhere(query);
 
     const [items, total] = await Promise.all([
       this.prisma.order.findMany({
@@ -89,6 +96,9 @@ export class AdminOrdersService {
           delivery: { select: { provider: true, trackingNo: true, providerOrderNo: true } },
           city: { select: { id: true, name: true, code: true } },
           fulfillmentWarehouse: { select: { id: true, name: true } },
+          benefitCoupon: {
+            select: { couponNo: true, totalAmount: true, usedAmount: true, balance: true, status: true },
+          },
         },
       }),
       this.prisma.order.count({ where }),
@@ -97,6 +107,114 @@ export class AdminOrdersService {
     return serializeBigInt({ items, total, page, pageSize });
   }
 
+  async previewExport(dto: AdminOrdersExportDto) {
+    const count = await this.countExportOrders(dto);
+    return { count, max: ORDER_EXPORT_MAX, exceeds: count > ORDER_EXPORT_MAX };
+  }
+
+  async exportOrders(dto: AdminOrdersExportDto) {
+    const count = await this.countExportOrders(dto);
+    if (count > ORDER_EXPORT_MAX) {
+      throw new BadRequestException(`超过 ${ORDER_EXPORT_MAX} 条，请缩小日期或筛选条件`);
+    }
+    if (count === 0) {
+      throw new BadRequestException('没有可导出的订单');
+    }
+
+    const orders = await this.prisma.order.findMany({
+      where: this.buildExportWhere(dto),
+      orderBy: { createdAt: 'desc' },
+      take: ORDER_EXPORT_MAX,
+      include: {
+        city: { select: { name: true } },
+        delivery: { select: { trackingNo: true } },
+        benefitCoupon: {
+          select: { totalAmount: true, usedAmount: true, balance: true },
+        },
+      },
+    });
+
+    const rows = orders.map((order) => mapOrderToExportRow(order));
+    const buffer =
+      dto.format === 'pdf' ? await buildOrdersPdf(rows) : await buildOrdersXlsx(rows);
+    const filename = buildExportFilename(dto.format, rows.length);
+    const mimeType =
+      dto.format === 'pdf'
+        ? 'application/pdf'
+        : 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+
+    return {
+      filename,
+      mimeType,
+      contentBase64: buffer.toString('base64'),
+      count: rows.length,
+    };
+  }
+
+  private buildOrderWhere(query: OrderFilterInput): Prisma.OrderWhereInput {
+    const where: Prisma.OrderWhereInput = {};
+
+    if (query.orderNo) where.orderNo = { contains: query.orderNo };
+    if (query.status) where.status = query.status as Prisma.EnumOrderStatusFilter['equals'];
+    if (query.orderType) where.orderType = query.orderType as Prisma.EnumOrderTypeFilter['equals'];
+    if (query.userId) where.userId = BigInt(query.userId);
+    if (query.cityId) where.cityId = BigInt(query.cityId);
+    if (query.receiverPhone) where.receiverPhone = { contains: query.receiverPhone };
+    if (query.deliveryType) {
+      where.deliveryType = query.deliveryType as Prisma.EnumDeliveryTypeFilter['equals'];
+    }
+    if (query.fulfillmentHold === true || query.fulfillmentHold === 'true') {
+      where.fulfillmentHold = true;
+    }
+    if (query.createdFrom || query.createdTo) {
+      where.createdAt = {};
+      if (query.createdFrom) where.createdAt.gte = new Date(query.createdFrom);
+      if (query.createdTo) where.createdAt.lte = this.endOfDay(query.createdTo);
+    }
+    if (query.excludeTest) where.isTest = false;
+
+    return where;
+  }
+
+  private buildExportWhere(dto: AdminOrdersExportDto): Prisma.OrderWhereInput {
+    if (dto.scope === 'selected') {
+      const ids = (dto.ids ?? []).map((id) => BigInt(id));
+      if (!ids.length) {
+        throw new BadRequestException('请先勾选要导出的订单');
+      }
+      return { id: { in: ids } };
+    }
+
+    const normalized = this.normalizeExportFilter(dto);
+    return this.buildOrderWhere(normalized);
+  }
+
+  private async countExportOrders(dto: AdminOrdersExportDto): Promise<number> {
+    return this.prisma.order.count({ where: this.buildExportWhere(dto) });
+  }
+
+  private normalizeExportFilter(dto: AdminOrdersExportDto): OrderFilterInput {
+    const createdFrom = dto.createdFrom;
+    const createdTo = dto.createdTo;
+    if (!createdFrom && !createdTo) {
+      const from = new Date();
+      from.setDate(from.getDate() - 30);
+      from.setHours(0, 0, 0, 0);
+      return {
+        ...dto,
+        createdFrom: from.toISOString().slice(0, 10),
+        createdTo: new Date().toISOString().slice(0, 10),
+      };
+    }
+    return { ...dto, createdFrom, createdTo };
+  }
+
+  private endOfDay(dateStr: string): Date {
+    const end = new Date(dateStr);
+    end.setHours(23, 59, 59, 999);
+    return end;
+  }
+
   async getOrderTrack(id: bigint) {
     const order = await this.prisma.order.findUnique({
       where: { id },

server/dukang-api/src/modules/ops/admin-products.service.ts

@@ -86,7 +86,19 @@ export class AdminProductsService {
     const page = query.page ?? 1;
     const pageSize = query.pageSize ?? 20;
     const where: Prisma.CommonProductItemWhereInput = {};
-    if (query.name) where.name = { contains: query.name };
+    if (query.name?.trim()) {
+      const kw = query.name.trim();
+      where.OR = [
+        { name: { contains: kw } },
+        {
+          skus: {
+            some: {
+              OR: [{ skuCode: { contains: kw } }, { barcode69: { contains: kw } }],
+            },
+          },
+        },
+      ];
+    }
     if (query.status) where.status = query.status as Prisma.EnumProductStatusFilter['equals'];
     if (query.aromaType) where.aromaType = query.aromaType as Prisma.EnumAromaTypeFilter['equals'];
 
@@ -99,7 +111,25 @@ export class AdminProductsService {
         include: {
           coverResource: true,
           visibilityPhones: { select: { phone: true }, orderBy: { phone: 'asc' } },
-          skus: { select: { id: true }, take: 2 },
+          skus: {
+            orderBy: [{ sortOrder: 'asc' }, { id: 'asc' }],
+            select: {
+              id: true,
+              skuCode: true,
+              barcode69: true,
+              specText: true,
+              price: true,
+              benefitAmount: true,
+              status: true,
+              isDefault: true,
+              sortOrder: true,
+              allowOnSitePickup: true,
+              allowOnlinePurchase: true,
+              allowCrossCityDelivery: true,
+              saleUnit: true,
+              bottlesPerUnit: true,
+            },
+          },
           specAttrs: { select: { id: true } },
         },
       }),
@@ -120,13 +150,101 @@ export class AdminProductsService {
       : [];
     const resourceMap = groupResourcesByProductId(resources);
 
+    /** productId → skuIdKey → bottles；skuIdKey 用 '' 表示历史无 sku */
+    const soldByProductSku = new Map<string, Map<string, number>>();
+    if (productIds.length) {
+      const saleOrders = await this.prisma.order.findMany({
+        where: {
+          productId: { in: productIds },
+          payStatus: 'PAID',
+          isTest: false,
+          status: { notIn: ['PENDING_PAY', 'CANCELLED', 'REFUNDED'] },
+        },
+        select: {
+          productId: true,
+          skuId: true,
+          quantity: true,
+          bottlesPerUnit: true,
+        },
+      });
+      for (const o of saleOrders) {
+        const pid = o.productId.toString();
+        const sid = o.skuId?.toString() ?? '';
+        const bottles = o.quantity * (o.bottlesPerUnit > 0 ? o.bottlesPerUnit : 1);
+        let bySku = soldByProductSku.get(pid);
+        if (!bySku) {
+          bySku = new Map();
+          soldByProductSku.set(pid, bySku);
+        }
+        bySku.set(sid, (bySku.get(sid) ?? 0) + bottles);
+      }
+    }
+
     return serializeBigInt({
       items: items.map((p) => {
         const { skus, specAttrs, ...rest } = p;
+        const formatted = this.formatProduct(rest as never, resourceMap.get(p.id.toString()) ?? []);
+        const prices = skus.length
+          ? skus.map((s) => Number(s.price))
+          : [Number(p.price)];
+        const priceMin = Math.min(...prices);
+        const priceMax = Math.max(...prices);
+        const pid = p.id.toString();
+        const bySku = soldByProductSku.get(pid);
+        let soldBottles = 0;
+        if (bySku) {
+          for (const n of bySku.values()) soldBottles += n;
+        }
+
+        const skuRows =
+          skus.length > 0
+            ? skus.map((s) => ({
+                id: s.id.toString(),
+                skuCode: s.skuCode,
+                barcode69: s.barcode69,
+                specText: s.specText,
+                price: Number(s.price),
+                benefitAmount: Number(s.benefitAmount ?? s.price),
+                status: s.status,
+                isDefault: s.isDefault,
+                sortOrder: s.sortOrder,
+                allowOnSitePickup: s.allowOnSitePickup,
+                allowOnlinePurchase: s.allowOnlinePurchase,
+                allowCrossCityDelivery: s.allowCrossCityDelivery,
+                saleUnit: s.saleUnit,
+                bottlesPerUnit: s.bottlesPerUnit,
+                soldBottles: bySku?.get(s.id.toString()) ?? 0,
+                virtual: false,
+              }))
+            : [
+                {
+                  id: `virtual-${pid}`,
+                  skuCode: p.skuCode,
+                  barcode69: p.barcode69,
+                  specText: p.spec,
+                  price: Number(p.price),
+                  benefitAmount: Number(p.benefitAmount ?? p.price),
+                  status: p.status,
+                  isDefault: true,
+                  sortOrder: 0,
+                  allowOnSitePickup: p.allowOnSitePickup,
+                  allowOnlinePurchase: p.allowOnlinePurchase,
+                  allowCrossCityDelivery: p.allowCrossCityDelivery,
+                  saleUnit: 'BOTTLE' as const,
+                  bottlesPerUnit: 1,
+                  soldBottles,
+                  virtual: true,
+                },
+              ];
+
         return {
-          ...this.formatProduct(rest as never, resourceMap.get(p.id.toString()) ?? []),
+          ...formatted,
           specEnabled: specAttrs.length > 0 || skus.length > 1,
           skuCount: skus.length,
+          priceMin,
+          priceMax,
+          soldBottles,
+          skus: skuRows,
         };
       }),
       total,
@@ -246,10 +364,14 @@ export class AdminProductsService {
     const existing = await this.prisma.commonProductItem.findUnique({ where: { id } });
     if (!existing) throw new NotFoundException('商品不存在');
 
+    const skuCount = await this.prisma.commonProductSku.count({ where: { productId: id } });
+    /** 多规格时履约只在规格 SKU 上改；忽略基础信息里的履约字段，避免误覆盖默认 SKU 冗余 */
+    const applyFulfillment = skuCount <= 1;
     const fulfillmentTouched =
-      dto.allowOnlinePurchase !== undefined ||
-      dto.allowCrossCityDelivery !== undefined ||
-      dto.allowOnSitePickup !== undefined;
+      applyFulfillment &&
+      (dto.allowOnlinePurchase !== undefined ||
+        dto.allowCrossCityDelivery !== undefined ||
+        dto.allowOnSitePickup !== undefined);
     const flags = fulfillmentTouched
       ? resolveFulfillmentFlags({
           allowOnlinePurchase: dto.allowOnlinePurchase,
@@ -555,7 +677,8 @@ export class AdminProductsService {
               bottlesPerUnit,
               isDefault: !!row.isDefault,
               sortOrder: row.sortOrder ?? i,
-            },
+              imageUrl: row.imageUrl?.trim() || null,
+            } as never,
           });
           await tx.commonProductSkuSpec.deleteMany({ where: { skuId } });
         } else {
@@ -574,7 +697,8 @@ export class AdminProductsService {
               bottlesPerUnit,
               isDefault: !!row.isDefault,
               sortOrder: row.sortOrder ?? i,
-            },
+              imageUrl: row.imageUrl?.trim() || null,
+            } as never,
           });
           skuId = created.id;
         }

server/dukang-api/src/modules/ops/admin-redeem-debug.controller.ts

@@ -1,5 +1,9 @@
 import { Body, Controller, Post, UseGuards } from '@nestjs/common';
 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 { AdminRedeemDebugService } from './admin-redeem-debug.service';
@@ -13,7 +17,8 @@ import {
 } from './dto/admin-mutate.dto';
 
 @Controller('admin/redeem/debug')
-@UseGuards(HqAuthGuard)
+@UseGuards(HqAuthGuard, HqPermissionGuard)
+@RequireHqPermissions('benefit_debug')
 export class AdminRedeemDebugController {
   constructor(private readonly service: AdminRedeemDebugService) {}
 

server/dukang-api/src/modules/ops/admin-redeem.service.ts

@@ -2,6 +2,7 @@ import { Injectable, NotFoundException } from '@nestjs/common';
 import type { DeliveryProvider } from '@prisma/client';
 import { Prisma } from '@prisma/client';
 import { PrismaService } from '../../common/prisma/prisma.module';
+import { loadStorePrimaryBank } from '../../common/store/store-bank.util';
 import { serializeBigInt } from '../../common/decorators/current-user.decorator';
 import type { AdminDeliveriesQueryDto, AdminRedeemRecordsQueryDto } from './dto/admin-query.dto';
 import type { UpdateDeliveryDto } from './dto/admin-mutate.dto';
@@ -113,8 +114,13 @@ export class AdminRedeemService {
       },
     });
     if (!record) throw new NotFoundException('核销记录不存在');
+    const primaryAccount = await loadStorePrimaryBank(this.prisma, record.storeId);
     return serializeBigInt({
       ...record,
+      store: {
+        ...record.store,
+        primaryAccount,
+      },
       allocations: record.allocations.map((a) => ({
         couponId: a.couponId,
         amount: Number(a.amount),

server/dukang-api/src/modules/ops/admin-xiaofeixia.controller.ts

@@ -1,5 +1,9 @@
 import { Body, Controller, Get, Post, UseGuards } from '@nestjs/common';
 import { HqAuthGuard } from '../../common/guards/hq-auth.guard';
+import {
+  HqPermissionGuard,
+  RequireHqPermissions,
+} from '../../common/guards/hq-permission.guard';
 import { AdminXiaofeixiaService } from './admin-xiaofeixia.service';
 import {
   XiaofeixiaBatchShipmentQueryDto,
@@ -11,7 +15,8 @@ import {
 
 /** HQ 小飞侠接口联调（仅管理端，勿对 C 端暴露） */
 @Controller('admin/courier/xiaofeixia')
-@UseGuards(HqAuthGuard)
+@UseGuards(HqAuthGuard, HqPermissionGuard)
+@RequireHqPermissions('deliveries_debug')
 export class AdminXiaofeixiaController {
   constructor(private readonly service: AdminXiaofeixiaService) {}
 

server/dukang-api/src/modules/ops/dto/admin-mutate.dto.ts

@@ -9,6 +9,7 @@ import {
   IsObject,
   IsOptional,
   IsString,
+  MaxLength,
   Min,
   Max,
   MinLength,
@@ -1400,6 +1401,12 @@ class AdminSkuRowDto {
   @IsOptional()
   @IsNumber()
   sortOrder?: number;
+
+  /** 规格主图 URL；空则回落商品封面 */
+  @IsOptional()
+  @IsString()
+  @MaxLength(512)
+  imageUrl?: string | null;
 }
 
 export class SaveProductSkusDto {

server/dukang-api/src/modules/ops/dto/admin-query.dto.ts

@@ -1,5 +1,5 @@
 import { Type, Transform } from 'class-transformer';
-import { IsBoolean, IsIn, IsInt, IsOptional, IsString, Max, Min } from 'class-validator';
+import { IsArray, IsBoolean, IsIn, IsInt, IsOptional, IsString, Max, Min } from 'class-validator';
 
 function toOptionalBoolean(value: unknown): boolean | undefined {
   if (value === undefined || value === null || value === '') return undefined;
@@ -93,6 +93,66 @@ export class AdminOrdersQueryDto extends PaginationQueryDto {
   @Transform(({ value }) => toOptionalBoolean(value))
   @IsBoolean()
   excludeTest?: boolean;
+
+  @IsOptional()
+  @IsIn(['LOCAL', 'CROSS_CITY', 'ON_SITE_PICKUP'])
+  deliveryType?: string;
+}
+
+/** HQ 订单导出（筛选 + 勾选范围） */
+export class AdminOrdersExportDto {
+  @IsIn(['filter', 'selected'])
+  scope: 'filter' | 'selected';
+
+  @IsIn(['xlsx', 'pdf'])
+  format: 'xlsx' | 'pdf';
+
+  @IsOptional()
+  @IsArray()
+  @IsString({ each: true })
+  ids?: string[];
+
+  @IsOptional()
+  @IsString()
+  orderNo?: string;
+
+  @IsOptional()
+  @IsString()
+  status?: string;
+
+  @IsOptional()
+  @IsIn(['NORMAL', 'PROXY', 'RESHIPMENT'])
+  orderType?: string;
+
+  @IsOptional()
+  @IsString()
+  cityId?: string;
+
+  @IsOptional()
+  @IsString()
+  receiverPhone?: string;
+
+  @IsOptional()
+  @Transform(({ value }) => toOptionalBoolean(value))
+  @IsBoolean()
+  fulfillmentHold?: boolean;
+
+  @IsOptional()
+  @IsString()
+  createdFrom?: string;
+
+  @IsOptional()
+  @IsString()
+  createdTo?: string;
+
+  @IsOptional()
+  @Transform(({ value }) => toOptionalBoolean(value))
+  @IsBoolean()
+  excludeTest?: boolean;
+
+  @IsOptional()
+  @IsIn(['LOCAL', 'CROSS_CITY', 'ON_SITE_PICKUP'])
+  deliveryType?: string;
 }
 
 /** 概览页用户/订单 ECharts 聚合筛选 */

server/dukang-api/src/modules/settlement/settlement.controller.ts

@@ -302,8 +302,8 @@ export class AdminStoreBillController {
     refType: 'STORE_BILL',
     refIdParam: 'id',
   })
-  confirm(@Param('id') id: string) {
-    return this.settlementService.confirmStoreBill(BigInt(id));
+  confirm(@Param('id') id: string, @Body() body: { paymentRef?: string }) {
+    return this.settlementService.confirmStoreBill(BigInt(id), body);
   }
 }
 
@@ -485,8 +485,8 @@ export class AdminWineryBillController {
     refType: 'WINERY_BILL',
     refIdParam: 'id',
   })
-  confirm(@Param('id') id: string) {
-    return this.settlementService.confirmWineryBill(BigInt(id));
+  confirm(@Param('id') id: string, @Body() body: { paymentRef?: string }) {
+    return this.settlementService.confirmWineryBill(BigInt(id), body);
   }
 }
 
@@ -565,8 +565,8 @@ export class AdminLogisticsBillController {
     refType: 'LOGISTICS_BILL',
     refIdParam: 'id',
   })
-  confirm(@Param('id') id: string) {
-    return this.settlementService.confirmLogisticsBill(BigInt(id));
+  confirm(@Param('id') id: string, @Body() body: { paymentRef?: string }) {
+    return this.settlementService.confirmLogisticsBill(BigInt(id), body);
   }
 }
 

server/dukang-api/src/modules/settlement/settlement.service.ts

@@ -22,6 +22,11 @@ import { WecomMessagePushService } from '../../integrations/wecom/wecom-message-
 import { AnalyticsService } from '../analytics/analytics.service';
 import { PartnerCityService } from '../city-scope/partner-city.service';
 import { FulfillmentProviderService } from '../fulfillment/fulfillment-provider.service';
+import {
+  loadStorePrimaryBank,
+  loadStorePrimaryBanksMap,
+  loadWineryBankConfig,
+} from '../../common/store/store-bank.util';
 
 function generateBillNo(prefix: string) {
   return `${prefix}${Date.now()}${Math.floor(Math.random() * 900 + 100)}`;
@@ -1043,11 +1048,20 @@ export class SettlementService {
 
     const total = rows.length;
     const slice = rows.slice((page - 1) * pageSize, page * pageSize);
+    const storeIds = [...new Set(rows.filter((r) => r.kind === 'T1_BILL').map((r) => r.storeId))];
+    const bankMap = await loadStorePrimaryBanksMap(this.prisma, storeIds);
+
     const redeemAmount = bills.reduce((s, b) => s + Number(b.redeemAmount), 0);
     const payoutAmount = rows.reduce((s, r) => s + r.amount, 0);
 
     return serializeBigInt({
-      items: slice,
+      items: slice.map((r) => ({
+        ...r,
+        bankAccount:
+          r.kind === 'T1_BILL'
+            ? bankMap.get(String(r.storeId)) ?? null
+            : null,
+      })),
       total,
       page,
       pageSize,
@@ -1112,10 +1126,11 @@ export class SettlementService {
       },
     });
     if (!bill) throw new NotFoundException('门店对账单不存在');
-    return serializeBigInt(bill);
+    const storeAccount = await loadStorePrimaryBank(this.prisma, bill.storeId);
+    return serializeBigInt({ ...bill, storeAccount });
   }
 
-  async confirmStoreBill(id: bigint) {
+  async confirmStoreBill(id: bigint, dto: { paymentRef?: string } = {}) {
     const bill = await this.prisma.storeBill.findUnique({ where: { id } });
     if (!bill) throw new NotFoundException('门店对账单不存在');
     if (bill.status !== 'UNPAID') throw new BadRequestException('仅未打款账单可确认打款');
@@ -1124,7 +1139,11 @@ export class SettlementService {
     const updated = await this.prisma.$transaction(async (tx) => {
       const b = await tx.storeBill.update({
         where: { id },
-        data: { status: 'PAID', paidAt },
+        data: {
+          status: 'PAID',
+          paidAt,
+          paymentRef: dto.paymentRef?.trim() || null,
+        },
       });
       await tx.storePayout.updateMany({
         where: { storeBillId: id, status: 'PENDING' },
@@ -1157,12 +1176,32 @@ export class SettlementService {
     const where = this.buildStoreBillWhere(query);
     const bills = await this.prisma.storeBill.findMany({
       where,
-      include: { store: { select: { name: true, phone: true, cityName: true } } },
+      include: { store: { select: { id: true, name: true, phone: true, cityName: true } } },
       orderBy: { billDate: 'desc' },
     });
-    const header = ['账单号', '账单日', '门店', '城市', '核销笔数', '核销金额', '结算比例', '应付金额', '状态', '打款时间'].join(',');
-    const rows = bills.map((b) =>
-      [
+    const bankMap = await loadStorePrimaryBanksMap(
+      this.prisma,
+      bills.map((b) => b.storeId),
+    );
+    const header = [
+      '账单号',
+      '账单日',
+      '门店',
+      '城市',
+      '核销笔数',
+      '核销金额',
+      '结算比例',
+      '应付金额',
+      '状态',
+      '打款时间',
+      '打款凭证',
+      '收款户名',
+      '收款账号',
+      '开户行',
+    ].join(',');
+    const rows = bills.map((b) => {
+      const bank = bankMap.get(String(b.storeId));
+      return [
         csvEscape(b.billNo),
         b.billDate.toISOString().slice(0, 10),
         csvEscape(b.store.name),
@@ -1173,8 +1212,12 @@ export class SettlementService {
         Number(b.payoutAmount),
         b.status,
         b.paidAt ? b.paidAt.toISOString().slice(0, 19).replace('T', ' ') : '',
-      ].join(','),
-    );
+        csvEscape(b.paymentRef ?? ''),
+        csvEscape(bank?.bankAccountName ?? ''),
+        csvEscape(bank?.bankAccountNo ?? ''),
+        csvEscape(bank?.bankBranch ?? ''),
+      ].join(',');
+    });
     return { csv: `\uFEFF${[header, ...rows].join('\n')}`, count: bills.length };
   }
 
@@ -1262,7 +1305,15 @@ export class SettlementService {
         take: pageSize,
         include: {
           partnerAccount: {
-            select: { id: true, companyName: true, name: true, phone: true },
+            select: {
+              id: true,
+              companyName: true,
+              name: true,
+              phone: true,
+              bankAccountName: true,
+              bankAccountNo: true,
+              bankBranch: true,
+            },
           },
         },
       }),
@@ -1553,14 +1604,19 @@ export class SettlementService {
     return serializeBigInt(updated);
   }
 
-  async markPartnerBillPaid(id: bigint, _dto: { paymentRef?: string } = {}) {
+  async markPartnerBillPaid(id: bigint, dto: { paymentRef?: string } = {}) {
     const bill = await this.prisma.partnerBill.findUnique({ where: { id } });
     if (!bill) throw new NotFoundException('账单不存在');
     if (bill.status !== 'UNPAID') throw new BadRequestException('仅未打款账单可标记打款');
 
     const updated = await this.prisma.partnerBill.update({
       where: { id },
-      data: { status: 'PAID', paidAt: new Date(), rejectReason: null },
+      data: {
+        status: 'PAID',
+        paidAt: new Date(),
+        rejectReason: null,
+        paymentRef: dto.paymentRef?.trim() || null,
+      },
     });
 
     return serializeBigInt(updated);
@@ -1588,7 +1644,17 @@ export class SettlementService {
     const where = this.buildPartnerBillWhere(query);
     const bills = await this.prisma.partnerBill.findMany({
       where,
-      include: { partnerAccount: { select: { companyName: true, phone: true } } },
+      include: {
+        partnerAccount: {
+          select: {
+            companyName: true,
+            phone: true,
+            bankAccountName: true,
+            bankAccountNo: true,
+            bankBranch: true,
+          },
+        },
+      },
       orderBy: { periodStart: 'desc' },
     });
 
@@ -1605,6 +1671,10 @@ export class SettlementService {
       '发送时间',
       '确认时间',
       '打款时间',
+      '打款凭证',
+      '收款户名',
+      '收款账号',
+      '开户行',
       '驳回理由',
     ].join(',');
     const rows = bills.map((b) =>
@@ -1621,6 +1691,10 @@ export class SettlementService {
         b.sentAt ? b.sentAt.toISOString().slice(0, 10) : '',
         b.confirmedAt ? b.confirmedAt.toISOString().slice(0, 10) : '',
         b.paidAt ? b.paidAt.toISOString().slice(0, 10) : '',
+        csvEscape(b.paymentRef ?? ''),
+        csvEscape(b.partnerAccount.bankAccountName ?? ''),
+        csvEscape(b.partnerAccount.bankAccountNo ?? ''),
+        csvEscape(b.partnerAccount.bankBranch ?? ''),
         csvEscape(b.rejectReason ?? ''),
       ].join(','),
     );
@@ -1752,10 +1826,11 @@ export class SettlementService {
       include: { items: { orderBy: { paidAt: 'desc' } } },
     });
     if (!bill) throw new NotFoundException('酒厂对账单不存在');
-    return serializeBigInt(bill);
+    const wineryBank = await loadWineryBankConfig(this.prisma);
+    return serializeBigInt({ ...bill, wineryBank });
   }
 
-  async confirmWineryBill(id: bigint) {
+  async confirmWineryBill(id: bigint, dto: { paymentRef?: string } = {}) {
     const bill = await this.prisma.wineryBill.findUnique({ where: { id } });
     if (!bill) throw new NotFoundException('酒厂对账单不存在');
     if (bill.status !== 'UNPAID') throw new BadRequestException('仅未打款账单可确认打款');
@@ -1764,7 +1839,11 @@ export class SettlementService {
     }
     const updated = await this.prisma.wineryBill.update({
       where: { id },
-      data: { status: 'PAID', paidAt: new Date() },
+      data: {
+        status: 'PAID',
+        paidAt: new Date(),
+        paymentRef: dto.paymentRef?.trim() || null,
+      },
     });
     return serializeBigInt(updated);
   }
@@ -1795,6 +1874,7 @@ export class SettlementService {
       include: { items: true },
       orderBy: { billDate: 'desc' },
     });
+    const wineryBank = await loadWineryBankConfig(this.prisma);
 
     const header = [
       '账单号',
@@ -1806,6 +1886,11 @@ export class SettlementService {
       '应付',
       '支付时间',
       '账单状态',
+      '打款凭证',
+      '收款户名',
+      '开户银行',
+      '开户支行',
+      '收款账号',
     ].join(',');
     const rows: string[] = [];
     const statusLabel = (b: { status: string; wineryAmount: Prisma.Decimal | number }) => {
@@ -1814,6 +1899,13 @@ export class SettlementService {
       if (b.status === 'UNPAID') return '未打款';
       return b.status;
     };
+    const bankCols = (b: { paymentRef?: string | null }) => [
+      csvEscape(b.paymentRef ?? ''),
+      csvEscape(wineryBank.bankAccountName ?? ''),
+      csvEscape(wineryBank.bankName ?? ''),
+      csvEscape(wineryBank.bankBranch ?? ''),
+      csvEscape(wineryBank.bankAccountNo ?? ''),
+    ];
     for (const b of bills) {
       if (b.items.length === 0) {
         rows.push(
@@ -1827,6 +1919,7 @@ export class SettlementService {
             Number(b.wineryAmount),
             '',
             statusLabel(b),
+            ...bankCols(b),
           ].join(','),
         );
         continue;
@@ -1843,6 +1936,7 @@ export class SettlementService {
             Number(item.wineryAmount),
             item.paidAt.toISOString().slice(0, 19).replace('T', ' '),
             statusLabel(b),
+            ...bankCols(b),
           ].join(','),
         );
       }
@@ -2275,11 +2369,17 @@ export class SettlementService {
     });
   }
 
-  async confirmLogisticsBill(id: bigint) {
+  async confirmLogisticsBill(id: bigint, dto: { paymentRef?: string } = {}) {
     const bill = await this.prisma.logisticsBill.findUnique({ where: { id } });
     if (!bill) throw new NotFoundException('物流对账单不存在');
     if (bill.status !== 'UNPAID') throw new BadRequestException('仅未结算账单可确认');
 
+    const paidData = {
+      status: 'PAID' as const,
+      paidAt: new Date(),
+      paymentRef: dto.paymentRef?.trim() || null,
+    };
+
     if (bill.settlementMethod === 'PREPAID') {
       const deducted = await this.prisma.$transaction(async (tx) => {
         const result = await this.fulfillmentProviderService.deductPrepaid(
@@ -2295,7 +2395,7 @@ export class SettlementService {
         }
         return tx.logisticsBill.update({
           where: { id },
-          data: { status: 'PAID', paidAt: new Date() },
+          data: paidData,
         });
       });
       return serializeBigInt(deducted);
@@ -2303,7 +2403,7 @@ export class SettlementService {
 
     const updated = await this.prisma.logisticsBill.update({
       where: { id },
-      data: { status: 'PAID', paidAt: new Date() },
+      data: paidData,
     });
     return serializeBigInt(updated);
   }
@@ -2331,7 +2431,16 @@ export class SettlementService {
     const bills = await this.prisma.logisticsBill.findMany({
       where,
       include: {
-        fulfillmentProvider: { select: { code: true, name: true } },
+        fulfillmentProvider: {
+          select: {
+            code: true,
+            name: true,
+            bankAccountName: true,
+            bankName: true,
+            bankBranch: true,
+            bankAccountNo: true,
+          },
+        },
         items: true,
       },
       orderBy: { periodStart: 'desc' },
@@ -2349,15 +2458,28 @@ export class SettlementService {
       '物流费',
       '发货时间',
       '账单状态',
+      '打款凭证',
+      '收款户名',
+      '开户银行',
+      '开户支行',
+      '收款账号',
     ].join(',');
     const rows: string[] = [];
     for (const b of bills) {
+      const p = b.fulfillmentProvider;
+      const bankCols = [
+        csvEscape(b.paymentRef ?? ''),
+        csvEscape(p.bankAccountName ?? ''),
+        csvEscape(p.bankName ?? ''),
+        csvEscape(p.bankBranch ?? ''),
+        csvEscape(p.bankAccountNo ?? ''),
+      ];
       if (b.items.length === 0) {
         rows.push(
           [
             csvEscape(b.billNo),
-            csvEscape(b.fulfillmentProvider.code),
-            csvEscape(b.fulfillmentProvider.name),
+            csvEscape(p.code),
+            csvEscape(p.name),
             b.periodStart.toISOString().slice(0, 10),
             b.periodEnd.toISOString().slice(0, 10),
             b.settlementMethod,
@@ -2366,6 +2488,7 @@ export class SettlementService {
             Number(b.logisticsAmount),
             '',
             b.status,
+            ...bankCols,
           ].join(','),
         );
         continue;
@@ -2374,8 +2497,8 @@ export class SettlementService {
         rows.push(
           [
             csvEscape(b.billNo),
-            csvEscape(b.fulfillmentProvider.code),
-            csvEscape(b.fulfillmentProvider.name),
+            csvEscape(p.code),
+            csvEscape(p.name),
             b.periodStart.toISOString().slice(0, 10),
             b.periodEnd.toISOString().slice(0, 10),
             b.settlementMethod,
@@ -2384,6 +2507,7 @@ export class SettlementService {
             Number(item.logisticsAmount),
             item.shippedAt.toISOString().slice(0, 19).replace('T', ' '),
             b.status,
+            ...bankCols,
           ].join(','),
         );
       }