merge: refactor/public-capacity-10k-yeuimu into develop (P0 性能整改——public 读路径分域缓存+全写路径失效、nginx 承压调优、连接池/PG 参数，已部署验证)

- 主配置 nginx.conf 进镜像（worker_connections 16384 + rlimit 65536 + gzip
  + 带上游耗时的访问日志）：官方默认 1024×4=4096 连接硬顶是 1w 并发第一道墙
- admin.conf：upstream keepalive 64（proxy_http 1.1 + Connection ""）、
  /public/ /v2-api/ 限流 50r/s burst 200（429）、代理超时 5s/30s、
  /uploads/ /assets/ 30d 缓存头；admin.v2.conf 的 /v2/h5/ 哈希产物长缓存
- compose：PG 显式参数（statement_timeout=10s/max_connections=200/
  shared_buffers=512MB）、DATABASE_URL connection_limit=50&pool_timeout=3
  （单位秒，勿写毫秒；勿加 statement_cache_size=0）、admin ulimits nofile 65536
- 部署注意：主配置走镜像须 rebuild；PG 参数重启前按全局约束 pg_dump+快照存档

.dockerignore

@@ -0,0 +1,26 @@
+# 依赖与包管理缓存（容器内会重新安装，禁止从宿主机带入）
+node_modules
+**/node_modules
+.pnpm-store
+.pnpm-debug.log
+
+# 构建产物
+dist
+**/dist
+.turbo
+
+# Git 与本地文件
+.git
+.gitignore
+.dockerignore
+
+# 测试与文档
+coverage
+**/*.spec.ts
+**/*.test.ts
+
+# 运行数据与本地产物
+data-cleaning
+deploy/backups
+apps/api/uploads
+*.log

.gitignore

@@ -8,3 +8,6 @@ dist/
 deploy/certbot/
 deploy/data-dump.json
 uploads/
+.pnpm-store/
+data-cleaning/
+backups/

AGENTS.md

@@ -1,91 +1,119 @@
-# AGENT.md - AI Agent 开发规范
+# AGENT.md - AI Agent 开发规范
-
+
-## 开发流程
+## 开发流程
-
+
-### 1. 梳理需求
+### 1. 梳理需求
-
+
-使用 `brainstorming` 进行头脑风暴, 文档存放与命名规则如下:
+使用 `brainstorming` 进行头脑风暴, 文档存放与命名规则如下:
-
+
-| 需求类型 | 计划目录          | 命名规则              | 示例                    |
+| 需求类型 | 计划目录          | 命名规则              | 示例                    |
-| -------- | ----------------- | --------------------- | ----------------------- |
+| -------- | ----------------- | --------------------- | ----------------------- |
-| 新功能   | `plans/feature/`  | `xxx-xxx-feature.md`  | `smart-view-feature.md` |
+| 新功能   | `plans/feature/`  | `xxx-xxx-feature.md`  | `smart-view-feature.md` |
-| 修 Bug   | `plans/fix/`      | `xxx-xxx-fix.md`      | `token-refresh-fix.md`  |
+| 修 Bug   | `plans/fix/`      | `xxx-xxx-fix.md`      | `token-refresh-fix.md`  |
-| 重构     | `plans/refactor/` | `xxx-xxx-refactor.md` | `api-split-refactor.md` |
+| 重构     | `plans/refactor/` | `xxx-xxx-refactor.md` | `api-split-refactor.md` |
-
+
-使用 writing-plans 技能制定实施计划
+使用 writing-plans 技能制定实施计划
-
+
-**开发新功能时必须评估权限需求**：每个新功能/新操作都需要考虑是否需要纳入权限控制。具体评估方式见下方「权限系统」章节。
+**开发新功能时必须评估权限需求**：每个新功能/新操作都需要考虑是否需要纳入权限控制。具体评估方式见下方「权限系统」章节。
-
+
-可参考的开发文档位于 `docs/dev/*`
+可参考的开发文档位于 `docs/dev/*`
-
+
-### 2. 建立开发分支
+### 2. 建立开发分支
-
+
-确定好需求之后，就使用 `enterprise-git-spec` 技能来建立分支。
+确定好需求之后，就使用 `enterprise-git-spec` 技能来建立分支。
-
+
-### 3. 按照需求开发
+### 3. 按照需求开发
-
+
-按照当前功能的计划文档的任务项及其任务细节来逐步实现功能, 全程严格地遵循技能 test-driven-development 进行 TDD 开发流程, 并遵循 executing-plans 技能来执行开发计划。
+按照当前功能的计划文档的任务项及其任务细节来逐步实现功能, 全程严格地遵循技能 test-driven-development 进行 TDD 开发流程, 并遵循 executing-plans 技能来执行开发计划。
-
+
-**重要原则：所有测试必须通过**
+**重要原则：所有测试必须通过**
-
+
-- 开发过程中，必须确保所有测试用例都通过，包括新功能的测试和现有功能的测试
+- 开发过程中，必须确保所有测试用例都通过，包括新功能的测试和现有功能的测试
-- 如果发现现有测试失败，必须立即修复，确保新功能不会破坏旧功能
+- 如果发现现有测试失败，必须立即修复，确保新功能不会破坏旧功能
-- 只有在所有测试都通过的情况下，才能认为开发完成
+- 只有在所有测试都通过的情况下，才能认为开发完成
-
+
-所有任务完成后请遵循 verification-before-completion 技能完成验证
+所有任务完成后请遵循 verification-before-completion 技能完成验证
-
+
-### 4. 合并到开发分支
+### 4. 合并到开发分支
-
+
-所有测试通过后，使用 `enterprise-git-spec` 技能提交分支，然后合并回 `develop` 分支。
+所有测试通过后，使用 `enterprise-git-spec` 技能提交分支，然后合并回 `develop` 分支。
-
+
-### 5. 沉淀开发经验
+### 5. 沉淀开发经验
-
+
-在实现功能过程中，将适用于任何项目的编码好想法、好思想、注意点等有助于项目推进的内容，及时追加到 `AGENT.md` 中。这些经验是跨功能、跨项目的通用知识，帮助后续开发少走弯路。
+在实现功能过程中，将适用于任何项目的编码好想法、好思想、注意点等有助于项目推进的内容，及时追加到 `AGENT.md` 中。这些经验是跨功能、跨项目的通用知识，帮助后续开发少走弯路。
-
+
-### 6. 更新项目结构文档
+### 6. 更新项目结构文档
-
+
-每次功能开发完成后，更新 `docs/references/structs.md` 文件。该文件记录整个项目的目录结构和每个模块的简要功能描述，便于每次迭代功能时快速理解整个项目全貌。
+每次功能开发完成后，更新 `docs/references/structs.md` 文件。该文件记录整个项目的目录结构和每个模块的简要功能描述，便于每次迭代功能时快速理解整个项目全貌。
-
+
-### 7. 更新使用文档
+### 7. 更新使用文档
-
+
-使用文档分为：
+使用文档分为：
-
+
-1. `README.md` - 面向人类使用者，帮助其快速上手项目。仅在新功能开发完成后更新。内容保持简洁，聚焦于让用户快速跑通基础流程。
+1. `README.md` - 面向人类使用者，帮助其快速上手项目。仅在新功能开发完成后更新。内容保持简洁，聚焦于让用户快速跑通基础流程。
-2. `docs/references/*` - 面向人类使用者，提供项目的全面使用指南，支持深度探索模块与命令行细节。每次新功能开发完成或已有功能调整后必须更新。示例要丰富，帮助使用者理解各项功能的具体用法。
+2. `docs/references/*` - 面向人类使用者，提供项目的全面使用指南，支持深度探索模块与命令行细节。每次新功能开发完成或已有功能调整后必须更新。示例要丰富，帮助使用者理解各项功能的具体用法。
-3. `skills/[项目名]/SKILL.md` - 面向 LLM / AI Agent，指导大模型如何使用本项目。
+3. `skills/[项目名]/SKILL.md` - 面向 LLM / AI Agent，指导大模型如何使用本项目。
-
+
-**快速开始文档**每次新功能开发完成后才更新，具体更新 `README.md` 文件。确保文档包含新增功能的使用示例、命令说明和注意事项，帮助用户快速上手。
+**快速开始文档**每次新功能开发完成后才更新，具体更新 `README.md` 文件。确保文档包含新增功能的使用示例、命令说明和注意事项，帮助用户快速上手。
-
+
-**详细使用文档**位于 `docs/references/*`，目录文件为 `docs/references/index.md`，请按照功能划分参考文档，并填充详细的使用说明，帮助用户深度探索模块/命令行的使用。每次新功能或旧功能调整了请更新最新的使用方法，例子应该丰富一些，便于使用者理解功能使用。
+**详细使用文档**位于 `docs/references/*`，目录文件为 `docs/references/index.md`，请按照功能划分参考文档，并填充详细的使用说明，帮助用户深度探索模块/命令行的使用。每次新功能或旧功能调整了请更新最新的使用方法，例子应该丰富一些，便于使用者理解功能使用。
-
+
-**AGENT使用技能文档**位于 `skills/[项目名]/*`，入口文件为 `skills/[项目名]/SKILL.md`，更新时机和要求与详细使用文档一致。
+**AGENT使用技能文档**位于 `skills/[项目名]/*`，入口文件为 `skills/[项目名]/SKILL.md`，更新时机和要求与详细使用文档一致。
-
+
-## 开发规范
+## 开发规范
-
+
-### 代码优化
+### 代码优化
-
+
-遵循 improve-codebase-architecture
+遵循 improve-codebase-architecture
-
+
-### 类型规范
+### 类型规范
-
+
-参考技能 typescript-advanced-types
+参考技能 typescript-advanced-types
-
+
-### 测试规范
+### 测试规范
-
+
-参考技能 javascript-testing-patterns
+参考技能 javascript-testing-patterns
-
+
-### 测试
+### 测试
-
+
-每个任务目录应有对应的测试文件 `test/sync/tasks/<task-name>/handler.test.ts`。
+每个任务目录应有对应的测试文件 `test/sync/tasks/<task-name>/handler.test.ts`。
-
+
-## 数据库设计
+## 数据库设计
-
+
-PostgreSQL 最佳设计实践: postgresql-table-design 技能
+PostgreSQL 最佳设计实践: postgresql-table-design 技能
-PostgreSQL 最佳性能调优实践: supabase-postgres-best-practices 技能
+PostgreSQL 最佳性能调优实践: supabase-postgres-best-practices 技能
-Prisma Postgres 最佳实践: prisma-postgres 技能
+Prisma Postgres 最佳实践: prisma-postgres 技能
-
+
-### 后端规范
+### 后端规范
-
+
-参考 nestjs-best-practices 技能
+参考 nestjs-best-practices 技能
-
+
-> 你可以自己增加规范
+> 你可以自己增加规范
+
+### 经验沉淀（跨项目通用）
+
+- **入口 nginx 的真实挂载源在 v1 仓库**：线上 official.inkreach.cc 的 nginx 容器由 `/opt/inkreach/deploy` 创建，挂载的是那边的 `nginx/admin.conf` 与 `certbot/acme` 证书；v2 仓库 `deploy/nginx/admin.conf` 只是同步副本。改线上路由必须改 v1 的文件，再在该目录 `docker compose up -d --force-recreate admin`。v1/v2 目录同名 → compose 项目名相同 → pgdata/uploads 数据卷共享，重建不丢数据。
+- **文件型 bind mount 的 inode 陷阱**：编辑器保存常替换 inode，容器内仍看到旧内容（`:ro` 挂载连 docker cp 都被拒）；`docker compose restart` 也不会重新解析挂载。要让新文件内容生效只能 `--force-recreate`，新服务的挂载尽量挂目录而非单个文件。
+- **数据库漂移处理**：连共享开发库时先跑 `prisma migrate status`；若报"列已存在"类错误，说明有人用 `db push` 带外改过库，用 `prisma migrate resolve --applied <name>` 把已存在的迁移标记为已应用，再 `migrate deploy` 应用真正缺的部分。切勿盲目 reset 共享库。
+- **连真实库的集成测试隔离**：jest 并行套件共用一个数据库时，(a) 夹具的天然键（sdsCategoryId、名称等）必须带运行时间戳唯一化，禁止跨运行共享字面量；(b) 全量型操作（如 auto-group 扫全库）会顺带扫到其他并行套件的夹具，其写入路径必须对"成员中途消失"宽容（跳过而非抛错），否则会随机挂测试。
+- **跑全量 jest 前先停 dev server**：`nest start --watch` 等常驻进程与测试共用数据库时，其重编译窗口/后台钩子会与测试写入竞争，造成"单跑绿、全量偶发红"的假阳性；验证基线前先停掉所有 watch 进程再跑。
+- **中文断言勿手写字面量排序**：JS `Array.sort()` 对中文按 UTF-16 码位排（如 烫 U+70EB < 直 U+76F4），手写期望序列容易按拼音/习惯顺序写反；比较选项集合时用 `expect.arrayContaining` + 长度，或从同一排序函数生成期望。
+- **pnpm 仓库容器化执行要挂仓库根**：pnpm 的 node_modules 是相对符号链接指向根 `.pnpm` store，容器里只挂子包目录（如 `apps/api:/app`）会断链报 "Cannot find module"；必须挂整个仓库根并 `-w` 到子包。另外 Prisma 引擎与系统 libssl 版本强绑定：node:20-alpine 缺 libssl1.1 会报 engine 加载失败；仓库 `.pnpm` store 里生成的 client 是 openssl-1.1.x target，**bookworm 系镜像（node:20-slim）同样跑不了**，用 `node:20-bullseye-slim` 挂仓库根 + `--network host`（连本机一次性测试库）跑 jest/prisma 即可，无需依赖项目运行镜像。
+- **缓存值里绝不能带请求级切片（分页/字段裁剪）**：把 `items.slice(page…)` 的结果整个塞进缓存后，缓存键不含 page → 所有页码命中同一条目、页页返回第一页（total 对得上更具迷惑性）；正确做法是缓存"全量物化结果"，切片在缓存命中后按请求执行。TDD 用例必须包含"同键翻页 + 页内容随页码变化"的断言才能抓住这类错。
+- **Prisma 唯一查询用字段名而非列名**：`where: { id }` 而非 `@map("category_id")` 映射后的 `categoryId`；schema `@map` 只影响 SQL 列名，Prisma Client 的唯一输入类型永远用 model 字段名。
+- **跨套件分页断言要圈定夹具**：真实库上测"列表排序"时全库数据可能远超 pageSize，夹具根本进不了第一页；给夹具商品名加唯一前缀 + `keyword` 过滤圈定，断言既稳定又能看到完整顺序。
+- **"绝对排序键 + 子集过滤"模式**：需要"任意筛选组合下顺序都正确"时，给每条数据算好一组绝对排序键（如 国家→二级→款→priority，缺失沉底），筛选只做子集过滤不做特殊排序分支——比每个筛选组合写一套 orderBy 逻辑可靠得多。
+- **"代表行选取收敛为单一方法"**：多端点共享同一实体视图（如族化商品对外的代表行）时，代表行选取规则必须收敛为一个私有方法供所有端点复用，禁止各端点各自 `goods[0]`——否则排序参数不同会导致 goodName/主图等字段在列表与详情间漂移。
+- **"物化数组的顺序必须有确定性来源"**：把聚合结果物化进 JSONB（如 price_matrix 的 printCounts/crafts/logistics）时，"Set 去重保首现序"不是顺序保证——源查询没有 orderBy 时 Postgres 不承诺返回序，同一数据两次重算顺序可能漂移。必须：① 聚合后按业务词表序稳定排序（词表外自由文本沉底）；② 源查询显式 `orderBy` 固定遍历序。测试用"打乱输入顺序断言输出全等"覆盖顺序确定性。
+- **"新增维度取值 = 标签行 + 两处词表常量，缺一不可"**：工艺/物流/印花数量这类封闭维度新增可选值时，只往 `tags` 表插行不够——矩阵维度词表 `DIM_VALUES` 和展示序 `OPTION_DISPLAY_ORDER` 是硬编码常量，必须同步追加，否则打了新标签的链接会被词表过滤导致价格格子静默消失（比报错更危险）。同时确认自动派生规则（auto-tag-rules / admin origin-name）是否要认识新值；存量数据零影响的前提是"只放开准入，不主动打标"。
+- **测试夹具必须自包含**：断言库内"存在某类数据"的用例（如标签组过滤）在全新/一次性数据库上必挂；夹具自己种下断言所依赖的数据，不依赖共享库的既有状态。
+- **严禁直接热修运行容器内的代码**：本次线上 v2 镜像内被塞过未提交的词表改动（热转印），仓库重建镜像即复发且难排查；所有修复必须落在仓库并重建部署。排查"线上行为与代码不符"时先 `md5sum` 比对容器内源文件与仓库。
+- **两端"同构"解析器必须连测试用例也同构**：admin 与 api 各有一份链接名解析器，本次展示 bug（`品名（DTG180） SKU` 显示成光款号）正是两端取括号策略不一致（api 首括号对 vs admin 末括号）所致。改任何一端解析行为时，另一端同样输入的用例必须同步补上（origin-name.spec ↔ origin-name.parser.spec/goods.service.spec）。
+- **共享开发库不可达时用一次性 docker postgres 跑集成测试**：`docker run -d --name inkreach-test-pg -e POSTGRES_USER=test -e POSTGRES_PASSWORD=test -e POSTGRES_DB=inkreach_test -p 127.0.0.1:54329:5432 postgres:16-alpine` → `DATABASE_URL=… npx prisma migrate deploy` → jest/vitest 指向该库；用完 `docker rm -f`。夹具自包含的套件在新库上直接绿。
+- **宿主机即部署机时，改生产数据前先 `docker inspect` 拿容器真实注入的环境变量**：deploy/.env 里的密码可能与运行容器不一致（v2 栈独立 env）；对两个栈的库做数据修复时，dry-run 清单必须逐栈分别核对后再 apply。
+- **改"镜像字段"的数据前先查覆盖路径**：分类名每小时被 `syncCategories` 用 SDS 原名无条件覆盖——直接改库/界面改名都会被下一轮同步冲回。此类字段的清洗必须写进同步入库路径（如 `cleanCategoryDisplayName`），存量靠回填脚本；数据先改而镜像未重部署的窗口期内会被冲回一次，重部署后自动恢复。
+- **合并分叉血统时警惕"文本无冲突、行为有冲突"**：git 自动合并可能把两侧对同一机制的不同设计（如 热转印=烫画别名 vs 一等公民词表）拼进一个文件，编译通过但行为矛盾——合并后必须跑两侧血统各自的测试才能暴露；行级冲突反而不是最危险的。另：`git status | head` 截断会漏看冲突文件，连续 cherry-pick 后要全仓 `grep '<<<<<<<'` 扫一遍。
+- **生产栈收敛三件套**：动栈结构前先 `pg_dump -Fc` 双库 + 数据卷归档 + 配置快照落 `deploy/backups/<时间戳>/` 并写 RESTORE.md；切换用"外部卷 external 引用 + down 不带 -v + 切换前后行数 diff"保证数据零丢失；先 `docker compose build` 预构建再 down/up，把停机窗口压到秒级。
+- **矩阵维度占位不得借用业务词表既有值**：曾让「不打印」链接的印花数量占位为「单面印花」，导致顾客端出现「不打印+单面印花」的自相矛盾组合（不打印根本无印花面）。2026-09-03 数据收口：光板/不打印链接不入族（`family_id=NULL`），矩阵不计算不打印工艺。**回流风险**：`organize`/`autoGroup` 会把散链接按分类重新归族、人工改链接标签会触发 `attachToMatchingFamily` 回挂——跑这两类操作前必须先排查光板链接（清单与回滚见 `deploy/backups/20260903-noprint-removal/`）。
+- **重部署不会自愈物化 JSON**：`price_matrix` 是物化列，代码修好/词表修正后已物化的矩阵**不会自动重算**（重算只在归族/成员变化/详情同步/标签调整等事件时触发）——族 148 曾因旧容器物化的坏矩阵跨镜像存活，"代码明明对了线上却没变"。此类修复收尾必须显式触发受影响族重算（可容器内 `node -e` 直调 `FamilyRecomputeService.recomputeFamily`，用已部署代码、免重建免鉴权）。
+- **批量数据修复前"全量 dump + 受影响行快照 + RESTORE.md"三件是底线**：全量 `pg_dump -Fc` 兜灾难恢复，受影响行 CSV（含改前外键值）支持精准回滚，RESTORE.md 写清逐表恢复命令与重算步骤；事务内逐步核对影响行数与预期一致再 COMMIT。

README.md

@@ -106,6 +106,7 @@ pnpm --filter @inkreach/api test          # 单元测试
 pnpm --filter @inkreach/api prisma:generate  # 生成 Prisma Client
 pnpm --filter @inkreach/api prisma:migrate   # 运行迁移
 pnpm --filter @inkreach/api prisma:studio    # 打开 Prisma Studio
+pnpm --filter @inkreach/api backfill:product-families  # 产品族回填（解析链接名→自动建族→全量重算，幂等）
 
 # 官网
 pnpm --filter @inkreach/website dev       # 开发

apps/admin/package.json

@@ -1,32 +1,34 @@
-{
+{
-  "name": "@inkreach/admin",
+  "name": "@inkreach/admin",
-  "private": true,
+  "private": true,
-  "version": "0.0.0",
+  "version": "0.0.0",
-  "type": "module",
+  "type": "module",
-  "scripts": {
+  "scripts": {
-    "dev": "vite",
+    "dev": "vite",
-    "build": "vue-tsc -b && vite build",
+    "build": "vue-tsc -b && vite build",
-    "preview": "vite preview"
+    "preview": "vite preview",
-  },
+    "test": "vitest run"
-  "dependencies": {
+  },
-    "@element-plus/icons-vue": "^2.3.2",
+  "dependencies": {
-    "@vueuse/core": "^14.3.0",
+    "@element-plus/icons-vue": "^2.3.2",
-    "axios": "^1.18.0",
+    "@vueuse/core": "^14.3.0",
-    "dayjs": "^1.11.21",
+    "axios": "^1.18.0",
-    "element-plus": "^2.14.2",
+    "dayjs": "^1.11.21",
-    "pinia": "^3.0.4",
+    "element-plus": "^2.14.2",
-    "vue": "^3.5.34",
+    "pinia": "^3.0.4",
-    "vue-router": "^4.6.4"
+    "vue": "^3.5.34",
-  },
+    "vue-router": "^4.6.4"
-  "devDependencies": {
+  },
-    "@types/node": "^24.12.3",
+  "devDependencies": {
-    "@vitejs/plugin-vue": "^6.0.6",
+    "@types/node": "^24.12.3",
-    "@vue/tsconfig": "^0.9.1",
+    "@vitejs/plugin-vue": "^6.0.6",
-    "sass": "^1.101.0",
+    "@vue/tsconfig": "^0.9.1",
-    "typescript": "~6.0.2",
+    "sass": "^1.101.0",
-    "unplugin-auto-import": "^21.0.0",
+    "typescript": "~6.0.2",
-    "unplugin-vue-components": "^32.1.0",
+    "unplugin-auto-import": "^21.0.0",
-    "vite": "^8.0.12",
+    "unplugin-vue-components": "^32.1.0",
-    "vue-tsc": "^3.2.8"
+    "vite": "^8.0.12",
-  }
+    "vitest": "^4.1.10",
-}
+    "vue-tsc": "^3.2.8"
+  }
+}

apps/admin/src/api/countries.ts

@@ -32,4 +32,9 @@ export const countriesApi = {
   deleteCountry: (id: string) => {
     return request.delete(`/countries/${id}`)
   },
+
+  // Batch save drag-reorder (items = full list in the new order)
+  sortCountries: (items: Array<{ id: string; sortOrder: number }>) => {
+    return request.patch<any, Country[]>('/countries/sort', { items })
+  },
 }

apps/admin/src/api/origin-goods.ts

@@ -1,5 +1,5 @@
 import request from './request'
-import type { OriginGood, OriginGoodsTreeResponse, PaginatedResult } from '@/types'
+import type { OriginGood, OriginGoodsTreeResponse, OriginGoodTagsResult, PaginatedResult } from '@/types'
 
 export const originGoodsApi = {
   getTree: () => {
@@ -9,4 +9,23 @@ export const originGoodsApi = {
   getOriginGoodsList: (params: { page?: number; pageSize?: number; keyword?: string }) => {
     return request.get<any, PaginatedResult<OriginGood>>('/origin-goods', { params })
   },
+
+  // 单链接详情（detail + variants，成员展开面板用）
+  getOriginGood: (id: string) => {
+    return request.get<any, Record<string, any>>(`/origin-goods/${id}`)
+  },
+
+  getTags: (id: string) => {
+    return request.get<any, OriginGoodTagsResult>(`/origin-goods/${id}/tags`)
+  },
+
+  // 人工接管链接标签（全量替换，自动同步不再覆盖）
+  updateTags: (id: string, tagIds: string[]) => {
+    return request.put<any, OriginGoodTagsResult>(`/origin-goods/${id}/tags`, { tagIds: tagIds.map(Number) })
+  },
+
+  // 恢复自动派生（清掉人工标签）
+  resetTags: (id: string) => {
+    return request.delete<any, OriginGoodTagsResult>(`/origin-goods/${id}/tags`)
+  },
 }

apps/admin/src/api/product-families.ts

@@ -0,0 +1,80 @@
+import request from './request'
+import type {
+  AutoGroupPreviewGroup,
+  FamilyPriceOverrideRow,
+  PaginatedResult,
+  ProductFamily,
+} from '@/types'
+
+export const productFamiliesApi = {
+  list: (params: { keyword?: string; page?: number; pageSize?: number }) => {
+    return request.get<any, PaginatedResult<ProductFamily>>('/product-families', { params })
+  },
+
+  detail: (id: string) => {
+    return request.get<any, ProductFamily>(`/product-families/${id}`)
+  },
+
+  create: (data: {
+    familyName: string
+    familyCode?: string
+    familyImage?: string
+    originGoodIds?: string[]
+    primaryOriginGoodId?: string
+  }) => {
+    return request.post<any, ProductFamily>('/product-families', data)
+  },
+
+  patch: (id: string, data: Record<string, unknown>) => {
+    return request.patch<any, ProductFamily>(`/product-families/${id}`, data)
+  },
+
+  autoGroup: (apply: boolean) => {
+    return request.post<any, { applied: number; groups: AutoGroupPreviewGroup[] }>(
+      '/product-families/auto-group',
+      { apply },
+    )
+  },
+
+  /** 整理原产品库（显式人工动作）：解析列回填 → 派生标签 → 自动建族 → 全量重算 */
+  organize: () => {
+    return request.post<any, {
+      labelsParsed: number
+      labelsUnparsable: number
+      linksUpdated: number
+      goodsUpdated: number
+      familiesCreated: number
+      familiesMerged: number
+      familiesSkipped: number
+      fragmentsConsolidated: number
+      fragmentsManualReview: number
+      familiesRecomputed: number
+    }>('/product-families/organize')
+  },
+
+  updateMembers: (id: string, data: { addOriginGoodIds?: string[]; removeOriginGoodIds?: string[] }) => {
+    return request.post<any, ProductFamily>(`/product-families/${id}/members`, data)
+  },
+
+  createCustomMember: (id: string, data: Record<string, unknown>) => {
+    return request.post<any, unknown>(`/product-families/${id}/members/custom`, data)
+  },
+
+  recompute: (id: string) => {
+    return request.post<any, ProductFamily>(`/product-families/${id}/recompute`)
+  },
+
+  listOverrides: (id: string) => {
+    return request.get<any, { items: FamilyPriceOverrideRow[] }>(`/product-families/${id}/price-overrides`)
+  },
+
+  putOverrides: (id: string, items: Array<Record<string, unknown>>) => {
+    return request.put<any, { items: FamilyPriceOverrideRow[] }>(`/product-families/${id}/price-overrides`, { items })
+  },
+
+  deleteOverrides: (id: string, cells: Array<Record<string, unknown>>) => {
+    return request.delete<any, { items: FamilyPriceOverrideRow[] }>(`/product-families/${id}/price-overrides`, {
+      data: { cells },
+    })
+  },
+}

apps/admin/src/api/request.ts

@@ -36,8 +36,11 @@ request.interceptors.response.use(
     ) {
       config._retried = true
       try {
+        // 规范拼接：VITE_API_BASE 可能带尾斜杠（如 /v2-api/），直接相加会产生
+        // /v2-api//auth/refresh 双斜杠导致 404
+        const base = (import.meta.env.VITE_API_BASE || '/api').replace(/\/+$/, '')
         await axios.post(
-          `${import.meta.env.VITE_API_BASE || '/api'}/auth/refresh`,
+          `${base}/auth/refresh`,
           {},
           { withCredentials: true },
         )

apps/admin/src/components.d.ts

@@ -18,6 +18,7 @@ declare module 'vue' {
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCascader: typeof import('element-plus/es')['ElCascader']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
+    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElContainer: typeof import('element-plus/es')['ElContainer']
     ElDescriptions: typeof import('element-plus/es')['ElDescriptions']

apps/admin/src/router/index.ts

@@ -28,14 +28,19 @@ const routes: RouteRecordRaw[] = [
 ]
 
 const router = createRouter({
-  history: createWebHistory('/admin/'),
+  history: createWebHistory('/v2/admin/'),
   routes,
 })
 
-router.beforeEach((to) => {
+router.beforeEach(async (to) => {
   const authStore = useAuthStore()
   const isPublic = to.meta?.public === true
 
+  // 会话在 HttpOnly cookie 里：刷新后先经 /auth/me 恢复登录态，再判定是否放行
+  if (!authStore.isLoggedIn && !isPublic) {
+    await authStore.ensureSessionChecked()
+  }
+
   if (!authStore.isLoggedIn && !isPublic) {
     return { path: '/login', replace: true }
   }

apps/admin/src/types/index.ts

@@ -24,7 +24,7 @@ export interface User {
 }
 
 // Good types
-export interface Good {
+export interface Good {
   id: string
   goodName: string
   goodImage: string | null
@@ -42,81 +42,92 @@ export interface Good {
   position?: Position
   createdAt: string
   updatedAt: string
-}
+  mergedOriginGoods?: MergedOriginGoodSummary[]
-
+}
-export interface OriginGoodDetail {
-  productCode?: string | null
-  englishName?: string | null
-  productionCycleHours?: number | null
-  minWeightG?: string | null
-  productionProcess?: string | null
-  materialDescription?: string | null
-  sizeChart?: { columns?: Array<{ key: string; name: string }>; rows?: any[] } | null
-  packageSpecs?: { rows?: any[] } | null
-  syncedAt?: string | null
-  [key: string]: unknown
-}
-
-export interface OriginGoodVariant {
-  sdsVariantId: string
-  sku: string
-  sizeName?: string | null
-  colorName?: string | null
-  colorHex?: string | null
-  price?: string | null
-  enabled: boolean
-  [key: string]: unknown
-}
-
-export interface CustomGoodVariantRequest {
-  sku: string
-  sizeId?: string | null
-  sizeName?: string | null
-  colorId?: string | null
-  colorName?: string | null
-  colorHex?: string | null
-  imageUrl?: string | null
-  price?: string | null
-  originalPrice?: string | null
-  weightG?: string | null
-  boxLengthCm?: string | null
-  boxWidthCm?: string | null
-  boxHeightCm?: string | null
-  designData?: Record<string, unknown> | null
-  enabled?: boolean
-  sortOrder?: number
-}
-
-export interface CustomGoodDetailRequest {
-  productCode?: string | null
-  englishName?: string | null
-  productionCycleHours?: number | null
-  minWeightG?: string | null
-  productionProcess?: string | null
-  materialDescription?: string | null
-  blankDesignUrl?: string | null
-  detailsPageVideoUrl?: string | null
-  textureName?: string | null
-  reminder?: string | null
-  productPerformance?: string | null
-  applicableScenarios?: string | null
-  washingInstructions?: string | null
-  specialDescription?: string | null
-  designExplanation?: string | null
-  designArea?: string | null
-  pictureRequest?: string | null
-  sizeChart?: Record<string, unknown> | null
-  packageSpecs?: Record<string, unknown> | null
-  options?: Record<string, unknown> | null
-  media?: Record<string, unknown> | null
-}
-
-export interface GoodDetail extends Good {
-  originDetail: OriginGoodDetail | null
-  variants: OriginGoodVariant[]
-}
 
-export interface CreateGoodRequest {
+export interface MergedOriginGoodSummary {
+  id: string
+  sdsGoodId: string
+  goodName: string | null
+  goodImage: string | null
+  goodPrice: string | null
+  hasDetail: boolean
+  variantCount: number
+}
+
+export interface OriginGoodDetail {
+  productCode?: string | null
+  englishName?: string | null
+  productionCycleHours?: number | null
+  minWeightG?: string | null
+  productionProcess?: string | null
+  materialDescription?: string | null
+  sizeChart?: { columns?: Array<{ key: string; name: string }>; rows?: any[] } | null
+  packageSpecs?: { rows?: any[] } | null
+  syncedAt?: string | null
+  [key: string]: unknown
+}
+
+export interface OriginGoodVariant {
+  sdsVariantId: string
+  sku: string
+  sizeName?: string | null
+  colorName?: string | null
+  colorHex?: string | null
+  price?: string | null
+  enabled: boolean
+  [key: string]: unknown
+}
+
+export interface CustomGoodVariantRequest {
+  sku: string
+  sizeId?: string | null
+  sizeName?: string | null
+  colorId?: string | null
+  colorName?: string | null
+  colorHex?: string | null
+  imageUrl?: string | null
+  price?: string | null
+  originalPrice?: string | null
+  weightG?: string | null
+  boxLengthCm?: string | null
+  boxWidthCm?: string | null
+  boxHeightCm?: string | null
+  designData?: Record<string, unknown> | null
+  enabled?: boolean
+  sortOrder?: number
+}
+
+export interface CustomGoodDetailRequest {
+  productCode?: string | null
+  englishName?: string | null
+  productionCycleHours?: number | null
+  minWeightG?: string | null
+  productionProcess?: string | null
+  materialDescription?: string | null
+  blankDesignUrl?: string | null
+  detailsPageVideoUrl?: string | null
+  textureName?: string | null
+  reminder?: string | null
+  productPerformance?: string | null
+  applicableScenarios?: string | null
+  washingInstructions?: string | null
+  specialDescription?: string | null
+  designExplanation?: string | null
+  designArea?: string | null
+  pictureRequest?: string | null
+  sizeChart?: Record<string, unknown> | null
+  packageSpecs?: Record<string, unknown> | null
+  options?: Record<string, unknown> | null
+  media?: Record<string, unknown> | null
+}
+
+export interface GoodDetail extends Good {
+  originDetail: OriginGoodDetail | null
+  variants: OriginGoodVariant[]
+}
+
+export interface CreateGoodRequest {
   goodName: string
   goodImage?: string
   originGoodId: number
@@ -124,29 +135,30 @@ export interface CreateGoodRequest {
   categoryId: number
   tagIds?: number[]
   positionId?: number
-  goodPriority?: number
+  goodPriority?: number
-}
+  mergedOriginGoodIds?: number[]
-
+}
-export interface CreateCustomGoodRequest {
+
-  goodName: string
+export interface CreateCustomGoodRequest {
-  goodImage?: string
+  goodName: string
-  goodPrice?: string | null
+  goodImage?: string
-  countryId: number
+  goodPrice?: string | null
-  categoryId: number
+  countryId: number
-  tagIds?: number[]
+  categoryId: number
-  positionId?: number
+  tagIds?: number[]
-  goodPriority?: number
+  positionId?: number
-  detail?: CustomGoodDetailRequest
+  goodPriority?: number
-  variants?: CustomGoodVariantRequest[]
+  detail?: CustomGoodDetailRequest
-}
+  variants?: CustomGoodVariantRequest[]
-
+}
-export interface UpdateCustomGoodContentRequest {
+
-  goodName?: string
+export interface UpdateCustomGoodContentRequest {
-  goodImage?: string | null
+  goodName?: string
-  goodPrice?: string | null
+  goodImage?: string | null
-  detail?: CustomGoodDetailRequest
+  goodPrice?: string | null
-  variants?: CustomGoodVariantRequest[]
+  detail?: CustomGoodDetailRequest
-}
+  variants?: CustomGoodVariantRequest[]
+}
 
 export interface UpdateGoodRequest {
   goodName?: string
@@ -157,6 +169,7 @@ export interface UpdateGoodRequest {
   tagIds?: number[]
   positionId?: number | null
   goodPriority?: number
+  mergedOriginGoodIds?: number[]
 }
 
 export interface BatchCreateItem {
@@ -329,28 +342,29 @@ export interface UpdatePositionRequest {
 }
 
 // Origin Good types
-export interface OriginGood {
+export interface OriginGood {
   id: string
   goodName: string | null
   goodImage: string | null
   goodPrice: string | null
-  sdsGoodId: string
+  sdsGoodId: string
-  source: 'SDS' | 'CUSTOM'
+  source: 'SDS' | 'CUSTOM'
-  isCustom: boolean
+  isCustom: boolean
   sdsCategoryId: string | null
   delisted?: boolean
   createdAt: string
-  updatedAt: string
+  updatedAt: string
-  hasDetail?: boolean
+  hasDetail?: boolean
-  detailSyncedAt?: string | null
+  detailSyncedAt?: string | null
-  variantCount?: number
+  variantCount?: number
-  sizeRowCount?: number
+  sizeRowCount?: number
-  packageRowCount?: number
+  packageRowCount?: number
-  productCode?: string | null
+  productCode?: string | null
+  family?: { familyId: string; familyCode: string | null; familyName: string; memberCount?: number } | null
 }
 
 // Origin Goods Tree types
-export interface OriginGoodsTreeNode {
+export interface OriginGoodsTreeNode {
   id: string
   goodName: string
   goodImage: string | null
@@ -359,12 +373,16 @@ export interface OriginGoodsTreeNode {
   delisted: boolean
   configuredCount: number
   configuredCountries: string[]
-  configuredTags: { tagName: string; tagColor: string | null; tagFontColor: string | null; tagGroupId: string | null; tagGroupName: string | null; sortOrder: number }[]
+  configuredTags: { tagName: string; tagColor: string | null; tagFontColor: string | null; tagGroupId: string | null; tagGroupName: string | null; sortOrder: number }[]
-  hasDetail: boolean
+  hasDetail: boolean
-  detailSyncedAt: string | null
+  detailSyncedAt: string | null
-  variantCount: number
+  variantCount: number
-  sizeRowCount: number
+  sizeRowCount: number
-  packageRowCount: number
+  packageRowCount: number
+  familyId: string | null
+  familyName: string | null
+  familyCode: string | null
+  familyStale: boolean | null
 }
 
 export interface OriginGoodsTreeCategoryNode {
@@ -383,15 +401,120 @@ export interface OriginGoodsTreeResponse {
   configuredCount: number
 }
 
+// Product Family (SPU layer) types
+export interface OriginGoodTagInfo {
+  id: string
+  tagName: string
+  tagColor: string | null
+  tagFontColor: string | null
+  manual: boolean
+}
+
+/** 链接标签配置结果（origin-goods/:id/tags） */
+export interface OriginGoodTagsResult {
+  tagsManual: boolean
+  tags: OriginGoodTagInfo[]
+  /** 人工勾选缺定价维度时按链接名自动补齐的标签名（缺啥补啥） */
+  filledDimensionTags?: string[]
+  /** 保存时链接无族且自动并入成功的目标族 id */
+  attachedFamilyId?: string
+}
+
+export interface ProductFamilyMember {
+  id: string
+  sdsGoodId: string
+  goodName: string
+  goodImage: string | null
+  goodPrice: string | null
+  source: 'SDS' | 'CUSTOM'
+  delisted: boolean
+  skuCode: string | null
+  logisticsLabel: string | null
+  craftLabel: string | null
+  warehouseLabel: string | null
+  tagsManual: boolean
+  originGoodTags: Array<{ id: string; manual: boolean; tag: OriginGoodTagInfo }>
+  variantCount: number
+}
+
+export interface FamilyPriceOverrideRow {
+  id: string
+  familyId: string
+  sizeId: string
+  colorId: string
+  craft: string
+  logistics: string
+  price: string
+  note: string | null
+  derivedPrice: string | null
+  diff: string | null
+}
+
+export interface ProductFamilyPriceMatrix {
+  sizes: Array<{ key: string; name: string | null }>
+  colors: Array<{ key: string; name: string | null; hex: string | null; imageUrl: string | null }>
+  crafts: string[]
+  logistics: string[]
+  rows: Array<{
+    sizeId: string
+    sizeName: string | null
+    colorId: string
+    colorName: string | null
+    craft: string
+    logistics: string
+    price: string
+    manual: boolean
+    sources: Array<{ sdsGoodId: string; sdsVariantId: string; price: string }>
+  }>
+}
+
+export interface ProductFamily {
+  id: string
+  familyCode: string | null
+  familyName: string
+  familyImage: string | null
+  countryId: string | null
+  categoryId: string | null
+  primaryOriginGoodId: string | null
+  autoManaged: boolean
+  stale: boolean
+  detail: Record<string, unknown> | null
+  sizeChart: { columns?: unknown; rows?: Array<Record<string, unknown>> } | null
+  packageSpecs: { columns?: unknown; rows?: Array<Record<string, unknown>> } | null
+  priceMatrix: ProductFamilyPriceMatrix | null
+  originGoods: ProductFamilyMember[]
+  priceOverrides: FamilyPriceOverrideRow[]
+  _count: { originGoods: number; priceOverrides: number }
+}
+
+export interface AutoGroupPreviewGroup {
+  groupKey: string
+  familyName: string
+  familyCode: string | null
+  memberCount: number
+  sampleNames: string[]
+}
+
+export interface CustomMemberVariantInput {
+  sku: string
+  sizeId?: string | null
+  sizeName?: string | null
+  colorId?: string | null
+  colorName?: string | null
+  colorHex?: string | null
+  imageUrl?: string | null
+  price: number
+}
+
 // Sync types
-export interface SyncLog {
+export interface SyncLog {
-  id: string
+  id: string
-  type: 'CATEGORIES' | 'PRODUCTS' | 'PRODUCT_DETAILS'
+  type: 'CATEGORIES' | 'PRODUCTS' | 'PRODUCT_DETAILS'
-  status: 'RUNNING' | 'SUCCESS' | 'FAILED'
+  status: 'RUNNING' | 'SUCCESS' | 'FAILED'
-  message: string | null
+  message: string | null
-  startedAt: string
+  startedAt: string
-  finishedAt: string | null
+  finishedAt: string | null
-}
+}
 
 // Filter types
 export interface GoodsFilter {

apps/admin/src/utils/category-tree.ts

@@ -0,0 +1,28 @@
+import type { CategoryTree } from '@/types'
+
+/** 在分类树中找目标分类的祖先路径（含自身） */
+export function findCategoryPath(nodes: CategoryTree[], targetId: string): string[] {
+  for (const n of nodes) {
+    if (n.id === targetId) return [n.id]
+    if (n.children?.length) {
+      const sub = findCategoryPath(n.children, targetId)
+      if (sub.length) return [n.id, ...sub]
+    }
+  }
+  return []
+}
+
+export interface CascadeNode {
+  value: string
+  label: string
+  children?: CascadeNode[]
+}
+
+/** 分类树 → el-cascader 选项 */
+export function buildCascader(tree: CategoryTree[]): CascadeNode[] {
+  return tree.map((n) => ({
+    value: n.id,
+    label: n.categoryName,
+    children: n.children?.length ? buildCascader(n.children) : undefined,
+  }))
+}

apps/admin/src/utils/family-match.spec.ts

@@ -0,0 +1,36 @@
+import { describe, expect, it } from 'vitest'
+import { sameFamily } from './family-match'
+
+const node = (familyId: string | null, goodName: string) => ({ familyId, goodName })
+
+describe('sameFamily', () => {
+  it('同族（familyId 相等且非空）→ true，名称不同也不影响', () => {
+    expect(
+      sameFamily(node('12', '美国（包邮）T恤-DG001-单面印花'), node('12', '墨西哥（不包邮）卫衣-XX-双面印花')),
+    ).toBe(true)
+  })
+
+  it('任一方 familyId 为空 → 回退族语义键（国家+品名+SKU，物流/工艺不分族）', () => {
+    const a = node(null, '美国（包邮）T恤-DG001-单面印花')
+    expect(sameFamily(a, node(null, '美国（包邮）T恤-DG001-单面印花-某仓'))).toBe(true)
+    expect(sameFamily(a, node('12', '美国（包邮）T恤-DG001-单面印花'))).toBe(true)
+    // 物流/工艺是矩阵维度而非分族维度：包邮 vs 不包邮、单面 vs 双面 同款同族
+    expect(sameFamily(a, node(null, '美国（不包邮）T恤-DG001-单面印花'))).toBe(true)
+    expect(sameFamily(a, node(null, '美国（不包邮）T恤-DG001-双面印花-美西一仓'))).toBe(true)
+    // 不同款号不同族
+    expect(sameFamily(a, node(null, '美国（包邮）T恤-DG002-单面印花'))).toBe(false)
+    // 不同国家不同族
+    expect(sameFamily(a, node(null, '英国（包邮）T恤-DG001-单面印花'))).toBe(false)
+  })
+
+  it('familyId 不同 → false（即使名称同段）', () => {
+    expect(
+      sameFamily(node('1', '美国（包邮）T恤-DG001-单面印花'), node('2', '美国（包邮）T恤-DG001-单面印花')),
+    ).toBe(false)
+  })
+
+  it('双方均无族且名称不可比 → false', () => {
+    expect(sameFamily(node(null, ''), node(null, '随便'))).toBe(false)
+    expect(sameFamily(node(null, null as unknown as string), node(null, '随便'))).toBe(false)
+  })
+})

apps/admin/src/utils/family-match.ts

@@ -0,0 +1,14 @@
+import { familyNameKey } from './origin-name'
+
+/**
+ * 两个原产品节点是否属于同一产品族：
+ * 优先用服务端返回的 familyId 精确匹配；无族归属时回退族语义键
+ * （国家+品名+SKU —— 物流/工艺是矩阵维度不分族；老数据/未回填场景兜底）。
+ */
+export function sameFamily(
+  a: { familyId?: string | null; goodName?: string | null },
+  b: { familyId?: string | null; goodName?: string | null },
+): boolean {
+  if (a.familyId && b.familyId) return a.familyId === b.familyId
+  return familyNameKey(a.goodName) !== '' && familyNameKey(a.goodName) === familyNameKey(b.goodName)
+}

apps/admin/src/utils/origin-name.spec.ts

@@ -0,0 +1,161 @@
+import { describe, expect, it } from 'vitest';
+import {
+  cleanLinkName,
+  deriveLinkTagNames,
+  linkDims,
+  parseLinkName,
+  sameOriginGroup,
+  truncateToProcess,
+} from './origin-name';
+
+describe('truncateToProcess', () => {
+  it('keeps first 3 dash segments (drops warehouse)', () => {
+    expect(truncateToProcess('美国（包邮）180g纯棉T恤成人款-DG001-单面印花-美西洛杉矶一仓'))
+      .toBe('美国（包邮）180g纯棉T恤成人款-DG001-单面印花');
+  });
+  it('is identity for 3-segment names', () => {
+    expect(truncateToProcess('美国（不包邮）230g水洗炒雪花T恤-KRHM003-直喷双面'))
+      .toBe('美国（不包邮）230g水洗炒雪花T恤-KRHM003-直喷双面');
+  });
+  it('handles malformed names without country prefix', () => {
+    expect(truncateToProcess('（不包邮）230g水洗炒雪花T恤-FRTM001-双面印花'))
+      .toBe('（不包邮）230g水洗炒雪花T恤-FRTM001-双面印花');
+  });
+  it('returns empty for null/empty', () => {
+    expect(truncateToProcess(null)).toBe('');
+    expect(truncateToProcess('')).toBe('');
+  });
+});
+
+describe('sameOriginGroup', () => {
+  it('matches same product across warehouses', () => {
+    expect(sameOriginGroup(
+      '美国（包邮）180g纯棉T恤成人款-DG001-单面印花-美西洛杉矶一仓',
+      '美国（包邮）180g纯棉T恤成人款-DG001-单面印花-美中亚特兰大仓',
+    )).toBe(true);
+  });
+  it('does not match different SKU', () => {
+    expect(sameOriginGroup(
+      '美国（包邮）180g纯棉T恤成人款-DG001-单面印花',
+      '美国（包邮）180g纯棉T恤成人款-DG002-单面印花',
+    )).toBe(false);
+  });
+  it('does not match different country', () => {
+    expect(sameOriginGroup(
+      '美国（包邮）T恤-DG001-单面印花',
+      '德国（不包邮）T恤-DG001-单面印花',
+    )).toBe(false);
+  });
+  it('does not match empty names', () => {
+    expect(sameOriginGroup(null, 'x-y-z')).toBe(false);
+    expect(sameOriginGroup('', '')).toBe(false);
+  });
+});
+
+describe('parseLinkName / cleanLinkName', () => {
+  it('parses 国家（物流）品名-SKU-工艺 → 品名 + 型号', () => {
+    expect(parseLinkName('美国（包邮）180g纯棉T恤成人款-DG001-单面印花')).toEqual({
+      productName: '180g纯棉T恤成人款',
+      skuCode: 'DG001',
+    });
+    expect(cleanLinkName('美国（包邮）180g纯棉T恤成人款-DG001-单面印花')).toBe(
+      '180g纯棉T恤成人款 DG001',
+    );
+  });
+
+  it('handles half-width parens and warehouse suffix', () => {
+    expect(
+      cleanLinkName('美国(不包邮光板)180GT恤成人款-JSA002-不打印·美西洛杉矶二仓'),
+    ).toBe('180GT恤成人款 JSA002');
+  });
+
+  it('returns null / raw fallback for manual names without the country(remark) structure', () => {
+    expect(parseLinkName('180g纯棉T恤成人款')).toBeNull();
+    expect(cleanLinkName('180g纯棉T恤成人款')).toBe('180g纯棉T恤成人款');
+    expect(cleanLinkName(null)).toBe('');
+  });
+
+  it('returns null when product name after parens is empty', () => {
+    expect(parseLinkName('美国（包邮）-DG001-单面印花')).toBeNull();
+  });
+});
+
+describe('已规范化的「品名（型号限定词） SKU」防误解析 + 限定词剥离', () => {
+  it('品名内含（限定词）的已规范化名不再解析（否则展示会变成光款号）', () => {
+    expect(parseLinkName('童装纯色插肩短袖T恤（DTG180） PLTK016')).toBeNull();
+    expect(parseLinkName('牛奶丝T恤（女款） DG601')).toBeNull();
+    expect(parseLinkName('180G纯棉T恤 （JSA002） DG001')).toBeNull();
+  });
+
+  it('cleanLinkName 对已规范化名剥离 ASCII 型号限定词', () => {
+    expect(cleanLinkName('童装纯色插肩短袖T恤（DTG180） PLTK016')).toBe(
+      '童装纯色插肩短袖T恤 PLTK016',
+    );
+    expect(cleanLinkName('180G纯棉T恤 （JSA002） DG001')).toBe('180G纯棉T恤 DG001');
+  });
+
+  it('原始链接名品名内含限定词时，解析后一并剥离', () => {
+    expect(
+      cleanLinkName('波兰（包邮）童装纯色插肩短袖T恤（DTG180）-PLTK016-双面印花'),
+    ).toBe('童装纯色插肩短袖T恤 PLTK016');
+  });
+
+  it('中文括号内容（如（女款））不剥离', () => {
+    expect(cleanLinkName('牛奶丝T恤（女款） DG601')).toBe('牛奶丝T恤（女款） DG601');
+  });
+
+  it('无 SKU 段的单段链接名仍按首括号对解析（与 api 端一致）', () => {
+    expect(parseLinkName('波兰（包邮）童装T恤')).toEqual({
+      productName: '童装T恤',
+      skuCode: null,
+    });
+  });
+});
+
+describe('deriveLinkTagNames', () => {
+  it('单面印花 + 包邮 + 无工艺关键字 → 单面印花/烫画/包邮', () => {
+    expect(deriveLinkTagNames('美国（包邮）180g纯棉T恤成人款-DG001-单面印花')).toEqual([
+      '单面印花',
+      '烫画',
+      '包邮',
+    ]);
+  });
+
+  it('不打印 + 光板 + 不包邮 → 归并为单个不打印（光板即不打印）', () => {
+    expect(
+      deriveLinkTagNames('美国（不包邮光板）180GT恤成人款-JSA002-不打印·美西洛杉矶二仓'),
+    ).toEqual(['不打印', '不包邮']);
+  });
+
+  it('双面印花 + 不包邮，且不误命中包邮', () => {
+    expect(deriveLinkTagNames('美国（不包邮）T恤-DG001-双面印花·美东新泽西仓')).toEqual([
+      '双面印花',
+      '烫画',
+      '不包邮',
+    ]);
+  });
+
+  it('空名称返回空数组', () => {
+    expect(deriveLinkTagNames(null)).toEqual([]);
+  });
+});
+
+describe('linkDims', () => {
+  it('解析物流备注/工艺/印花数量', () => {
+    expect(linkDims('美国（包邮）180g纯棉T恤成人款-DG001-单面印花')).toEqual({
+      logistics: '包邮',
+      crafts: ['烫画'],
+      printCount: '单面印花',
+    });
+    expect(linkDims('美国（不包邮光板）180GT恤成人款-JSA002-不打印·美西洛杉矶二仓')).toEqual({
+      logistics: '不包邮光板',
+      crafts: ['不打印'],
+      printCount: null,
+    });
+  });
+
+  it('无括号结构时物流为 null，手工名称工艺默认烫画', () => {
+    expect(linkDims('纯棉T恤')).toEqual({ logistics: null, crafts: ['烫画'], printCount: null });
+    expect(linkDims(null)).toEqual({ logistics: null, crafts: [], printCount: null });
+  });
+});

apps/admin/src/utils/origin-name.ts

@@ -0,0 +1,148 @@
+/**
+ * 原产品名匹配规则（见 data-cleaning/README.md 命名调查）：
+ * `国家（物流备注）品名-SKU-工艺位置[-仓库名]`
+ * 截断到「工艺位置」= 保留按 `-` 分段的前 3 段，丢弃可选的仓库名段。
+ * 国家前缀在第 1 段内，天然参与比较（不同国家不合并）。
+ */
+const KEEP_SEGMENTS = 3;
+
+export function truncateToProcess(name: string | null | undefined): string {
+  if (!name) return '';
+  return name.split('-').slice(0, KEEP_SEGMENTS).join('-');
+}
+
+export function sameOriginGroup(
+  a: string | null | undefined,
+  b: string | null | undefined,
+): boolean {
+  const ka = truncateToProcess(a);
+  return ka !== '' && ka === truncateToProcess(b);
+}
+
+/**
+ * 族语义分组键（与 api 端 familyNameKey 同构）：第 1 段剥离（物流备注）括号，
+ * 保留 国家+品名+SKU，丢工艺/仓库段 —— 物流/工艺是价格矩阵维度而非分族维度。
+ */
+export function familyNameKey(name: string | null | undefined): string {
+  if (!name) return '';
+  const segs = name.split('-').map((s) => s.trim());
+  const head = segs[0] ?? '';
+  if (!head) return '';
+  const normalized = head.replace(/\(/g, '（').replace(/\)/g, '）');
+  const openAt = normalized.indexOf('（');
+  let stripped = normalized;
+  if (openAt >= 0) {
+    const closeAt = normalized.indexOf('）', openAt);
+    if (closeAt > openAt) {
+      stripped = normalized.slice(0, openAt) + normalized.slice(closeAt + 1);
+    }
+  }
+  stripped = stripped.trim();
+  const sku = segs[1] ?? '';
+  if (!stripped) return sku || '';
+  return sku ? `${stripped}-${sku}` : stripped;
+}
+
+/** 链接名结构化解析结果：品名 + 型号（SKU 代码） */
+export interface ParsedLinkName {
+  productName: string;
+  skuCode: string | null;
+}
+
+/**
+ * 解析链接名称：`国家（物流备注）品名-SKU-工艺位置[-·仓库名]` → 品名 + 型号。
+ * 与 api 端 origin-name.parser.ts 同构（首括号对解析，半角/全角混用先归一）；
+ * 解析失败（无「国家（备注）」前缀结构）返回 null，调用方应回退显示原始名称
+ * —— 手动维护的品名不走该解析。
+ */
+export function parseLinkName(name: string | null | undefined): ParsedLinkName | null {
+  if (!name) return null;
+  const segs = name.split('-').map((s) => s.trim());
+  const head = segs[0] ?? '';
+  const normalized = head.replace(/\(/g, '（').replace(/\)/g, '）');
+  const openAt = normalized.indexOf('（');
+  const closeAt = openAt >= 0 ? normalized.indexOf('）', openAt) : -1;
+  if (closeAt <= openAt || closeAt === normalized.length - 1) return null;
+  const productName = normalized.slice(closeAt + 1).trim();
+  if (!productName) return null;
+  // 无 SKU 段时仅当括号后的品名含中文才视为链接名 —— 防把已规范化的
+  // 「品名（型号限定词） SKU」（如「童装…（DTG180） PLTK016」）的尾段款号误当品名
+  if (segs.length < 2 && !/[\u4e00-\u9fff]/.test(productName)) return null;
+  const skuCode = segs[1] || null;
+  return { productName, skuCode };
+}
+
+/** ASCII 型号限定词括号组（SDS 品名内的供应商/工艺型号，如（DTG180）（JSA002）） */
+const ASCII_PAREN_GROUP = /(?:（|\()[A-Za-z0-9]+(?:）|\))/g;
+
+/** 展示名剥离 ASCII 型号限定词；剥空（名称仅剩限定词）时原样返回 */
+export function stripAsciiParenQualifiers(name: string): string {
+  const stripped = name.replace(ASCII_PAREN_GROUP, ' ').replace(/\s+/g, ' ').trim();
+  return stripped || name;
+}
+
+/** 展示名：`品名 型号`（如「180g纯棉T恤成人款 DG001」）；解析失败回退原名。品名内的 ASCII 型号限定词一并剥离 */
+export function cleanLinkName(name: string | null | undefined): string {
+  if (!name) return '';
+  const parsed = parseLinkName(name);
+  const base = parsed
+    ? parsed.skuCode
+      ? `${parsed.productName} ${parsed.skuCode}`
+      : parsed.productName
+    : name;
+  return stripAsciiParenQualifiers(base);
+}
+
+const CRAFT_KEYWORD_MAP: Record<string, string> = {
+  直喷: '直喷',
+  不打印: '不打印',
+  光板: '不打印', // 光板即为不打印
+};
+
+/** 链接的定价维度（SKU 表展示用）：物流备注 / 工艺 / 印花数量 */
+export interface LinkDims {
+  logistics: string | null;
+  crafts: string[];
+  printCount: string | null;
+}
+
+/** 从链接名称解析定价维度；工艺无命中时默认烫画（与派生标签规则一致） */
+export function linkDims(name: string | null | undefined): LinkDims {
+  if (!name) return { logistics: null, crafts: [], printCount: null };
+  const head = name.split('-')[0] ?? '';
+  const openCandidates = [head.indexOf('（'), head.indexOf('(')].filter((i) => i >= 0);
+  const openIdx = openCandidates.length ? Math.min(...openCandidates) : -1;
+  const closeIdx = Math.max(head.lastIndexOf('）'), head.lastIndexOf(')'));
+  const logistics =
+    openIdx >= 0 && closeIdx > openIdx ? head.slice(openIdx + 1, closeIdx).trim() || null : null;
+  const craftHits = [...new Set(Object.entries(CRAFT_KEYWORD_MAP).filter(([k]) => name.includes(k)).map(([, tag]) => tag))];
+  // 与 api 端一致：裸「双面/单面」也归入印花数量（如「直喷双面」）
+  const printCount = name.includes('双面')
+    ? '双面印花'
+    : name.includes('单面')
+      ? '单面印花'
+      : null;
+  return {
+    logistics,
+    crafts: craftHits.length > 0 ? craftHits : ['烫画'],
+    printCount,
+  };
+}
+
+/**
+ * 由链接名称派生标签名（与 api 端 auto-tag-rules.ts 规则一致，仅用于成员行只读展示）：
+ * 印花数量：双面 优先于 单面（含「直喷双面」这类工艺段写法）；工艺：直喷/不打印/光板→不打印，皆无则默认烫画；
+ * 物流：不包邮 优先于 包邮。
+ */
+export function deriveLinkTagNames(name: string | null | undefined): string[] {
+  if (!name) return [];
+  const names: string[] = [];
+  if (name.includes('双面')) names.push('双面印花');
+  else if (name.includes('单面')) names.push('单面印花');
+  const craftHits = [...new Set(Object.entries(CRAFT_KEYWORD_MAP).filter(([k]) => name.includes(k)).map(([, tag]) => tag))];
+  if (craftHits.length > 0) names.push(...craftHits);
+  else names.push('烫画');
+  if (name.includes('不包邮')) names.push('不包邮');
+  else if (name.includes('包邮')) names.push('包邮');
+  return names;
+}

apps/admin/src/views/categories/CategoriesView.vue

@@ -52,7 +52,6 @@ const dialogLoading = ref(false)
 const dialogForm = reactive<CreateCategoryRequest & { id?: string }>({
   categoryName: '',
   categoryIcon: '',
-  parentCategoryId: '',
 })
 
 const dialogRules = {
@@ -146,7 +145,7 @@ onMounted(fetchTree)
       >
         <el-table-column prop="categoryName" label="名称" min-width="220" />
         <el-table-column label="图标" width="100">
-          <template #default="{ row }: { row: CategoryTree }">
+          <template #default="{ row }: any">
             <el-image
               v-if="row.categoryIcon"
               :src="row.categoryIcon"
@@ -158,17 +157,17 @@ onMounted(fetchTree)
           </template>
         </el-table-column>
         <el-table-column label="父级">
-          <template #default="{ row }: { row: CategoryTree }">
+          <template #default="{ row }: any">
             {{ row.parent?.categoryName || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="子级数" width="100">
-          <template #default="{ row }: { row: CategoryTree }">
+          <template #default="{ row }: any">
             {{ row._count?.children ?? row.children?.length ?? 0 }}
           </template>
         </el-table-column>
         <el-table-column label="操作" width="180" fixed="right">
-          <template #default="{ row }: { row: CategoryTree }">
+          <template #default="{ row }: any">
             <div class="table-actions">
               <el-button size="small" type="primary" plain @click="openEditDialog(row)">
                 <el-icon><Edit /></el-icon>

apps/admin/src/views/countries/CountriesView.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { onMounted, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { Plus, Edit, Delete, Refresh, Search } from '@element-plus/icons-vue'
+import { Plus, Edit, Delete, Refresh, Search, Rank } from '@element-plus/icons-vue'
 import type {
   Country,
   CreateCountryRequest,
@@ -23,7 +23,7 @@ const filter = reactive<Required<CountryFilter>>({
 async function fetchList() {
   loading.value = true
   try {
-    const res = await countriesApi.getCountriesList(filter)
+    await countriesApi.getCountriesList(filter)
     const data = await countriesApi.getCountriesList(filter) as any
     const arr = Array.isArray(data) ? data : (data.items ?? [])
     list.value = arr
@@ -44,6 +44,38 @@ function handleReset() {
   fetchList()
 }
 
+// ─── 拖拽排序：松开即按新顺序全量保存（sortOrder = 下标） ───
+const dragIndex = ref<number | null>(null)
+const sorting = ref(false)
+
+function onRowDragStart(index: number) {
+  dragIndex.value = index
+}
+
+async function onRowDrop(index: number) {
+  const from = dragIndex.value
+  dragIndex.value = null
+  if (from === null || from === index || sorting.value) return
+  const next = [...list.value]
+  const [moved] = next.splice(from, 1)
+  next.splice(index, 0, moved)
+  list.value = next
+  sorting.value = true
+  try {
+    const updated = await countriesApi.sortCountries(
+      next.map((c, i) => ({ id: String(c.id), sortOrder: i })),
+    )
+    const arr = Array.isArray(updated) ? updated : []
+    if (arr.length) list.value = arr
+    ElMessage.success('排序已保存')
+  } catch {
+    ElMessage.error('排序保存失败')
+    await fetchList()
+  } finally {
+    sorting.value = false
+  }
+}
+
 const dialogRef = ref()
 const dialogVisible = ref(false)
 const dialogMode = ref<'create' | 'edit'>('create')
@@ -145,54 +177,43 @@ onMounted(fetchList)
         </el-button>
       </div>
 
-      <el-table v-loading="loading" :data="list" border stripe>
+      <ul v-loading="loading" class="country-list">
-        <el-table-column label="图标" width="80">
+        <li
-          <template #default="{ row }: { row: Country }">
+          v-for="(row, index) in list"
-            <el-image
+          :key="row.id"
-              v-if="row.countryIcon"
+          class="country-row"
-              :src="row.countryIcon"
+          :class="{ 'is-dragging': dragIndex === index }"
-              :preview-src-list="[row.countryIcon]"
+          draggable="true"
-              fit="cover"
+          title="拖拽调整顺序，松开即保存"
-              style="width: 32px; height: 32px; border-radius: 4px;"
+          @dragstart="onRowDragStart(index)"
-            />
+          @dragover.prevent
-            <span v-else>-</span>
+          @drop="onRowDrop(index)"
-          </template>
+          @dragend="dragIndex = null"
-        </el-table-column>
+        >
-        <el-table-column prop="countryName" label="名称" min-width="200" />
+          <el-icon class="drag-handle"><Rank /></el-icon>
-        <el-table-column label="创建时间" width="180">
+          <el-image
-          <template #default="{ row }: { row: Country }">
+            v-if="row.countryIcon"
-            {{ new Date(row.createdAt).toLocaleString() }}
+            :src="row.countryIcon"
-          </template>
+            :preview-src-list="[row.countryIcon]"
-        </el-table-column>
+            fit="cover"
-        <el-table-column label="操作" width="180" fixed="right">
+            class="row-icon"
-          <template #default="{ row }: { row: Country }">
+          />
-            <div class="table-actions">
+          <span v-else class="row-icon row-icon-placeholder">-</span>
-              <el-button size="small" type="primary" plain @click="openEditDialog(row)">
+          <span class="row-name">{{ row.countryName }}</span>
-                <el-icon><Edit /></el-icon>
+          <span class="row-time">{{ new Date(row.createdAt).toLocaleString() }}</span>
-                <span>编辑</span>
+          <div class="table-actions">
-              </el-button>
+            <el-button size="small" type="primary" plain @click="openEditDialog(row)">
-              <el-button size="small" type="danger" plain @click="handleDelete(row)">
+              <el-icon><Edit /></el-icon>
-                <el-icon><Delete /></el-icon>
+              <span>编辑</span>
-                <span>删除</span>
+            </el-button>
-              </el-button>
+            <el-button size="small" type="danger" plain @click="handleDelete(row)">
-            </div>
+              <el-icon><Delete /></el-icon>
-          </template>
+              <span>删除</span>
-        </el-table-column>
+            </el-button>
-        <template #empty>
+          </div>
-          <el-empty description="暂无国家" />
+        </li>
-        </template>
+        <li v-if="!loading && !list.length" class="country-empty">暂无国家</li>
-      </el-table>
+      </ul>
-
-      <el-pagination
-        class="pagination"
-        v-model:current-page="filter.page"
-        v-model:page-size="filter.pageSize"
-        :total="total"
-        :page-sizes="[10, 20, 50, 100]"
-        layout="total, sizes, prev, pager, next, jumper"
-        @current-change="(p: number) => { filter.page = p; fetchList() }"
-        @size-change="(s: number) => { filter.pageSize = s; filter.page = 1; fetchList() }"
-      />
     </div>
 
     <el-dialog
@@ -224,8 +245,81 @@ onMounted(fetchList)
   flex: 1;
 }
 
-.pagination {
+.country-list {
-  margin-top: 16px;
+  list-style: none;
-  justify-content: flex-end;
+  margin: 0;
+  padding: 0;
+}
+
+.country-row {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  padding: 10px 16px;
+  background: var(--el-bg-color);
+  border: 1px solid var(--el-border-color-lighter);
+  border-top: none;
+  cursor: grab;
+}
+
+.country-row:first-child {
+  border-top: 1px solid var(--el-border-color-lighter);
+  border-radius: 4px 4px 0 0;
+}
+
+.country-row:last-child {
+  border-radius: 0 0 4px 4px;
+}
+
+.country-row:only-child {
+  border-radius: 4px;
+}
+
+.country-row.is-dragging {
+  opacity: 0.5;
+}
+
+.country-row:hover {
+  background: var(--el-fill-color-light);
+}
+
+.drag-handle {
+  color: var(--el-text-color-secondary);
+  font-size: 16px;
+}
+
+.row-icon {
+  width: 32px;
+  height: 32px;
+  border-radius: 4px;
+  flex: none;
+}
+
+.row-icon-placeholder {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  color: var(--el-text-color-secondary);
+  border: 1px dashed var(--el-border-color);
+}
+
+.row-name {
+  font-weight: 500;
+}
+
+.row-time {
+  margin-left: auto;
+  color: var(--el-text-color-secondary);
+  font-size: 13px;
+}
+
+.table-actions {
+  flex: none;
+}
+
+.country-empty {
+  padding: 32px 0;
+  text-align: center;
+  color: var(--el-text-color-secondary);
 }
 </style>

apps/admin/src/views/goods/components/CustomGoodDialog.vue

@@ -0,0 +1,123 @@
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
+import type { CategoryTree, Country, Tag } from '@/types'
+import { goodsApi } from '@/api/goods'
+import { countriesApi } from '@/api/countries'
+import { buildCascader } from '@/utils/category-tree'
+
+const props = defineProps<{
+  visible: boolean
+  countries: Country[]
+  categories: CategoryTree[]
+  /** 分组后的标签选项 {id,label,tags} */
+  tagOptionGroups: Array<{ id: string; label: string; tags: Tag[] }>
+}>()
+
+const emit = defineEmits<{
+  (e: 'update:visible', v: boolean): void
+  (e: 'created', good: any): void
+  /** 快捷新建国家后由父级刷新字典 */
+  (e: 'dictionaries-changed'): void
+}>()
+
+const loading = ref(false)
+const form = ref({
+  goodName: '', goodImage: '', goodPrice: '', countryId: '',
+  cascaderCategory: [] as string[], categoryId: '', tagIds: [] as string[],
+  goodPriority: 0,
+})
+
+watch(() => props.visible, (v) => {
+  if (v) {
+    form.value = {
+      goodName: '', goodImage: '', goodPrice: '', countryId: '',
+      cascaderCategory: [], categoryId: '', tagIds: [], goodPriority: 0,
+    }
+  }
+})
+
+const categoryCascader = computed(() => buildCascader(props.categories))
+
+function onCascaderChange(val: any) {
+  const path = Array.isArray(val) ? val : []
+  form.value.categoryId = path.length ? String(path[path.length - 1]) : ''
+}
+
+async function quickCreateCountry() {
+  try {
+    const { value } = await ElMessageBox.prompt('请输入国家名称', '新增国家', {
+      confirmButtonText: '新增', cancelButtonText: '取消', inputPlaceholder: '国家名称',
+    })
+    if (!value.trim()) return
+    const created = await countriesApi.createCountry({ countryName: value.trim() } as any)
+    emit('dictionaries-changed')
+    if (created?.id) form.value.countryId = created.id
+    ElMessage.success('已创建并选中')
+  } catch {}
+}
+
+async function handleSubmit() {
+  if (!form.value.goodName.trim()) { ElMessage.warning('请输入商品名称'); return }
+  if (!form.value.countryId) { ElMessage.warning('请选择国家'); return }
+  if (!form.value.categoryId) { ElMessage.warning('请选择分类'); return }
+  loading.value = true
+  try {
+    const created = await goodsApi.createCustomGood({
+      goodName: form.value.goodName.trim(),
+      goodImage: form.value.goodImage || undefined,
+      goodPrice: form.value.goodPrice || null,
+      countryId: Number(form.value.countryId),
+      categoryId: Number(form.value.categoryId),
+      tagIds: form.value.tagIds.map(Number),
+      goodPriority: form.value.goodPriority,
+      detail: {},
+    })
+    ElMessage.success('自定义商品已创建，可继续完善详情、尺码、包装和 SKU')
+    emit('update:visible', false)
+    emit('created', created)
+  } catch (error: any) {
+    ElMessage.error(error?.response?.data?.message || '自定义商品创建失败')
+  } finally { loading.value = false }
+}
+</script>
+
+<template>
+  <el-dialog :model-value="visible" title="新增自定义商品" width="620px" destroy-on-close @update:model-value="emit('update:visible', $event)">
+    <el-alert
+      title="自定义商品不关联 SDS 原产品，名称、图片、价格、详情、尺码、包装和 SKU 均可维护。"
+      type="info"
+      :closable="false"
+      style="margin-bottom:16px"
+    />
+    <el-form label-width="90px">
+      <el-form-item label="商品名称" required><el-input v-model="form.goodName" /></el-form-item>
+      <el-form-item label="商品图片"><ImageUpload v-model="form.goodImage" label="上传图片" /></el-form-item>
+      <el-form-item label="基础价格"><el-input v-model="form.goodPrice" placeholder="例如 28.00" /></el-form-item>
+      <el-form-item label="国家" required>
+        <div class="select-inline">
+          <el-select v-model="form.countryId" filterable placeholder="请选择国家" style="width:100%">
+            <el-option v-for="c in countries" :key="c.id" :label="c.countryName" :value="c.id" />
+          </el-select>
+          <el-button text :icon="Plus" @click="quickCreateCountry" />
+        </div>
+      </el-form-item>
+      <el-form-item label="分类" required>
+        <el-cascader v-model="form.cascaderCategory" :options="categoryCascader as any" :props="{ checkStrictly: true }" placeholder="请选择分类" style="width:100%" @change="onCascaderChange" />
+      </el-form-item>
+      <el-form-item label="标签">
+        <el-select v-model="form.tagIds" multiple filterable placeholder="请选择标签" style="width:100%">
+          <el-option-group v-for="g in tagOptionGroups" :key="g.id" :label="g.label">
+            <el-option v-for="t in g.tags" :key="t.id" :label="t.tagName" :value="t.id" />
+          </el-option-group>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="优先级"><el-input-number v-model="form.goodPriority" :min="0" /></el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="emit('update:visible', false)">取消</el-button>
+      <el-button type="primary" :loading="loading" @click="handleSubmit">创建并完善详情</el-button>
+    </template>
+  </el-dialog>
+</template>

apps/admin/src/views/goods/components/GoodsConfigDialog.vue

@@ -0,0 +1,175 @@
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { CategoryTree, Country } from '@/types'
+import { goodsApi } from '@/api/goods'
+import { productFamiliesApi } from '@/api/product-families'
+import { findCategoryPath, buildCascader } from '@/utils/category-tree'
+
+const props = defineProps<{
+  visible: boolean
+  /** 拖拽/配置的链接节点（含 rawId/goodName/goodImage/goodPrice/sdsGoodId/familyId） */
+  og: any | null
+  /** 同分类下的可合并兄弟链接 */
+  siblings: any[]
+  /** 默认勾选的兄弟 rawId */
+  defaultCheckedIds: string[]
+  /** 左树拖放目标（国家/分类节点），为空时表单手动选 */
+  dropTarget: any | null
+  mode: 'category' | 'country' | 'global'
+  countries: Country[]
+  categories: CategoryTree[]
+}>()
+
+const emit = defineEmits<{
+  (e: 'update:visible', v: boolean): void
+  (e: 'configured'): void
+}>()
+
+const loading = ref(false)
+const form = ref({
+  countryId: '', cascaderCategory: [] as string[], categoryId: '', goodImage: '',
+})
+
+watch(() => props.visible, (v) => {
+  if (!v) return
+  const og = props.og
+  form.value = { countryId: '', cascaderCategory: [], categoryId: '', goodImage: og?.goodImage || '' }
+  if (props.dropTarget) {
+    if (props.mode === 'category') {
+      form.value.categoryId = props.dropTarget.id
+      form.value.cascaderCategory = findCategoryPath(props.categories, props.dropTarget.id)
+    } else {
+      form.value.countryId = props.dropTarget.id
+    }
+  }
+})
+
+const categoryCascader = computed(() => buildCascader(props.categories))
+
+const checkedIds = ref<string[]>([])
+watch(() => props.visible, (v) => {
+  if (v) checkedIds.value = [...props.defaultCheckedIds]
+})
+
+// 合并同名候选搜索（本地过滤同分类链接）
+const mergeKeyword = ref('')
+watch(() => props.visible, (v) => {
+  if (v) mergeKeyword.value = ''
+})
+const filteredSiblings = computed(() => {
+  const kw = mergeKeyword.value.trim()
+  if (!kw) return props.siblings
+  return props.siblings.filter((s) => (s.goodName ?? '').includes(kw))
+})
+
+function onCascaderChange(val: any) {
+  form.value.categoryId = val.length ? val[val.length - 1] : ''
+}
+
+/** 勾选的兄弟链接与当前链接静默归入同一族（无族则自动建族）；失败不阻断原配置流程 */
+async function ensureFamilyMembership() {
+  const og = props.og
+  const primaryId = String(og.rawId)
+  const checked = checkedIds.value.filter((id) => id !== primaryId)
+  if (!checked.length) return
+  try {
+    if (og.familyId) {
+      await productFamiliesApi.updateMembers(og.familyId, {
+        addOriginGoodIds: [...new Set([primaryId, ...checked])],
+      })
+    } else {
+      await productFamiliesApi.create({
+        familyName: og.goodName ?? '',
+        originGoodIds: [primaryId, ...checked],
+        primaryOriginGoodId: primaryId,
+      })
+    }
+  } catch (e: any) {
+    ElMessage.warning(e?.response?.data?.message || '挂族失败，商品仍按原方式配置')
+  }
+}
+
+async function handleSubmit() {
+  const og = props.og
+  if (!form.value.countryId) { ElMessage.warning('请选择国家'); return }
+  if (!form.value.categoryId) { ElMessage.warning('请选择分类'); return }
+  loading.value = true
+  try {
+    await ensureFamilyMembership()
+    await goodsApi.createGood({
+      goodName: og.goodName,
+      goodImage: form.value.goodImage || undefined,
+      originGoodId: Number(og.rawId),
+      countryId: Number(form.value.countryId),
+      categoryId: Number(form.value.categoryId),
+      positionId: undefined,
+    } as any)
+    ElMessage.success('配置成功')
+    emit('update:visible', false)
+    emit('configured')
+  } catch (e: any) {
+    ElMessage.error(e?.response?.data?.message || '配置失败')
+  } finally { loading.value = false }
+}
+</script>
+
+<template>
+  <el-dialog :model-value="visible" title="配置原产品" width="520px" destroy-on-close @update:model-value="emit('update:visible', $event)">
+    <div v-if="og" class="config-og-info">
+      <div>
+        <div class="config-og-name">{{ og.goodName }}</div>
+        <div class="config-og-meta">SDS ID: {{ og.sdsGoodId }}<template v-if="og.goodPrice"> · 价格: ¥{{ og.goodPrice }}</template></div>
+      </div>
+    </div>
+    <el-form label-width="80px" style="margin-top: 16px">
+      <el-form-item label="国家">
+        <div v-if="mode === 'category' || !dropTarget" class="select-inline">
+          <el-select v-model="form.countryId" placeholder="请选择国家" filterable>
+            <el-option v-for="c in countries" :key="c.id" :label="c.countryName" :value="c.id" />
+          </el-select>
+        </div>
+        <el-tag v-else>{{ countries.find(c => c.id === form.countryId)?.countryName }}</el-tag>
+      </el-form-item>
+      <el-form-item label="分类">
+        <el-cascader v-if="mode === 'country' || !dropTarget" v-model="form.cascaderCategory" :options="categoryCascader as any" :props="{ checkStrictly: true }" placeholder="请选择分类" @change="onCascaderChange" style="width:100%" />
+        <el-tag v-else>{{ dropTarget?.label }}</el-tag>
+      </el-form-item>
+      <el-form-item label="合并同名">
+        <div class="config-merge-box">
+          <el-input
+            v-model="mergeKeyword"
+            size="small"
+            clearable
+            placeholder="搜索同款链接（全局，含已配置）…"
+            style="margin-bottom:8px"
+          />
+          <el-checkbox-group v-model="checkedIds">
+            <el-checkbox v-for="s in filteredSiblings" :key="s.rawId" :value="String(s.rawId)">
+              {{ s.goodName }}<template v-if="s.goodPrice"> · ¥{{ s.goodPrice }}</template>
+            </el-checkbox>
+          </el-checkbox-group>
+          <div v-if="!filteredSiblings.length" class="config-merge-empty">
+            {{ siblings.length ? '没有匹配的链接' : '未找到同款链接（同款号或同族）' }}
+          </div>
+        </div>
+      </el-form-item>
+      <el-form-item label="图片">
+        <ImageUpload v-model="form.goodImage" label="上传图片" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="emit('update:visible', false)">取消</el-button>
+      <el-button type="primary" :loading="loading" @click="handleSubmit">确认配置</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style scoped>
+.config-og-info { padding: 12px; background: #f5f7fa; border-radius: 8px; }
+.config-og-name { font-weight: 600; font-size: 14px; }
+.config-og-meta { color: #909399; font-size: 12px; margin-top: 2px; }
+.config-merge-box { width: 100%; }
+.config-merge-empty { font-size: 12px; color: #909399; padding: 4px 0; }
+.config-merge-box .el-checkbox-group { display: flex; flex-direction: column; align-items: flex-start; max-height: 200px; overflow-y: auto; }
+</style>

apps/admin/src/views/goods/components/GoodsEditDialog.vue

@@ -0,0 +1,929 @@
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { Plus, Refresh, ArrowDown, QuestionFilled } from '@element-plus/icons-vue'
+import type { CategoryTree, Country, Good, GoodDetail, Tag } from '@/types'
+import { goodsApi } from '@/api/goods'
+import { originGoodsApi } from '@/api/origin-goods'
+import { productFamiliesApi } from '@/api/product-families'
+import { countriesApi } from '@/api/countries'
+import { syncApi } from '@/api/sync'
+import { cleanLinkName, deriveLinkTagNames, linkDims } from '@/utils/origin-name'
+import type { OriginGoodTagsResult } from '@/types'
+import { findCategoryPath, buildCascader } from '@/utils/category-tree'
+
+const props = defineProps<{
+  visible: boolean
+  goodId: string
+  countries: Country[]
+  categories: CategoryTree[]
+  /** 分组后的标签选项 {id,label,tags} */
+  tagOptionGroups: Array<{ id: string; label: string; tags: Tag[] }>
+}>()
+
+const emit = defineEmits<{
+  (e: 'update:visible', v: boolean): void
+  /** 商品数据变化（保存/同步/族变更），父级刷新左右树 */
+  (e: 'changed'): void
+  (e: 'deleted'): void
+  /** 快捷新建国家后由父级刷新字典 */
+  (e: 'dictionaries-changed'): void
+}>()
+
+const editLoading = ref(false)
+const editDetailLoading = ref(false)
+/** 正在同步详情的成员行 id */
+const detailSyncing = ref<string>('')
+const editGood = ref<Good | GoodDetail | null>(null)
+const editForm = ref({
+  id: '', goodName: '', goodImage: '', countryId: '', cascaderCategory: [] as string[],
+  categoryId: '', positionId: '',
+})
+
+const editIsCustom = computed(() => editGood.value?.originGood?.isCustom === true)
+const categoryCascader = computed(() => buildCascader(props.categories))
+
+// ─── 自定义商品内容编辑 ───
+const customContentForm = ref({
+  goodPrice: '', productCode: '', englishName: '', productionCycleHours: undefined as number | undefined,
+  minWeightG: '', productionProcess: '', materialDescription: '',
+  blankDesignUrl: '', detailsPageVideoUrl: '', textureName: '', reminder: '',
+  productPerformance: '', applicableScenarios: '', washingInstructions: '', specialDescription: '',
+  designExplanation: '', designArea: '', pictureRequest: '',
+  sizeChartJson: '{\n  "columns": [],\n  "rows": []\n}',
+  packageSpecsJson: '{\n  "rows": []\n}',
+  optionsJson: '{}',
+  mediaJson: '{}',
+  variants: [] as Array<{
+    sku: string; sizeId: string; sizeName: string; colorId: string; colorName: string; colorHex: string; imageUrl: string;
+    price: string; originalPrice: string; weightG: string; boxLengthCm: string;
+    boxWidthCm: string; boxHeightCm: string; designDataJson: string; enabled: boolean
+  }>,
+})
+
+function fillCustomContent(g: GoodDetail) {
+  const detail = g.originDetail ?? {}
+  customContentForm.value = {
+    goodPrice: g.originGood?.goodPrice ?? '',
+    productCode: String(detail.productCode ?? ''),
+    englishName: String(detail.englishName ?? ''),
+    productionCycleHours: detail.productionCycleHours == null ? undefined : Number(detail.productionCycleHours),
+    minWeightG: String(detail.minWeightG ?? ''),
+    productionProcess: String(detail.productionProcess ?? ''),
+    materialDescription: String(detail.materialDescription ?? ''),
+    blankDesignUrl: String(detail.blankDesignUrl ?? ''),
+    detailsPageVideoUrl: String(detail.detailsPageVideoUrl ?? ''),
+    textureName: String(detail.textureName ?? ''),
+    reminder: String(detail.reminder ?? ''),
+    productPerformance: String(detail.productPerformance ?? ''),
+    applicableScenarios: String(detail.applicableScenarios ?? ''),
+    washingInstructions: String(detail.washingInstructions ?? ''),
+    specialDescription: String(detail.specialDescription ?? ''),
+    designExplanation: String(detail.designExplanation ?? ''),
+    designArea: String(detail.designArea ?? ''),
+    pictureRequest: String(detail.pictureRequest ?? ''),
+    sizeChartJson: JSON.stringify(detail.sizeChart ?? { columns: [], rows: [] }, null, 2),
+    packageSpecsJson: JSON.stringify(detail.packageSpecs ?? { rows: [] }, null, 2),
+    optionsJson: JSON.stringify(detail.options ?? {}, null, 2),
+    mediaJson: JSON.stringify(detail.media ?? {}, null, 2),
+    variants: g.variants.map((variant) => ({
+      sku: variant.sku,
+      sizeId: String(variant.sizeId ?? ''),
+      sizeName: String(variant.sizeName ?? ''),
+      colorId: String(variant.colorId ?? ''),
+      colorName: String(variant.colorName ?? ''),
+      colorHex: String(variant.colorHex ?? ''),
+      imageUrl: String(variant.imageUrl ?? ''),
+      price: String(variant.price ?? ''),
+      originalPrice: String(variant.originalPrice ?? ''),
+      weightG: String(variant.weightG ?? ''),
+      boxLengthCm: String(variant.boxLengthCm ?? ''),
+      boxWidthCm: String(variant.boxWidthCm ?? ''),
+      boxHeightCm: String(variant.boxHeightCm ?? ''),
+      designDataJson: JSON.stringify(variant.designData ?? {}, null, 2),
+      enabled: variant.enabled,
+    })),
+  }
+}
+
+function addCustomVariant() {
+  customContentForm.value.variants.push({
+    sku: '', sizeId: '', sizeName: '', colorId: '', colorName: '', colorHex: '', imageUrl: '', price: '',
+    originalPrice: '', weightG: '', boxLengthCm: '', boxWidthCm: '', boxHeightCm: '', designDataJson: '{}', enabled: true,
+  })
+}
+
+// ─── 关联原产品（族成员，可展开查看详情 / 配标签 / 改价格） ───
+interface FamilyMemberRow {
+  id: string
+  goodName: string
+  goodImage: string | null
+  source: string
+  delisted: boolean
+  sdsGoodId: string
+  goodPrice: string | null
+  variantCount: number
+  logisticsLabel: string | null
+  craftLabel: string | null
+  warehouseLabel: string | null
+  tagsManual: boolean
+  tags: Array<{ id: string; tagName: string; tagColor: string | null; manual: boolean }>
+}
+interface MemberPriceCell {
+  sizeId: string
+  colorId: string
+  sizeName: string | null
+  colorName: string | null
+  printCount: string
+  craft: string
+  logistics: string
+  price: string
+  manual: boolean
+  editPrice: string
+}
+const editFamilyId = ref<string>('')
+const editFamilyCode = ref<string | null>(null)
+const editFamilyMembers = ref<FamilyMemberRow[]>([])
+const familyMemberCount = ref<number | null>(null)
+const editFamilyLoaded = ref(false)
+const editFamilyAddKw = ref('')
+const editFamilyCandidates = ref<Array<{ id: string; goodName: string }>>([])
+const expandedMemberKeys = ref<Set<string>>(new Set())
+const memberTagEdits = ref<Record<string, string[]>>({})
+const memberTagSaving = ref<string>('')
+/** 成员展开面板的 尺码×颜色→价格 编辑态（key = og id） */
+const memberPrices = ref<Record<string, MemberPriceCell[]>>({})
+const memberPriceSaving = ref<string>('')
+/** 族原始详情（含 priceMatrix） */
+const familyDetailRaw = ref<any>(null)
+
+// ─── 族级并集视图：尺码表/包装规格（族物化并集）+ SKU（价格矩阵 = 各链接动态合并） ───
+// 尺码行把 measurements 数组摊平成 { 列key: cm }（与成员级渲染一致，否则格子全空）
+const familySizeRows = computed(() =>
+  ((familyDetailRaw.value?.sizeChart?.rows ?? []) as any[]).map((row) => ({
+    ...row,
+    ...(row.measurements ?? []).reduce((out: Record<string, string>, item: any) => {
+      out[item.key] = item.cm ?? '-'
+      return out
+    }, {}),
+  })),
+)
+const familySizeColumns = computed(() => familyDetailRaw.value?.sizeChart?.columns ?? [])
+const familyPackageRows = computed(() => familyDetailRaw.value?.packageSpecs?.rows ?? [])
+const familySkuRows = computed(() => {
+  const rows = (familyDetailRaw.value?.priceMatrix?.rows ?? []) as any[]
+  return rows.map((r) => ({ ...r, sourceCount: Array.isArray(r.sources) ? r.sources.length : 0 }))
+})
+
+function toggleMemberExpand(key: string) {
+  const next = new Set(expandedMemberKeys.value)
+  if (next.has(key)) next.delete(key)
+  else {
+    next.add(key)
+    loadMemberPrices(key)
+    ensureMemberDetail(key)
+  }
+  expandedMemberKeys.value = next
+}
+
+// ─── 成员详情（懒加载：GET /origin-goods/:id） ───
+const memberDetailCache = ref<Record<string, any>>({})
+
+function memberDetail(id: string) {
+  return memberDetailCache.value[id]
+}
+
+async function ensureMemberDetail(ogId: string) {
+  const row = editFamilyMembers.value.find((m) => m.id === ogId)
+  if (!row || row.source !== 'SDS' || memberDetailCache.value[ogId] !== undefined) return
+  memberDetailCache.value[ogId] = { loading: true }
+  try {
+    memberDetailCache.value[ogId] = await originGoodsApi.getOriginGood(ogId)
+  } catch {
+    memberDetailCache.value[ogId] = null
+  }
+}
+
+function memberSizeColumns(id: string) {
+  return memberDetail(id)?.detail?.sizeChart?.columns ?? []
+}
+
+function memberSizeRows(id: string) {
+  const rows = memberDetail(id)?.detail?.sizeChart?.rows ?? []
+  return rows.map((row: any) => ({
+    ...row,
+    ...(row.measurements ?? []).reduce((out: Record<string, string>, item: any) => {
+      out[item.key] = item.cm ?? '-'
+      return out
+    }, {}),
+  }))
+}
+
+function memberPackageRows(id: string) {
+  return memberDetail(id)?.detail?.packageSpecs?.rows ?? []
+}
+
+function memberVariants(id: string) {
+  return memberDetail(id)?.variants ?? []
+}
+
+// 矩阵三个归因维度的合法取值（与 api 端 auto-tag-rules 一致）
+const PRINT_COUNT_VALUES = ['单面印花', '双面印花']
+const CRAFT_VALUES = ['烫画', '直喷', '不打印']
+const LOGISTICS_VALUES = ['包邮', '不包邮']
+
+/** 成员的矩阵归因维度：优先取有效标签（人工接管后仍准确），回退按名称解析 */
+function memberDims(id: string) {
+  const row = editFamilyMembers.value.find((m) => m.id === id)
+  const fallback = linkDims(row?.goodName ?? null)
+  const tagNames = ((row as any)?.originGoodTags ?? [])
+    .map((r: any) => r.tag?.tagName)
+    .filter(Boolean) as string[]
+  const crafts = CRAFT_VALUES.filter((v) => tagNames.includes(v))
+  return {
+    logistics: LOGISTICS_VALUES.find((v) => tagNames.includes(v)) ?? fallback.logistics,
+    crafts: crafts.length ? crafts : fallback.crafts,
+    printCount: PRINT_COUNT_VALUES.find((v) => tagNames.includes(v)) ?? fallback.printCount,
+  }
+}
+
+async function handleSyncMemberDetail(row: { id: string; sdsGoodId: string }) {
+  if (!row.sdsGoodId || detailSyncing.value) return
+  detailSyncing.value = row.id
+  try {
+    const result = await syncApi.syncOneProductDetail(row.sdsGoodId)
+    memberDetailCache.value[row.id] = await originGoodsApi.getOriginGood(row.id)
+    ElMessage.success(`详情同步完成，共 ${result.variants} 个 SKU`)
+    emit('changed')
+  } catch (error: any) {
+    ElMessage.error(error?.response?.data?.message || '商品详情同步失败')
+  } finally { detailSyncing.value = '' }
+}
+
+/** 该链接在族价格矩阵中的格子（印花数量/工艺/物流 三维即该链接的归因标签） */
+function loadMemberPrices(ogId: string) {
+  const dims = memberDims(ogId)
+  if (!dims.printCount || !dims.crafts.length || !dims.logistics) {
+    memberPrices.value[ogId] = []
+    return
+  }
+  const matrixRows = (familyDetailRaw.value?.priceMatrix?.rows ?? []) as any[]
+  memberPrices.value[ogId] = matrixRows
+    .filter((r: any) =>
+      r.printCount === dims.printCount &&
+      dims.crafts.includes(r.craft) &&
+      r.logistics === dims.logistics)
+    .map((r: any) => ({
+      sizeId: String(r.sizeId),
+      colorId: String(r.colorId),
+      sizeName: r.sizeName ?? null,
+      colorName: r.colorName ?? null,
+      printCount: r.printCount,
+      craft: r.craft,
+      logistics: r.logistics,
+      price: String(r.price ?? ''),
+      manual: Boolean(r.manual),
+      editPrice: String(r.price ?? ''),
+    }))
+}
+
+async function saveMemberPrices(row: { id: string }) {
+  const cells = (memberPrices.value[row.id] ?? []).filter((c) => c.editPrice !== '' && c.editPrice !== c.price)
+  if (!cells.length) { ElMessage.info('价格没有修改'); return }
+  memberPriceSaving.value = row.id
+  try {
+    await productFamiliesApi.putOverrides(editFamilyId.value, cells.map((c) => ({
+      sizeId: c.sizeId, colorId: c.colorId, printCount: c.printCount, craft: c.craft, logistics: c.logistics, price: c.editPrice,
+    })))
+    ElMessage.success('价格已保存')
+    await loadEditFamily()
+    emit('changed')
+  } catch (e: any) {
+    ElMessage.error(e?.response?.data?.message || '保存失败')
+  } finally { memberPriceSaving.value = '' }
+}
+
+function initEditFamily(family: { familyId?: string; familyCode?: string | null } | null) {
+  editFamilyId.value = family?.familyId ?? ''
+  editFamilyCode.value = family?.familyCode ?? null
+  editFamilyMembers.value = []
+  familyMemberCount.value = null
+  editFamilyLoaded.value = false
+  editFamilyAddKw.value = ''
+  editFamilyCandidates.value = []
+  expandedMemberKeys.value = new Set()
+  memberTagEdits.value = {}
+  memberPrices.value = {}
+  familyDetailRaw.value = null
+  if (editFamilyId.value) loadEditFamily()
+}
+
+async function loadEditFamily() {
+  if (!editFamilyId.value) return
+  try {
+    const f = await productFamiliesApi.detail(editFamilyId.value) as any
+    familyDetailRaw.value = f
+    editFamilyCode.value = f.familyCode
+    familyMemberCount.value = f._count.originGoods
+    const primaryOgId = String(editGood.value?.originGoodId ?? '')
+    const members: FamilyMemberRow[] = (f.originGoods ?? []).map((m: any) => ({
+      id: String(m.id),
+      goodName: m.goodName ?? '',
+      goodImage: m.goodImage ?? null,
+      source: m.source,
+      delisted: Boolean(m.delisted),
+      sdsGoodId: m.sdsGoodId ?? '',
+      goodPrice: m.goodPrice ?? null,
+      variantCount: m._count?.variants ?? 0,
+      logisticsLabel: m.logisticsLabel ?? null,
+      craftLabel: m.craftLabel ?? null,
+      warehouseLabel: m.warehouseLabel ?? null,
+      tagsManual: Boolean(m.tagsManual),
+      tags: (m.originGoodTags ?? []).map((t: any) => ({
+        id: String(t.tag.id),
+        tagName: t.tag.tagName,
+        tagColor: t.tag.tagColor ?? null,
+        manual: Boolean(t.manual),
+      })),
+    }))
+    // 当前商品的链接排最前，其余按 id 稳定排序（界面上不区分主次）
+    members.sort((a, b) => {
+      const aP = a.id === primaryOgId ? 0 : 1
+      const bP = b.id === primaryOgId ? 0 : 1
+      return aP - bP || a.id.localeCompare(b.id)
+    })
+    editFamilyMembers.value = members
+    const edits: Record<string, string[]> = {}
+    for (const m of members) edits[m.id] = m.tags.map((t) => t.id)
+    memberTagEdits.value = edits
+    for (const key of expandedMemberKeys.value) loadMemberPrices(key)
+  } finally {
+    editFamilyLoaded.value = true
+  }
+}
+
+async function saveMemberTags(row: { id: string }) {
+  memberTagSaving.value = row.id
+  try {
+    const res = await originGoodsApi.updateTags(row.id, memberTagEdits.value[row.id] ?? [])
+    const filled = (res as OriginGoodTagsResult | undefined)?.filledDimensionTags ?? []
+    ElMessage.success(filled.length ? `标签已保存（缺维度已自动补齐：${filled.join('、')}）` : '标签已保存')
+    await loadEditFamily()
+    emit('changed')
+  } catch (e: any) {
+    ElMessage.error(e?.response?.data?.message || '保存失败')
+  } finally { memberTagSaving.value = '' }
+}
+
+async function resetMemberTags(row: { id: string }) {
+  memberTagSaving.value = row.id
+  try {
+    await originGoodsApi.resetTags(row.id)
+    ElMessage.success('已恢复按链接名称自动解析')
+    await loadEditFamily()
+    emit('changed')
+  } catch (e: any) {
+    ElMessage.error(e?.response?.data?.message || '恢复失败')
+  } finally { memberTagSaving.value = '' }
+}
+
+async function searchFamilyCandidates(q: string) {
+  if (!q) { editFamilyCandidates.value = []; return }
+  try {
+    const res = await originGoodsApi.getOriginGoodsList({ keyword: q, page: 1, pageSize: 20 })
+    editFamilyCandidates.value = res.items.map((o: any) => ({ id: String(o.id), goodName: o.goodName ?? o.sdsGoodId }))
+  } catch { editFamilyCandidates.value = [] }
+}
+
+async function addFamilyMember(c: { id: string; goodName: string }) {
+  if (!editFamilyId.value) { ElMessage.warning('该商品尚未成族'); return }
+  try {
+    await productFamiliesApi.updateMembers(editFamilyId.value, { addOriginGoodIds: [c.id] })
+    ElMessage.success('已加入族')
+    editFamilyAddKw.value = ''
+    await loadEditFamily()
+    emit('changed')
+  } catch (e: any) {
+    ElMessage.error(e?.response?.data?.message || '加入失败')
+  }
+}
+
+async function removeFamilyMember(m: { id: string }) {
+  if (!editFamilyId.value) return
+  try {
+    await ElMessageBox.confirm('确定把该链接移出族吗？', '确认', {
+      type: 'warning', confirmButtonText: '移除', cancelButtonText: '取消',
+    })
+  } catch { return }
+  try {
+    await productFamiliesApi.updateMembers(editFamilyId.value, { removeOriginGoodIds: [m.id] })
+    ElMessage.success('已移除出族')
+    await loadEditFamily()
+    emit('changed')
+  } catch (e: any) {
+    ElMessage.error(e?.response?.data?.message || '移除失败')
+  }
+}
+
+// ─── 打开 / 保存 / 删除 / 同步 ───
+watch(() => props.visible, (v) => {
+  if (v && props.goodId) initLoad()
+})
+
+async function initLoad() {
+  editGood.value = null
+  editDetailLoading.value = true
+  try {
+    const detail = await goodsApi.getGoodById(props.goodId)
+    applyGood(detail)
+  } catch {
+    ElMessage.warning('商品详情加载失败')
+  } finally {
+    editDetailLoading.value = false
+  }
+}
+
+function applyGood(g: GoodDetail) {
+  editGood.value = g
+  // 名称展示解析为「品名 型号」，保存后即采用解析名
+  editForm.value = {
+    id: g.id,
+    goodName: cleanLinkName(g.goodName) || g.goodName,
+    goodImage: g.goodImage || g.originGood?.goodImage || '',
+    countryId: g.countryId,
+    cascaderCategory: findCategoryPath(props.categories, g.categoryId),
+    categoryId: g.categoryId,
+    positionId: g.positionId || '',
+  }
+  initEditFamily((g as any).originGood?.family ?? null)
+  if (g.originGood?.isCustom) fillCustomContent(g)
+}
+
+async function quickCreateCountry() {
+  try {
+    const { value } = await ElMessageBox.prompt('请输入国家名称', '新增国家', {
+      confirmButtonText: '新增', cancelButtonText: '取消', inputPlaceholder: '国家名称',
+    })
+    if (!value.trim()) return
+    const created = await countriesApi.createCountry({ countryName: value.trim() } as any)
+    emit('dictionaries-changed')
+    if (created?.id) editForm.value.countryId = created.id
+    ElMessage.success('已创建并选中')
+  } catch {}
+}
+
+function onEditCascaderChange(val: any) {
+  const path = Array.isArray(val) ? val : []
+  editForm.value.categoryId = path.length ? String(path[path.length - 1]) : ''
+}
+
+async function handleEditSubmit() {
+  let customPayload: any = null
+  if (editIsCustom.value) {
+    let sizeChart: Record<string, unknown>
+    let packageSpecs: Record<string, unknown>
+    let options: Record<string, unknown>
+    let media: Record<string, unknown>
+    try {
+      sizeChart = JSON.parse(customContentForm.value.sizeChartJson)
+      packageSpecs = JSON.parse(customContentForm.value.packageSpecsJson)
+      options = JSON.parse(customContentForm.value.optionsJson)
+      media = JSON.parse(customContentForm.value.mediaJson)
+      for (const variant of customContentForm.value.variants) JSON.parse(variant.designDataJson)
+    } catch {
+      ElMessage.error('尺码表、包装规格、选项、媒体或 SKU 设计数据不是有效 JSON')
+      return
+    }
+    if (customContentForm.value.variants.some((variant) => !variant.sku.trim())) {
+      ElMessage.error('SKU 不能为空')
+      return
+    }
+    customPayload = {
+      goodName: editForm.value.goodName,
+      goodImage: editForm.value.goodImage || null,
+      goodPrice: customContentForm.value.goodPrice || null,
+      detail: {
+        productCode: customContentForm.value.productCode || null,
+        englishName: customContentForm.value.englishName || null,
+        productionCycleHours: customContentForm.value.productionCycleHours ?? null,
+        minWeightG: customContentForm.value.minWeightG || null,
+        productionProcess: customContentForm.value.productionProcess || null,
+        materialDescription: customContentForm.value.materialDescription || null,
+        blankDesignUrl: customContentForm.value.blankDesignUrl || null,
+        detailsPageVideoUrl: customContentForm.value.detailsPageVideoUrl || null,
+        textureName: customContentForm.value.textureName || null,
+        reminder: customContentForm.value.reminder || null,
+        productPerformance: customContentForm.value.productPerformance || null,
+        applicableScenarios: customContentForm.value.applicableScenarios || null,
+        washingInstructions: customContentForm.value.washingInstructions || null,
+        specialDescription: customContentForm.value.specialDescription || null,
+        designExplanation: customContentForm.value.designExplanation || null,
+        designArea: customContentForm.value.designArea || null,
+        pictureRequest: customContentForm.value.pictureRequest || null,
+        sizeChart,
+        packageSpecs,
+        options,
+        media,
+      },
+      variants: customContentForm.value.variants.map((variant: any, index: number) => ({
+        sku: variant.sku.trim(),
+        sizeId: variant.sizeId || null,
+        sizeName: variant.sizeName || null,
+        colorId: variant.colorId || null,
+        colorName: variant.colorName || null,
+        colorHex: variant.colorHex || null,
+        imageUrl: variant.imageUrl || null,
+        price: variant.price || null,
+        originalPrice: variant.originalPrice || null,
+        weightG: variant.weightG || null,
+        boxLengthCm: variant.boxLengthCm || null,
+        boxWidthCm: variant.boxWidthCm || null,
+        boxHeightCm: variant.boxHeightCm || null,
+        designData: JSON.parse(variant.designDataJson),
+        enabled: variant.enabled,
+        sortOrder: index,
+      })),
+    }
+  }
+  editLoading.value = true
+  try {
+    await goodsApi.updateGood(editForm.value.id, {
+      goodName: editForm.value.goodName,
+      goodImage: editForm.value.goodImage || null,
+      countryId: Number(editForm.value.countryId),
+      categoryId: Number(editForm.value.categoryId),
+      positionId: editForm.value.positionId ? Number(editForm.value.positionId) : null,
+    } as any)
+    if (customPayload) await goodsApi.updateCustomGoodContent(editForm.value.id, customPayload)
+    ElMessage.success('更新成功')
+    emit('update:visible', false)
+    emit('changed')
+  } catch (e: any) {
+    ElMessage.error(e?.response?.data?.message || '更新失败')
+  } finally { editLoading.value = false }
+}
+
+async function handleDeleteGood() {
+  const g = editGood.value
+  if (!g) return
+  try {
+    await ElMessageBox.confirm(`确定删除「${g.goodName}」吗？`, '确认', {
+      type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消',
+    })
+  } catch { return }
+  await goodsApi.deleteGood(g.id)
+  ElMessage.success('删除成功')
+  emit('update:visible', false)
+  emit('deleted')
+}
+</script>
+
+<template>
+  <el-dialog :model-value="visible" :title="cleanLinkName(editGood?.goodName) || '编辑商品'" width="900px" destroy-on-close @update:model-value="emit('update:visible', $event)">
+    <div v-if="!editIsCustom" class="edit-merged-box">
+      <div class="edit-merged-title">
+        关联原产品
+        <el-tooltip content="同族链接合并为一个商品：尺码/包装并集 + 价格矩阵。展开成员可查看详情、修正标签、调整价格。">
+          <el-icon><QuestionFilled /></el-icon>
+        </el-tooltip>
+        <span v-if="editFamilyCode" class="edit-family-code">族 {{ editFamilyCode }} · {{ familyMemberCount ?? editFamilyMembers.length }} 条链接</span>
+      </div>
+      <div class="edit-merged-list">
+        <template v-for="row in editFamilyMembers" :key="row.id">
+          <div class="edit-merged-item">
+            <el-icon
+              class="member-expand-toggle"
+              :class="{ 'is-expanded': expandedMemberKeys.has(row.id) }"
+              @click="toggleMemberExpand(row.id)"
+            ><ArrowDown /></el-icon>
+            <span class="edit-merged-name" :title="row.goodName">{{ row.goodName }}</span>
+            <span v-if="row.tags.length || deriveLinkTagNames(row.goodName).length" class="member-chips">
+              <template v-if="row.tags.length">
+                <span v-for="c in row.tags" :key="c.id" class="member-chip" :class="{ 'is-manual': c.manual }">{{ c.tagName }}</span>
+              </template>
+              <template v-else>
+                <span v-for="c in deriveLinkTagNames(row.goodName)" :key="c" class="member-chip is-preview">{{ c }}</span>
+              </template>
+            </span>
+            <span v-if="row.tagsManual" class="member-manual-flag" title="人工接管：自动同步不再覆盖该链接的标签">人工</span>
+            <div class="edit-merged-actions">
+              <el-button size="small" link type="danger" @click="removeFamilyMember(row)">移除出族</el-button>
+            </div>
+          </div>
+          <div v-if="expandedMemberKeys.has(row.id)" class="member-detail-panel">
+            <div class="member-detail-grid">
+              <span class="md-label">SDS ID</span><span class="md-val">{{ row.sdsGoodId || '-' }}</span>
+              <span class="md-label">链接价格</span><span class="md-val">{{ row.goodPrice ? `¥${row.goodPrice}` : '-' }}</span>
+              <span class="md-label">SKU 数</span><span class="md-val">{{ row.id === editGood?.originGoodId ? (editGood?.originGood?.variantCount ?? row.variantCount) : row.variantCount }}</span>
+              <span class="md-label">物流备注</span><span class="md-val">{{ row.logisticsLabel || '-' }}</span>
+              <span class="md-label">工艺位置</span><span class="md-val">{{ row.craftLabel || '-' }}</span>
+              <span class="md-label">仓库</span><span class="md-val">{{ row.warehouseLabel || '-' }}</span>
+            </div>
+              <div class="member-tags-edit">
+                <span class="md-label">标签</span>
+                <el-select
+                  v-model="memberTagEdits[row.id]"
+                  multiple filterable size="small"
+                  placeholder="选择标签"
+                  style="flex:1"
+                >
+                  <el-option-group v-for="g in tagOptionGroups" :key="g.id" :label="g.label">
+                    <el-option v-for="t in g.tags" :key="t.id" :label="t.tagName" :value="t.id" />
+                  </el-option-group>
+                </el-select>
+                <el-button size="small" type="primary" :loading="memberTagSaving === row.id" @click="saveMemberTags(row)">保存标签</el-button>
+                <el-button v-if="row.tagsManual" size="small" :loading="memberTagSaving === row.id" @click="resetMemberTags(row)">恢复自动</el-button>
+              </div>
+            <div v-if="row.craftLabel && row.logisticsLabel" class="member-price-block">
+              <div class="member-price-head">
+                <el-button size="small" type="primary" :loading="memberPriceSaving === row.id" @click="saveMemberPrices(row)">保存价格</el-button>
+              </div>
+              <el-table :data="memberPrices[row.id] ?? []" border size="small" max-height="240">
+                <el-table-column prop="sizeName" label="尺码" width="100" />
+                <el-table-column prop="colorName" label="颜色" min-width="120" />
+                <el-table-column label="价格" width="130">
+                  <template #default="{ row: cell }">
+                    <el-input v-model="cell.editPrice" size="small" @input="cell.editPrice = String(cell.editPrice)" />
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+            <div v-if="row.source === 'SDS'" class="member-extra">
+              <div class="member-detail-head">
+                <span v-if="!memberDetail(row.id) || memberDetail(row.id).loading" class="md-empty">详情加载中…</span>
+                <span v-else-if="!memberDetail(row.id).hasDetail" class="md-empty">尚未同步详情</span>
+                <el-button
+                  size="small"
+                  :icon="Refresh"
+                  :loading="detailSyncing === row.id"
+                  @click="handleSyncMemberDetail(row)"
+                >{{ memberDetail(row.id)?.hasDetail ? '重新同步详情' : '同步详情' }}</el-button>
+              </div>
+              <el-tabs v-if="memberDetail(row.id) && memberDetail(row.id).hasDetail" class="member-detail-tabs">
+                <el-tab-pane label="商品详情">
+                  <el-descriptions :column="2" border size="small">
+                    <el-descriptions-item label="商品编码">{{ memberDetail(row.id).detail.productCode || '-' }}</el-descriptions-item>
+                    <el-descriptions-item label="英文名称">{{ memberDetail(row.id).detail.englishName || '-' }}</el-descriptions-item>
+                    <el-descriptions-item label="生产周期">{{ memberDetail(row.id).detail.productionCycleHours ?? '-' }} 小时</el-descriptions-item>
+                    <el-descriptions-item label="净重">{{ memberDetail(row.id).detail.minWeightG ?? '-' }} g</el-descriptions-item>
+                    <el-descriptions-item label="生产工艺">{{ memberDetail(row.id).detail.productionProcess || '-' }}</el-descriptions-item>
+                    <el-descriptions-item label="材质">{{ memberDetail(row.id).detail.materialDescription || '-' }}</el-descriptions-item>
+                  </el-descriptions>
+                </el-tab-pane>
+                <el-tab-pane :label="`尺码表 (${memberSizeRows(row.id).length})`">
+                  <el-table :data="memberSizeRows(row.id)" border size="small" max-height="240">
+                    <el-table-column prop="sizeName" label="尺码" width="100" fixed />
+                    <el-table-column
+                      v-for="column in memberSizeColumns(row.id)"
+                      :key="column.key"
+                      :prop="column.key"
+                      :label="`${column.name} (cm)`"
+                      min-width="110"
+                    />
+                  </el-table>
+                </el-tab-pane>
+                <el-tab-pane :label="`包装规格 (${memberPackageRows(row.id).length})`">
+                  <el-table :data="memberPackageRows(row.id)" border size="small" max-height="240">
+                    <el-table-column prop="sizeName" label="尺码" width="90" fixed />
+                    <el-table-column label="包装尺寸 (cm)" min-width="150">
+                      <template #default="{ row: pkg }">
+                        {{ pkg.dimensionsCm ? `${pkg.dimensionsCm.length}×${pkg.dimensionsCm.width}×${pkg.dimensionsCm.height}` : '-' }}
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="volumeCm3" label="体积 (cm³)" width="110" />
+                    <el-table-column prop="grossWeightG" label="含包装重量 (g)" width="140" />
+                  </el-table>
+                </el-tab-pane>
+                <el-tab-pane :label="`SKU (${memberVariants(row.id).length})`">
+                  <el-table :data="memberVariants(row.id)" border size="small" max-height="240">
+                    <el-table-column prop="sku" label="SKU" min-width="160" fixed />
+                    <el-table-column label="物流" width="100">
+                      <template #default>{{ memberDims(row.id).logistics || '-' }}</template>
+                    </el-table-column>
+                    <el-table-column label="工艺" width="90">
+                      <template #default>{{ memberDims(row.id).crafts.join(' / ') || '-' }}</template>
+                    </el-table-column>
+                    <el-table-column label="印花数量" width="95">
+                      <template #default>{{ memberDims(row.id).printCount || '-' }}</template>
+                    </el-table-column>
+                    <el-table-column prop="sizeName" label="尺码" width="85" />
+                    <el-table-column prop="colorName" label="颜色" width="100" />
+                    <el-table-column prop="price" label="价格" width="90" />
+                    <el-table-column label="状态" width="80">
+                      <template #default="{ row: variant }">
+                        <el-tag :type="variant.enabled ? 'success' : 'info'" size="small">{{ variant.enabled ? '可用' : '停用' }}</el-tag>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </el-tab-pane>
+              </el-tabs>
+            </div>
+          </div>
+        </template>
+        <div v-if="!editFamilyLoaded && editFamilyId" class="edit-family-loading">族成员加载中…</div>
+        <div v-else-if="!editFamilyId" class="edit-family-loading">暂未成族：配置合并时自动成族</div>
+      </div>
+      <el-select v-model="editFamilyAddKw" filterable remote :remote-method="searchFamilyCandidates"
+        placeholder="搜索原产品名称添加到族" clearable style="width:100%">
+        <el-option v-for="c in editFamilyCandidates" :key="c.id" :label="c.goodName" :value="String(c.id)"
+          @click="addFamilyMember(c)" />
+      </el-select>
+    </div>
+    <el-form v-loading="editDetailLoading" label-width="80px" style="margin-top: 16px">
+      <el-form-item label="名称"><el-input v-model="editForm.goodName" /></el-form-item>
+      <el-form-item label="图片">
+        <ImageUpload v-model="editForm.goodImage" label="上传图片" />
+      </el-form-item>
+      <el-form-item label="国家">
+        <div class="select-inline">
+          <el-select v-model="editForm.countryId" filterable placeholder="请选择国家">
+            <el-option v-for="c in countries" :key="c.id" :label="c.countryName" :value="c.id" />
+          </el-select>
+          <el-button text :icon="Plus" @click="quickCreateCountry" />
+        </div>
+      </el-form-item>
+      <el-form-item label="分类">
+        <el-cascader v-model="editForm.cascaderCategory" :options="categoryCascader as any" :props="{ checkStrictly: true }" placeholder="请选择分类" @change="onEditCascaderChange" />
+      </el-form-item>
+      <el-form-item v-if="editIsCustom" label="基础价格">
+        <el-input v-model="customContentForm.goodPrice" placeholder="例如 28.00" />
+      </el-form-item>
+    </el-form>
+
+    <!-- 自定义商品内容编辑（SDS 商品的详情在「关联原产品」成员面板内查看） -->
+    <el-tabs v-if="editIsCustom" class="detail-tabs">
+      <el-tab-pane label="商品详情">
+        <el-form label-width="100px" class="custom-detail-form">
+          <el-form-item label="商品编码"><el-input v-model="customContentForm.productCode" /></el-form-item>
+          <el-form-item label="英文名称"><el-input v-model="customContentForm.englishName" /></el-form-item>
+          <el-form-item label="生产周期"><el-input-number v-model="customContentForm.productionCycleHours" :min="0" /><span style="margin-left:8px">小时</span></el-form-item>
+          <el-form-item label="净重"><el-input v-model="customContentForm.minWeightG"><template #append>g</template></el-input></el-form-item>
+          <el-form-item label="生产工艺"><el-input v-model="customContentForm.productionProcess" type="textarea" /></el-form-item>
+          <el-form-item label="材质"><el-input v-model="customContentForm.materialDescription" type="textarea" /></el-form-item>
+          <el-form-item label="空白设计图"><el-input v-model="customContentForm.blankDesignUrl" /></el-form-item>
+          <el-form-item label="详情视频"><el-input v-model="customContentForm.detailsPageVideoUrl" /></el-form-item>
+          <el-form-item label="面料名称"><el-input v-model="customContentForm.textureName" /></el-form-item>
+          <el-form-item label="温馨提示"><el-input v-model="customContentForm.reminder" type="textarea" /></el-form-item>
+          <el-form-item label="产品性能"><el-input v-model="customContentForm.productPerformance" type="textarea" /></el-form-item>
+          <el-form-item label="适用场景"><el-input v-model="customContentForm.applicableScenarios" type="textarea" /></el-form-item>
+          <el-form-item label="洗涤说明"><el-input v-model="customContentForm.washingInstructions" type="textarea" /></el-form-item>
+          <el-form-item label="特殊说明"><el-input v-model="customContentForm.specialDescription" type="textarea" /></el-form-item>
+          <el-form-item label="设计说明"><el-input v-model="customContentForm.designExplanation" type="textarea" /></el-form-item>
+          <el-form-item label="设计区域"><el-input v-model="customContentForm.designArea" /></el-form-item>
+          <el-form-item label="图片要求"><el-input v-model="customContentForm.pictureRequest" type="textarea" /></el-form-item>
+          <el-form-item label="商品选项 JSON"><el-input v-model="customContentForm.optionsJson" type="textarea" :rows="6" /></el-form-item>
+          <el-form-item label="媒体数据 JSON"><el-input v-model="customContentForm.mediaJson" type="textarea" :rows="6" /></el-form-item>
+        </el-form>
+      </el-tab-pane>
+      <el-tab-pane label="尺码表">
+        <el-input v-model="customContentForm.sizeChartJson" type="textarea" :rows="14" placeholder="尺码表 JSON" />
+      </el-tab-pane>
+      <el-tab-pane label="包装规格">
+        <el-input v-model="customContentForm.packageSpecsJson" type="textarea" :rows="14" placeholder="包装规格 JSON" />
+      </el-tab-pane>
+      <el-tab-pane :label="`SKU (${customContentForm.variants.length})`">
+        <div style="display:flex;justify-content:flex-end;margin-bottom:8px"><el-button size="small" :icon="Plus" @click="addCustomVariant">添加 SKU</el-button></div>
+        <el-table :data="customContentForm.variants" border max-height="320">
+          <el-table-column label="SKU" min-width="160"><template #default="{ row }"><el-input v-model="row.sku" /></template></el-table-column>
+          <el-table-column label="尺码 ID" width="120"><template #default="{ row }"><el-input v-model="row.sizeId" /></template></el-table-column>
+          <el-table-column label="尺码" width="120"><template #default="{ row }"><el-input v-model="row.sizeName" /></template></el-table-column>
+          <el-table-column label="颜色 ID" width="120"><template #default="{ row }"><el-input v-model="row.colorId" /></template></el-table-column>
+          <el-table-column label="颜色" width="120"><template #default="{ row }"><el-input v-model="row.colorName" /></template></el-table-column>
+          <el-table-column label="色值" width="120"><template #default="{ row }"><el-input v-model="row.colorHex" placeholder="#FFFFFF" /></template></el-table-column>
+          <el-table-column label="图片" min-width="180"><template #default="{ row }"><el-input v-model="row.imageUrl" /></template></el-table-column>
+          <el-table-column label="价格" width="120"><template #default="{ row }"><el-input v-model="row.price" /></template></el-table-column>
+          <el-table-column label="原价" width="120"><template #default="{ row }"><el-input v-model="row.originalPrice" /></template></el-table-column>
+          <el-table-column label="重量(g)" width="120"><template #default="{ row }"><el-input v-model="row.weightG" /></template></el-table-column>
+          <el-table-column label="包装长(cm)" width="130"><template #default="{ row }"><el-input v-model="row.boxLengthCm" /></template></el-table-column>
+          <el-table-column label="包装宽(cm)" width="130"><template #default="{ row }"><el-input v-model="row.boxWidthCm" /></template></el-table-column>
+          <el-table-column label="包装高(cm)" width="130"><template #default="{ row }"><el-input v-model="row.boxHeightCm" /></template></el-table-column>
+          <el-table-column label="设计数据 JSON" min-width="220"><template #default="{ row }"><el-input v-model="row.designDataJson" type="textarea" :rows="2" /></template></el-table-column>
+          <el-table-column label="启用" width="80"><template #default="{ row }"><el-switch v-model="row.enabled" /></template></el-table-column>
+          <el-table-column label="操作" width="70"><template #default="{ $index }"><el-button link type="danger" @click="customContentForm.variants.splice($index, 1)">删除</el-button></template></el-table-column>
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+
+    <!-- 族级并集视图（弹窗最底部）：尺码表/包装规格为族并集，SKU 为价格矩阵动态合并 -->
+    <el-tabs v-if="!editIsCustom && editFamilyId && editFamilyLoaded" class="detail-tabs">
+      <el-tab-pane :label="`尺码表 (${familySizeRows.length})`">
+        <el-table :data="familySizeRows" border size="small" max-height="260">
+          <el-table-column prop="sizeName" label="尺码" width="100" fixed />
+          <el-table-column
+            v-for="column in familySizeColumns"
+            :key="column.key"
+            :prop="column.key"
+            :label="`${column.name} (cm)`"
+            min-width="110"
+          />
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane :label="`包装规格 (${familyPackageRows.length})`">
+        <el-table :data="familyPackageRows" border size="small" max-height="260">
+          <el-table-column prop="sizeName" label="尺码" width="90" fixed />
+          <el-table-column label="包装尺寸 (cm)" min-width="150">
+            <template #default="{ row }">
+              {{ row.dimensionsCm ? `${row.dimensionsCm.length}×${row.dimensionsCm.width}×${row.dimensionsCm.height}` : '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="volumeCm3" label="体积 (cm³)" width="110" />
+          <el-table-column prop="grossWeightG" label="含包装重量 (g)" width="140" />
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane :label="`SKU (${familySkuRows.length})`">
+        <el-table :data="familySkuRows" border size="small" max-height="260">
+          <el-table-column label="物流" width="110">
+            <template #default="{ row }">{{ row.logistics || '-' }}</template>
+          </el-table-column>
+          <el-table-column label="工艺" width="100">
+            <template #default="{ row }">{{ row.craft || '-' }}</template>
+          </el-table-column>
+          <el-table-column label="印花数量" width="100">
+            <template #default="{ row }">{{ row.printCount || '-' }}</template>
+          </el-table-column>
+          <el-table-column prop="sizeName" label="尺码" width="90" />
+          <el-table-column prop="colorName" label="颜色" min-width="110" />
+          <el-table-column label="价格" width="100">
+            <template #default="{ row }">{{ row.price }}</template>
+          </el-table-column>
+          <el-table-column label="链接数" width="80">
+            <template #default="{ row }">{{ row.sourceCount || 1 }}</template>
+          </el-table-column>
+          <el-table-column label="状态" width="90">
+            <template #default="{ row }">
+              <el-tag :type="row.manual ? 'warning' : 'success'" size="small">{{ row.manual ? '人工价' : '推导价' }}</el-tag>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+    <template #footer>
+      <el-button type="danger" @click="handleDeleteGood">删除</el-button>
+      <el-button @click="emit('update:visible', false)">取消</el-button>
+      <el-button type="primary" :loading="editLoading" @click="handleEditSubmit">保存</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style scoped>
+.edit-merged-box { margin-bottom: 4px; }
+.edit-merged-title {
+  display: flex; align-items: center; gap: 4px;
+  font-weight: 600; font-size: 13px; margin-bottom: 8px;
+}
+.edit-family-code { margin-left: auto; font-weight: 400; font-size: 12px; color: var(--el-color-primary); }
+.edit-merged-list { display: flex; flex-direction: column; gap: 6px; margin-bottom: 8px; }
+.edit-merged-item {
+  display: flex; align-items: center; gap: 8px;
+  padding: 6px 10px; background: #f5f7fa; border-radius: 6px; font-size: 13px;
+}
+.edit-merged-name {
+  flex: 1; min-width: 0;
+  overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
+}
+.edit-merged-actions { flex-shrink: 0; display: flex; align-items: center; }
+.edit-merged-actions .el-button + .el-button { margin-left: 4px; }
+.member-chips { display: flex; align-items: center; gap: 4px; flex-shrink: 0; flex-wrap: nowrap; overflow: hidden; }
+.member-chip {
+  font-size: 11px; line-height: 16px; padding: 1px 7px; border-radius: 8px;
+  background: #ecf5ff; color: var(--el-color-primary); white-space: nowrap;
+}
+.member-chip.is-manual { background: #f0f9eb; color: var(--el-color-success); }
+.member-chip.is-preview { background: #f4f4f5; color: #909399; border: 1px dashed #dcdfe6; }
+.member-manual-flag {
+  font-size: 11px; line-height: 16px; padding: 0 6px; border-radius: 4px;
+  background: #f0f9eb; color: var(--el-color-success); flex-shrink: 0;
+}
+.member-expand-toggle { cursor: pointer; flex-shrink: 0; color: #909399; transition: transform 0.18s; }
+.member-expand-toggle.is-expanded { transform: rotate(180deg); }
+.member-detail-panel {
+  background: #fbfcfe; border: 1px solid #ebeef5; border-radius: 6px;
+  padding: 10px 12px; margin: -2px 0 2px 30px;
+}
+.member-detail-grid {
+  display: grid; grid-template-columns: 64px minmax(0, 1fr) 64px minmax(0, 1fr);
+  gap: 4px 10px; font-size: 12px; margin-bottom: 8px;
+}
+.md-label { color: #909399; font-size: 12px; }
+.md-val { color: #606266; font-size: 12px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.member-tags-edit { display: flex; align-items: center; gap: 8px; margin-bottom: 8px; }
+.member-tags-edit .md-label { flex-shrink: 0; }
+.member-price-block { border-top: 1px dashed #e4e7ed; padding-top: 8px; }
+.member-price-head { display: flex; align-items: center; justify-content: flex-end; margin-bottom: 6px; }
+.member-extra { border-top: 1px dashed #e4e7ed; padding-top: 8px; }
+.md-empty {
+  display: flex; align-items: center; justify-content: space-between; gap: 8px;
+  font-size: 12px; color: var(--el-text-color-placeholder); padding: 4px 0;
+}
+.member-detail-head {
+  display: flex; align-items: center; justify-content: space-between; gap: 8px;
+  margin-bottom: 4px;
+}
+.member-detail-head .md-empty { padding: 0; }
+.member-detail-tabs :deep(.el-tabs__header) { margin-bottom: 8px; }
+.edit-family-loading { color: var(--el-text-color-placeholder); font-size: 12px; padding: 4px 0; }
+.family-detail-tabs { margin-top: 10px; }
+.family-detail-tabs :deep(.el-tabs__header) { margin-bottom: 8px; }
+.detail-tabs { margin-top: 12px; padding-top: 4px; border-top: 1px solid #ebeef5; }
+.select-inline { display: flex; align-items: center; gap: 6px; width: 100%; }
+</style>

apps/admin/src/views/goods/components/TagFilterPopover.vue

@@ -0,0 +1,478 @@
+<script setup lang="ts">
+import { computed, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { Plus, Edit, ArrowDown } from '@element-plus/icons-vue'
+import type { Tag, TagGroup } from '@/types'
+import { tagsApi } from '@/api/tags'
+import { tagGroupsApi } from '@/api/tag-groups'
+
+const props = defineProps<{
+  tags: Tag[]
+  tagGroups: TagGroup[]
+  selected: string[]
+}>()
+
+const emit = defineEmits<{
+  (e: 'update:selected', v: string[]): void
+  /** 标签/分组变化后由父级刷新字典 */
+  (e: 'dictionaries-changed'): void
+}>()
+
+const selectedTagIds = computed({
+  get: () => props.selected,
+  set: (v: string[]) => emit('update:selected', v),
+})
+
+interface TreeNode {
+  id: string
+  rawId: string | null
+  type: 'group' | 'tag'
+  label: string
+  disabled?: boolean
+  children?: TreeNode[]
+}
+
+const tagPopoverVisible = ref(false)
+const hoveredNodeId = ref<string | null>(null)
+
+const MAX_VISIBLE_TAGS = 1
+
+const displayedSelectedTagIds = computed(() =>
+  selectedTagIds.value.slice(0, MAX_VISIBLE_TAGS),
+)
+const hiddenSelectedCount = computed(() =>
+  Math.max(0, selectedTagIds.value.length - MAX_VISIBLE_TAGS),
+)
+
+function getTagName(id: string): string {
+  return props.tags.find((t) => t.id === id)?.tagName ?? id
+}
+
+function removeSelectedTag(id: string): void {
+  selectedTagIds.value = selectedTagIds.value.filter((v) => v !== id)
+}
+
+function toggleTagInSelection(tagId: string): void {
+  if (selectedTagIds.value.includes(tagId)) {
+    selectedTagIds.value = selectedTagIds.value.filter((v) => v !== tagId)
+  } else {
+    selectedTagIds.value = [...selectedTagIds.value, tagId]
+  }
+}
+
+const tagTreeData = computed<TreeNode[]>(() => {
+  const groupNodes: TreeNode[] = props.tagGroups
+    .slice()
+    .sort((a, b) => a.sortOrder - b.sortOrder)
+    .map((g) => ({
+      id: `g-${g.id}`,
+      rawId: g.id,
+      type: 'group' as const,
+      label: g.groupName,
+      children: props.tags
+        .filter((t) => t.tagGroupId === g.id)
+        .sort((a, b) => (a.sortOrder ?? 0) - (b.sortOrder ?? 0))
+        .map((t) => ({
+          id: `t-${t.id}`,
+          rawId: t.id,
+          type: 'tag' as const,
+          label: t.tagName,
+        })),
+    }))
+
+  const ungrouped: TreeNode[] = props.tags
+    .filter((t) => !t.tagGroupId)
+    .sort((a, b) => a.tagName.localeCompare(b.tagName))
+    .map((t) => ({
+      id: `t-${t.id}`,
+      rawId: t.id,
+      type: 'tag' as const,
+      label: t.tagName,
+    }))
+
+  if (ungrouped.length > 0) {
+    groupNodes.push({
+      id: 'g-ungrouped',
+      rawId: null,
+      type: 'group',
+      label: '未分组',
+      disabled: true,
+      children: ungrouped,
+    })
+  }
+  return groupNodes
+})
+
+function onTreeNodeClick(data: TreeNode): void {
+  if (data.type === 'group' && !data.disabled) {
+    // 点击分组 = 全选/取消该组全部标签
+    const tagIds = (data.children ?? []).map((c) => c.rawId!).filter(Boolean)
+    if (tagIds.length === 0) return
+    const allSelected = tagIds.every((id) => selectedTagIds.value.includes(id))
+    if (allSelected) {
+      selectedTagIds.value = selectedTagIds.value.filter((id) => !tagIds.includes(id))
+    } else {
+      selectedTagIds.value = [...new Set([...selectedTagIds.value, ...tagIds])]
+    }
+  }
+}
+
+// ─── 标签编辑小弹窗 ───
+const tagEditVisible = ref(false)
+const tagEditForm = ref({ id: '', tagName: '', tagColor: '#ff6800', tagFontColor: '#ffffff' })
+const tagEditLoading = ref(false)
+
+function openTagEdit(t: Tag) {
+  tagEditForm.value = { id: t.id, tagName: t.tagName, tagColor: t.tagColor || '#ff6800', tagFontColor: t.tagFontColor || '#ffffff' }
+  tagEditVisible.value = true
+}
+
+function openTagEditById(id: string): void {
+  const t = props.tags.find((tag) => tag.id === id)
+  if (t) openTagEdit(t)
+}
+
+async function handleTagEditSubmit() {
+  if (!tagEditForm.value.tagName.trim()) { ElMessage.warning('请输入标签名称'); return }
+  tagEditLoading.value = true
+  try {
+    await tagsApi.updateTag(tagEditForm.value.id, { tagName: tagEditForm.value.tagName.trim(), tagColor: tagEditForm.value.tagColor, tagFontColor: tagEditForm.value.tagFontColor } as any)
+    ElMessage.success('保存成功')
+    tagEditVisible.value = false
+    emit('dictionaries-changed')
+  } catch (e: any) { ElMessage.error(e?.response?.data?.message || '操作失败') }
+  finally { tagEditLoading.value = false }
+}
+
+async function handleTagEditDelete() {
+  try {
+    await ElMessageBox.confirm(`确定删除标签「${tagEditForm.value.tagName}」吗？`, '确认', { type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消' })
+  } catch { return }
+  try {
+    await tagsApi.deleteTag(tagEditForm.value.id)
+    ElMessage.success('删除成功')
+    tagEditVisible.value = false
+    emit('dictionaries-changed')
+  } catch { ElMessage.error('删除失败') }
+}
+
+// ─── 分组编辑小弹窗 ───
+const groupEditVisible = ref(false)
+const groupEditLoading = ref(false)
+const groupEditForm = ref<{ id: string; groupName: string }>({ id: '', groupName: '' })
+
+function openGroupEdit(node: TreeNode): void {
+  // 虚拟「未分组」节点不可编辑
+  if (node.id === 'g-ungrouped') return
+  groupEditForm.value = { id: node.rawId!, groupName: node.label }
+  groupEditVisible.value = true
+}
+
+async function handleGroupSave(): Promise<void> {
+  const name = groupEditForm.value.groupName.trim()
+  if (!name) { ElMessage.warning('请输入分组名称'); return }
+  groupEditLoading.value = true
+  try {
+    await tagGroupsApi.updateTagGroup(groupEditForm.value.id, { groupName: name })
+    ElMessage.success('已保存')
+    groupEditVisible.value = false
+    emit('dictionaries-changed')
+  } catch (e: any) {
+    ElMessage.error(e?.response?.data?.message || '保存失败')
+  } finally {
+    groupEditLoading.value = false
+  }
+}
+
+async function handleGroupDelete(): Promise<void> {
+  try {
+    await ElMessageBox.confirm(
+      `删除分组「${groupEditForm.value.groupName}」后，组内标签将归为「未分组」。确认删除？`,
+      '确认删除',
+      { type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消' },
+    )
+  } catch { return }
+  groupEditLoading.value = true
+  try {
+    await tagGroupsApi.deleteTagGroup(groupEditForm.value.id)
+    ElMessage.success('已删除')
+    groupEditVisible.value = false
+    emit('dictionaries-changed')
+  } catch (e: any) {
+    ElMessage.error(e?.response?.data?.message || '删除失败')
+  } finally {
+    groupEditLoading.value = false
+  }
+}
+
+async function quickCreateTagGroup() {
+  try {
+    const { value } = await ElMessageBox.prompt('请输入分组名称', '新建分组', {
+      confirmButtonText: '新建', cancelButtonText: '取消', inputPlaceholder: '分组名称',
+    })
+    if (!value.trim()) return
+    const maxSort = Math.max(0, ...props.tagGroups.map((g) => g.sortOrder))
+    await tagGroupsApi.createTagGroup({ groupName: value.trim(), sortOrder: maxSort + 1 } as any)
+    ElMessage.success('已创建分组')
+    emit('dictionaries-changed')
+  } catch {}
+}
+</script>
+
+<template>
+  <el-popover
+    v-model:visible="tagPopoverVisible"
+    placement="bottom-start"
+    :width="280"
+    trigger="click"
+    transition="el-zoom-in-top"
+    popper-class="tag-filter-popper"
+  >
+    <template #reference>
+      <div
+        class="tag-select-trigger"
+        :class="{ 'is-filled': selectedTagIds.length > 0, 'is-active': tagPopoverVisible }"
+      >
+        <template v-if="selectedTagIds.length === 0">
+          <span class="placeholder">标签筛选</span>
+        </template>
+        <template v-else>
+          <el-tag
+            v-for="id in displayedSelectedTagIds"
+            :key="id"
+            size="small"
+            closable
+            type="info"
+            @close.stop="removeSelectedTag(id)"
+          >
+            {{ getTagName(id) }}
+          </el-tag>
+          <span v-if="hiddenSelectedCount > 0" class="more-tag">+{{ hiddenSelectedCount }}</span>
+        </template>
+        <el-icon class="tag-arrow"><ArrowDown /></el-icon>
+      </div>
+    </template>
+
+    <div class="tag-tree-panel">
+      <div class="tag-tree-toolbar">
+        <el-button text size="small" :icon="Plus" @click="quickCreateTagGroup">新建分组</el-button>
+      </div>
+      <el-tree
+        :data="tagTreeData"
+        node-key="id"
+        default-expand-all
+        :props="{ label: 'label', children: 'children' }"
+        @node-click="onTreeNodeClick"
+      >
+        <template #default="{ data }">
+          <div
+            class="tree-row"
+            :class="{
+              'is-group': data.type === 'group',
+              'is-tag': data.type === 'tag',
+              'is-disabled': data.disabled,
+              'is-checked': data.type === 'tag' && selectedTagIds.includes(data.rawId),
+            }"
+            @mouseenter="hoveredNodeId = data.id"
+            @mouseleave="hoveredNodeId = null"
+          >
+            <template v-if="data.type === 'group'">
+              <i class="fa-solid fa-folder node-icon" />
+              <span class="node-label">
+                {{ data.label }}
+                <span v-if="data.children && data.children.length" class="node-count">{{ data.children.length }}</span>
+              </span>
+              <span v-show="hoveredNodeId === data.id" class="node-actions">
+                <el-button text size="small" :icon="Edit" title="编辑分组" @click.stop="openGroupEdit(data)" />
+              </span>
+            </template>
+            <template v-else>
+              <el-checkbox
+                :model-value="selectedTagIds.includes(data.rawId)"
+                @change="toggleTagInSelection(data.rawId)"
+                @click.stop
+              />
+              <span class="node-label">{{ data.label }}</span>
+              <span v-show="hoveredNodeId === data.id" class="node-actions">
+                <el-button text size="small" :icon="Edit" title="编辑标签" @click.stop="openTagEditById(data.rawId)" />
+              </span>
+            </template>
+          </div>
+        </template>
+      </el-tree>
+    </div>
+  </el-popover>
+
+  <!-- Tag Edit Modal -->
+  <el-dialog v-model="tagEditVisible" title="编辑标签" width="420px" destroy-on-close>
+    <el-form label-width="80px">
+      <el-form-item label="名称"><el-input v-model="tagEditForm.tagName" placeholder="标签名称" /></el-form-item>
+      <el-form-item label="背景色">
+        <div style="display: flex; align-items: center; gap: 8px;">
+          <el-color-picker v-model="tagEditForm.tagColor" />
+          <el-input v-model="tagEditForm.tagColor" placeholder="#ff6800" style="width: 120px" />
+        </div>
+      </el-form-item>
+      <el-form-item label="字体色">
+        <div style="display: flex; align-items: center; gap: 8px;">
+          <el-color-picker v-model="tagEditForm.tagFontColor" />
+          <el-input v-model="tagEditForm.tagFontColor" placeholder="#ffffff" style="width: 120px" />
+        </div>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button type="danger" :loading="tagEditLoading" @click="handleTagEditDelete">删除</el-button>
+      <el-button @click="tagEditVisible = false">取消</el-button>
+      <el-button type="primary" :loading="tagEditLoading" @click="handleTagEditSubmit">保存</el-button>
+    </template>
+  </el-dialog>
+
+  <!-- Group Edit Modal -->
+  <el-dialog
+    v-model="groupEditVisible"
+    :title="`编辑分组「${groupEditForm.groupName}」`"
+    width="420px"
+    destroy-on-close
+  >
+    <el-form label-width="80px">
+      <el-form-item label="分组名称">
+        <el-input v-model="groupEditForm.groupName" placeholder="请输入分组名称" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button type="danger" :loading="groupEditLoading" @click="handleGroupDelete">删除</el-button>
+      <el-button @click="groupEditVisible = false">取消</el-button>
+      <el-button type="primary" :loading="groupEditLoading" @click="handleGroupSave">保存</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style scoped>
+/* Custom trigger that looks like el-select */
+.tag-select-trigger {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  width: 180px;
+  min-height: 24px;
+  padding: 0 8px;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  background: #fff;
+  font-size: 12px;
+  color: #606266;
+  cursor: pointer;
+  transition: border-color 0.2s;
+  box-sizing: border-box;
+}
+.tag-select-trigger:hover {
+  border-color: #c0c4cc;
+}
+.tag-select-trigger.is-active {
+  border-color: var(--brand-color);
+}
+.tag-select-trigger .placeholder {
+  color: #a8abb2;
+}
+.tag-select-trigger .tag-arrow {
+  margin-left: auto;
+  font-size: 12px;
+  color: #a8abb2;
+  transition: transform 0.3s ease, color 0.2s;
+  flex-shrink: 0;
+}
+.tag-select-trigger.is-active .tag-arrow {
+  transform: rotate(180deg);
+  color: var(--brand-color);
+}
+.tag-select-trigger.is-filled {
+  color: #111;
+}
+.tag-select-trigger .more-tag {
+  display: inline-flex;
+  align-items: center;
+  height: 20px;
+  padding: 0 6px;
+  background: #f4f4f5;
+  border-radius: 3px;
+  font-size: 11px;
+  color: #606266;
+}
+</style>
+
+<style>
+/* Popover 挂载在 body 下，需要全局样式 */
+.tag-filter-popper {
+  padding: 0 !important;
+}
+.tag-filter-popper .tag-tree-panel {
+  max-height: 380px;
+  overflow-y: auto;
+  padding: 4px 0;
+}
+.tag-tree-toolbar {
+  padding: 4px 8px 6px;
+  border-bottom: 1px solid #f0f0f0;
+}
+.tag-filter-popper .el-tree {
+  padding: 0 4px;
+}
+
+/* Tree row layout */
+.tag-filter-popper .tree-row {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  width: 100%;
+  padding: 4px 6px;
+  border-radius: 4px;
+  font-size: 13px;
+  cursor: pointer;
+  position: relative;
+}
+.tag-filter-popper .tree-row.is-group {
+  font-weight: 600;
+  color: #111;
+  background: #fafafa;
+}
+.tag-filter-popper .tree-row.is-group:hover {
+  background: #f0f0f0;
+}
+.tag-filter-popper .tree-row.is-tag:hover {
+  background: #f5f7fa;
+}
+.tag-filter-popper .tree-row.is-tag.is-checked {
+  background: #fff2e8;
+  color: #ff6a00;
+}
+.tag-filter-popper .node-icon {
+  color: #f59e0b;
+  font-size: 12px;
+  width: 14px;
+  text-align: center;
+  flex-shrink: 0;
+}
+.tag-filter-popper .node-label {
+  flex: 1;
+  user-select: none;
+}
+.tag-filter-popper .node-count {
+  display: inline-block;
+  margin-left: 4px;
+  padding: 0 5px;
+  font-size: 10px;
+  color: #909399;
+  background: #e9e9eb;
+  border-radius: 8px;
+  font-weight: 400;
+}
+.tag-filter-popper .node-actions {
+  display: inline-flex;
+  gap: 0;
+  margin-left: auto;
+  flex-shrink: 0;
+}
+.tag-filter-popper .node-actions .el-button {
+  padding: 2px 4px;
+}
+</style>

apps/admin/src/views/positions/PositionsView.vue

@@ -8,7 +8,6 @@ import type {
   UpdatePositionRequest,
   PositionFilter,
   Country,
-  Category,
   CategoryTree,
 } from '@/types'
 import { positionsApi } from '@/api/positions'
@@ -41,7 +40,7 @@ async function loadLookups() {
 async function fetchList() {
   loading.value = true
   try {
-    const res = await positionsApi.getPositionsList(filter)
+    await positionsApi.getPositionsList(filter)
     const data = await positionsApi.getPositionsList(filter) as any
     const arr = Array.isArray(data) ? data : (data.items ?? [])
     list.value = arr
@@ -88,8 +87,6 @@ const dialogLoading = ref(false)
 
 const dialogForm = reactive<CreatePositionRequest & { id?: string }>({
   indexVal: 0,
-  countryId: '',
-  categoryId: '',
 })
 
 const dialogRules = {
@@ -218,17 +215,17 @@ onMounted(async () => {
       <el-table v-loading="loading" :data="list" border stripe>
         <el-table-column label="排序值" prop="indexVal" width="100" sortable />
         <el-table-column label="国家" min-width="160">
-          <template #default="{ row }: { row: Position }">
+          <template #default="{ row }: any">
             {{ row.country?.countryName || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="分类" min-width="200">
-          <template #default="{ row }: { row: Position }">
+          <template #default="{ row }: any">
             {{ getCategoryName(row) }}
           </template>
         </el-table-column>
         <el-table-column label="操作" width="180" fixed="right">
-          <template #default="{ row }: { row: Position }">
+          <template #default="{ row }: any">
             <div class="table-actions">
               <el-button size="small" type="primary" plain @click="openEditDialog(row)">
                 <el-icon><Edit /></el-icon>

apps/admin/src/views/sync/SyncView.vue

@@ -8,8 +8,8 @@ import { syncApi } from '@/api/sync'
 const logs = ref<SyncLog[]>([])
 const loading = ref(false)
 const syncing = ref(false)
-type SyncType = 'PRODUCTS' | 'CATEGORIES' | 'PRODUCT_DETAILS'
+type SyncType = 'PRODUCTS' | 'CATEGORIES' | 'PRODUCT_DETAILS'
-const currentType = ref<SyncType>('PRODUCTS')
+const currentType = ref<SyncType>('PRODUCTS')
 
 let timer: ReturnType<typeof setInterval> | null = null
 let pollTimer: ReturnType<typeof setInterval> | null = null
@@ -26,13 +26,13 @@ async function refreshLogs() {
   }
 }
 
-function syncTypeLabel(type: SyncType): string {
+function syncTypeLabel(type: SyncType): string {
-  if (type === 'CATEGORIES') return '分类'
+  if (type === 'CATEGORIES') return '分类'
-  if (type === 'PRODUCT_DETAILS') return '全部原产品详情'
+  if (type === 'PRODUCT_DETAILS') return '全部原产品详情'
-  return '商品列表'
+  return '商品列表'
-}
+}
-
+
-async function pollUntilDone(type: SyncType) {
+async function pollUntilDone(type: SyncType) {
   if (pollTimer) clearInterval(pollTimer)
   pollTimer = setInterval(async () => {
     try {
@@ -44,9 +44,9 @@ async function pollUntilDone(type: SyncType) {
         if (pollTimer) { clearInterval(pollTimer); pollTimer = null }
         syncing.value = false
         if (top.status === 'SUCCESS') {
-          ElMessage.success(`${syncTypeLabel(type)}同步完成`)
+          ElMessage.success(`${syncTypeLabel(type)}同步完成`)
         } else {
-          ElMessage.error(`${syncTypeLabel(type)}同步失败`)
+          ElMessage.error(`${syncTypeLabel(type)}同步失败`)
         }
         await refreshLogs()
       }
@@ -58,19 +58,19 @@ async function handleSyncProducts() {
   await doSync('PRODUCTS')
 }
 
-async function handleSyncCategories() {
+async function handleSyncCategories() {
   await doSync('CATEGORIES')
-}
+}
-
+
-async function handleSyncProductDetails() {
+async function handleSyncProductDetails() {
-  await doSync('PRODUCT_DETAILS')
+  await doSync('PRODUCT_DETAILS')
-}
+}
-
+
-async function doSync(type: SyncType) {
+async function doSync(type: SyncType) {
-  const label = syncTypeLabel(type)
+  const label = syncTypeLabel(type)
   try {
     await ElMessageBox.confirm(
-      `确定立即执行${label}同步吗？${type === 'PRODUCT_DETAILS' ? '将同步全部有效原产品，耗时取决于原产品数量。' : type !== 'CATEGORIES' ? '此操作可能需要几分钟。' : ''}`,
+      `确定立即执行${label}同步吗？${type === 'PRODUCT_DETAILS' ? '将同步全部有效原产品，耗时取决于原产品数量。' : type !== 'CATEGORIES' ? '此操作可能需要几分钟。' : ''}`,
       '确认',
       { type: 'info', confirmButtonText: '执行', cancelButtonText: '取消' }
     )
@@ -79,10 +79,10 @@ async function doSync(type: SyncType) {
   syncing.value = true
   currentType.value = type
   try {
-    if (type === 'PRODUCTS') {
+    if (type === 'PRODUCTS') {
-      await syncApi.syncProducts()
+      await syncApi.syncProducts()
-    } else if (type === 'PRODUCT_DETAILS') {
+    } else if (type === 'PRODUCT_DETAILS') {
-      await syncApi.syncProductDetails()
+      await syncApi.syncProductDetails()
     } else {
       await syncApi.syncCategories()
     }
@@ -108,13 +108,34 @@ function formatDuration(start?: string, end?: string): string | null {
 }
 
 const stats = computed(() => {
-  const total = logs.value.length
+  const total = logs.value.length
-  const success = logs.value.filter(l => l.status === 'SUCCESS').length
+  const success = logs.value.filter(l => l.status === 'SUCCESS').length
-  const failed = logs.value.filter(l => l.status === 'FAILED').length
+  const failed = logs.value.filter(l => l.status === 'FAILED').length
-  const lastLog = logs.value[0]
+  const lastLog = logs.value[0]
   return { total, success, failed, lastLog }
 })
 
+const SYNC_KEY_ZH: Record<string, string> = {
+  inserted: '新增',
+  updated: '更新',
+  total: '共计',
+  delisted: '下架',
+  reactivated: '恢复上架',
+  leafCategories: '叶子分类',
+}
+
+/** 后端报文（inserted=0 updated=536 ...）渲染为中文摘要；未知键原样保留 */
+function humanizeSyncMessage(message?: string | null): string {
+  if (!message) return ''
+  const prefixMatch = message.match(/^([^:：]+)[:：]\s*/)
+  const prefix = prefixMatch ? prefixMatch[1] : ''
+  const body = prefixMatch ? message.slice(prefixMatch[0].length) : message
+  const pairs = [...body.matchAll(/(\w+)=([^\s=]+)/g)]
+  if (!pairs.length) return message
+  const text = pairs.map(([, k, v]) => `${SYNC_KEY_ZH[k] ?? k} ${v}`).join(' · ')
+  return prefix ? `${prefix}：${text}` : text
+}
+
 onMounted(() => {
   refreshLogs()
   timer = setInterval(refreshLogs, 60_000)
@@ -136,7 +157,7 @@ onUnmounted(() => {
         </div>
         <div>
           <h2 class="sync-action-title">数据同步</h2>
-          <p class="sync-action-desc">分类和产品每小时自动同步；全部 SDS 原产品详情每天 03:30 自动同步，也可手动执行</p>
+          <p class="sync-action-desc">分类和产品每小时自动同步；全部 SDS 原产品详情每天 03:30 自动同步，也可手动执行</p>
         </div>
       </div>
       <div class="sync-action-buttons">
@@ -151,23 +172,23 @@ onUnmounted(() => {
         <el-button
           type="primary"
           size="large"
-          :loading="syncing && currentType === 'PRODUCTS'"
+          :loading="syncing && currentType === 'PRODUCTS'"
           :disabled="syncing"
           :icon="Refresh"
           @click="handleSyncProducts"
         >
-          同步产品
+          同步产品
-        </el-button>
+        </el-button>
-        <el-button
+        <el-button
-          type="success"
+          type="success"
-          size="large"
+          size="large"
-          :loading="syncing && currentType === 'PRODUCT_DETAILS'"
+          :loading="syncing && currentType === 'PRODUCT_DETAILS'"
-          :disabled="syncing"
+          :disabled="syncing"
-          :icon="Refresh"
+          :icon="Refresh"
-          @click="handleSyncProductDetails"
+          @click="handleSyncProductDetails"
-        >
+        >
-          同步全部原产品详情
+          同步全部原产品详情
-        </el-button>
+        </el-button>
       </div>
     </div>
 
@@ -189,7 +210,7 @@ onUnmounted(() => {
       </div>
       <div class="stat-divider" />
       <div class="stat-item">
-        <span class="stat-value stat-time">{{ stats.lastLog ? formatTime(stats.lastLog.startedAt) : '-' }}</span>
+        <span class="stat-value stat-time">{{ stats.lastLog ? formatTime(stats.lastLog.startedAt) : '-' }}</span>
         <span class="stat-label">最近同步</span>
       </div>
     </div>
@@ -220,17 +241,17 @@ onUnmounted(() => {
           </div>
           <div class="timeline-content">
             <div class="timeline-header">
-              <span class="timeline-type">{{ syncTypeLabel(log.type) }}</span>
+              <span class="timeline-type">{{ syncTypeLabel(log.type) }}</span>
               <span class="timeline-status" :class="log.status === 'SUCCESS' ? 'is-success' : (log.status === 'RUNNING' ? 'is-running' : 'is-failed')">
                 {{ log.status === 'SUCCESS' ? '成功' : log.status === 'RUNNING' ? '进行中' : '失败' }}
               </span>
-              <span v-if="formatDuration(log.startedAt, log.finishedAt || undefined)" class="timeline-duration">
+              <span v-if="formatDuration(log.startedAt, log.finishedAt || undefined)" class="timeline-duration">
                 <el-icon :size="11"><Clock /></el-icon>
-                {{ formatDuration(log.startedAt, log.finishedAt || undefined) }}
+                {{ formatDuration(log.startedAt, log.finishedAt || undefined) }}
               </span>
             </div>
-            <p v-if="log.message" class="timeline-message">{{ log.message }}</p>
+            <p v-if="log.message" class="timeline-message" :title="log.message">{{ humanizeSyncMessage(log.message) }}</p>
-            <span class="timeline-time">{{ formatTime(log.startedAt) }}</span>
+            <span class="timeline-time">{{ formatTime(log.startedAt) }}</span>
           </div>
         </div>
       </div>

apps/admin/src/views/tags/TagsView.vue

@@ -26,7 +26,7 @@ const filter = reactive<Required<TagFilter>>({
 async function fetchList() {
   loading.value = true
   try {
-    const res = await tagsApi.getTagsList(filter)
+    await tagsApi.getTagsList(filter)
     const data = await tagsApi.getTagsList(filter) as any
     const arr = Array.isArray(data) ? data : (data.items ?? [])
     list.value = arr
@@ -62,7 +62,6 @@ const dialogForm = reactive<CreateTagRequest & { id?: string; tagGroupId?: numbe
   tagColor: '#ff6800',
   tagFontColor: '#ffffff',
   timing: '',
-  tagGroupId: null,
 })
 
 const dialogRules = {
@@ -171,7 +170,7 @@ onMounted(() => {
 
       <el-table v-loading="loading" :data="list" border stripe>
         <el-table-column label="预览" width="120">
-          <template #default="{ row }: { row: Tag }">
+          <template #default="{ row }: any">
             <span
               v-if="row.tagColor"
               class="tag-preview"
@@ -182,7 +181,7 @@ onMounted(() => {
         </el-table-column>
         <el-table-column prop="tagName" label="名称" min-width="200" />
         <el-table-column label="背景色" width="140">
-          <template #default="{ row }: { row: Tag }">
+          <template #default="{ row }: any">
             <div class="color-cell">
               <span class="color-swatch" :style="{ background: row.tagColor || '#d1d5db' }" />
               <span class="color-hex">{{ row.tagColor || '-' }}</span>
@@ -190,7 +189,7 @@ onMounted(() => {
           </template>
         </el-table-column>
         <el-table-column label="字体色" width="140">
-          <template #default="{ row }: { row: Tag }">
+          <template #default="{ row }: any">
             <div class="color-cell">
               <span class="color-swatch" :style="{ background: row.tagFontColor || '#d1d5db' }" />
               <span class="color-hex">{{ row.tagFontColor || '-' }}</span>
@@ -198,14 +197,14 @@ onMounted(() => {
           </template>
         </el-table-column>
         <el-table-column label="所属分组" min-width="140">
-          <template #default="{ row }: { row: Tag }">
+          <template #default="{ row }: any">
             <span v-if="row.tagGroup">{{ row.tagGroup.groupName }}</span>
             <span v-else style="color: #999;">未分组</span>
           </template>
         </el-table-column>
         <el-table-column prop="timing" label="定时" min-width="120" />
         <el-table-column label="操作" width="180" fixed="right">
-          <template #default="{ row }: { row: Tag }">
+          <template #default="{ row }: any">
             <div class="table-actions">
               <el-button size="small" type="primary" plain @click="openEditDialog(row)">
                 <el-icon><Edit /></el-icon>

apps/admin/vite.config.ts

@@ -7,7 +7,7 @@ import { fileURLToPath, URL } from 'node:url'
 
 // https://vite.dev/config/
 export default defineConfig({
-  base: '/admin/',
+  base: '/v2/admin/',
   plugins: [
     vue(),
     AutoImport({
@@ -28,7 +28,14 @@ export default defineConfig({
   server: {
     host: '0.0.0.0',
     port: 5173,
+    // 端口被占时直接报错退出，而不是静默换端口导致浏览器看到旧实例
+    strictPort: true,
     proxy: {
+      // Swagger 挂载在后端 /api/docs（不走去掉 /api 前缀的改写），需放在 '/api' 之前
+      '/api/docs': {
+        target: 'http://127.0.0.1:3001',
+        changeOrigin: true,
+      },
       '/api': {
         target: 'http://127.0.0.1:3001',
         changeOrigin: true,

apps/api/.env.example

@@ -18,3 +18,7 @@ CORS_ORIGINS=http://localhost:5173
 THROTTLE_LIMIT=120
 
 PORT=3001
+
+# Product-family public read path (family block + family variant union in
+# GET /public/goods/:goodId). Set to 'false' for emergency rollback to legacy behavior.
+PUBLIC_DETAIL_FROM_FAMILY=true

apps/api/package.json

@@ -22,7 +22,13 @@
     "prisma:migrate": "prisma migrate dev",
     "prisma:studio": "prisma studio",
     "configure:product-center-icons": "ts-node prisma/configure-product-center-icons.ts",
-    "import:product-detail": "ts-node prisma/import-product-detail.ts"
+    "import:product-detail": "ts-node prisma/import-product-detail.ts",
+    "backfill:product-families": "ts-node prisma/backfill-product-families.ts",
+    "backfill:product-families": "ts-node prisma/backfill-product-families.ts",
+    "fix:good-names": "ts-node prisma/fix-pure-sku-good-names.ts",
+    "fix:category-names": "ts-node prisma/fix-category-parens.ts",
+    "organize": "ts-node prisma/backfill-product-families.ts",
+    "recompute:families": "ts-node prisma/recompute-all-families.ts"
   },
   "dependencies": {
     "@nestjs/axios": "^3.0.1",

apps/api/prisma/backfill-category-sort-order.ts

@@ -0,0 +1,133 @@
+/**
+ * 一次性回填：解析 排序表.md → categories.sort_order（二级/款）+ countries.sort_order
+ *             + 沙特国家行 + 中东根更名
+ * 幂等：可重复执行；SDS 同步若覆盖根名称，重跑本脚本即可恢复
+ */
+import { PrismaClient } from '@prisma/client';
+import { readFileSync } from 'fs';
+
+const prisma = new PrismaClient();
+
+// 排序表国家名 → 新树根分类名（与库内 category_name 精确对应）
+const ROOT_MAP: Record<string, string> = {
+  '美国': '美国工厂直发',
+  '英国': '英国本地直发',
+  '日本': '日本本地工厂直发',
+  '墨西哥': '墨西哥工厂本地直发',
+  '巴西': '巴西本地工厂直发',
+  '中东': '中东本地工厂直发', // 同时更名沙特
+  '波兰': '欧洲波兰工厂直发',
+  '西班牙': '欧洲西班牙工厂直发',
+  '德国': '欧洲德国工厂本地直发',
+  '意大利': '欧洲意大利工厂直发',
+  '加拿大': '加拿大本地工厂直发',
+  '澳大利亚': '澳大利亚本地工厂直发',
+  '韩国': '韩国本地直发',
+  '中国（国内工厂）': '国内工厂',
+};
+
+const norm = (s: string) => s.trim().replace(/\s+/g, '');
+const codeOf = (s: string) => (s.trim().match(/^[A-Za-z0-9]+/) ?? [''])[0];
+
+async function main() {
+  const raw = readFileSync(process.env.SORT_TABLE_PATH ?? '/repo/排序表.md', 'utf8');
+  let country: string | null = null;
+  let l2: string | null = null;
+  const tree: Array<{ country: string; l2: string; l3: string }> = [];
+  const countryOrder: string[] = [];
+  for (const line of raw.split('\n')) {
+    const t = line.trim();
+    if (t.startsWith('# ')) {
+      const name = t.slice(2).trim();
+      if (name === '全部' || name.includes('工厂直发国家')) continue;
+      country = name;
+      if (!countryOrder.includes(name)) countryOrder.push(name);
+    } else if (t.startsWith('## ') && country) {
+      l2 = t.slice(3).trim();
+    } else if (t.startsWith('### ') && country && l2) {
+      tree.push({ country, l2, l3: t.slice(4).trim() });
+    }
+  }
+  console.log(`parsed: ${countryOrder.length} countries, ${tree.length} leaves`);
+
+  const roots = await prisma.category.findMany({
+    where: { parentCategoryId: null, sdsCategoryId: { not: null } },
+    include: { children: { include: { children: true } } },
+  });
+  const rootByName = new Map(roots.map((r) => [r.categoryName, r]));
+  const unmatched: string[] = [];
+
+  // 1) countries：沙特 upsert + 顺序重写（中国无国家行，跳过）
+  for (let i = 0; i < countryOrder.length; i++) {
+    const name = countryOrder[i];
+    const dbCountry = name === '中东' ? '沙特' : name;
+    if (dbCountry === '中国（国内工厂）') continue;
+    const sortOrder = i + 1;
+    const existing = await prisma.country.findUnique({ where: { countryName: dbCountry } });
+    if (existing) {
+      await prisma.country.update({ where: { id: existing.id }, data: { sortOrder } });
+    } else if (dbCountry === '沙特') {
+      await prisma.country.create({ data: { countryName: '沙特', sortOrder } });
+      console.log('created country: 沙特');
+    }
+  }
+
+  // 2) 中东根 → 沙特
+  const meRoot = rootByName.get('中东本地工厂直发');
+  if (meRoot) {
+    await prisma.category.update({ where: { id: meRoot.id }, data: { categoryName: '沙特本地工厂直发' } });
+    rootByName.set('沙特本地工厂直发', meRoot);
+    console.log('renamed root: 中东本地工厂直发 -> 沙特本地工厂直发');
+  }
+
+  // 3) 二级/款 sort_order
+  for (const countryName of countryOrder) {
+    const rootName = countryName === '中东' ? '沙特本地工厂直发' : ROOT_MAP[countryName];
+    const root = rootByName.get(rootName);
+    if (!root) {
+      unmatched.push(`ROOT MISS: ${countryName} (expect root "${rootName}")`);
+      continue;
+    }
+    const l2s = root.children;
+    const l2NamesInOrder: string[] = [];
+    for (const row of tree) {
+      if (row.country === countryName && !l2NamesInOrder.includes(row.l2)) l2NamesInOrder.push(row.l2);
+    }
+    for (let i = 0; i < l2NamesInOrder.length; i++) {
+      const target = l2NamesInOrder[i];
+      const mid = l2s.find((m) => norm(m.categoryName) === norm(target));
+      if (!mid) {
+        unmatched.push(`L2 MISS: ${countryName} / ${target}`);
+        continue;
+      }
+      await prisma.category.update({ where: { id: mid.id }, data: { sortOrder: i + 1 } });
+      const leaves = mid.children;
+      const l3Names = tree.filter((r) => r.country === countryName && r.l2 === target).map((r) => r.l3);
+      for (let j = 0; j < l3Names.length; j++) {
+        const want = norm(l3Names[j]);
+        const code = norm(codeOf(l3Names[j]));
+        const leaf =
+          leaves.find((l) => norm(l.categoryName) === want) ??
+          (code ? leaves.find((l) => norm(l.categoryName).startsWith(code)) : undefined);
+        if (!leaf) {
+          unmatched.push(`L3 MISS: ${countryName} / ${target} / ${l3Names[j]}`);
+          continue;
+        }
+        await prisma.category.update({ where: { id: leaf.id }, data: { sortOrder: j + 1 } });
+      }
+    }
+  }
+
+  if (unmatched.length) {
+    console.error(`UNMATCHED (${unmatched.length}):\n` + unmatched.join('\n'));
+    process.exit(1);
+  }
+  console.log('backfill done');
+}
+
+main()
+  .catch((e) => {
+    console.error(e);
+    process.exit(1);
+  })
+  .finally(() => prisma.$disconnect());

apps/api/prisma/backfill-product-families.ts

@@ -0,0 +1,36 @@
+/**
+ * 整理脚本（幂等 / 显式人工触发）——解析去运行时化后的唯一解析入口：
+ *   1. 回填结构化解析列（只补 NULL，不覆盖存量）；
+ *   2. 派生链接标签（未人工接管的 SDS 链接按名称刷新，人工接管不动）+ 商品镜像；
+ *   3. 自动建族（auto-group）；
+ *   4. 全量族重算（并集尺码表/包装 + 五维价格矩阵）。
+ *
+ * 运行：pnpm --filter @inkreach/api organize
+ * 后台等价入口：POST /product-families/organize（「整理」按钮）。
+ */
+import { PrismaService } from '../src/prisma/prisma.service';
+import { PublicCacheService } from '../src/public/public-cache.service';
+import { FamilyRecomputeService } from '../src/product-families/family-recompute.service';
+import { ProductFamiliesService } from '../src/product-families/product-families.service';
+import { OrganizeService } from '../src/product-families/organize.service';
+
+async function main() {
+  const prisma = new PrismaService();
+  await prisma.onModuleInit();
+  const recompute = new FamilyRecomputeService(prisma, new PublicCacheService());
+  const families = new ProductFamiliesService(prisma, recompute);
+  const organize = new OrganizeService(prisma, recompute, families, new PublicCacheService());
+
+  const result = await organize.organize();
+  console.log(
+    `[organize] labels parsed=${result.labelsParsed} (unparsable=${result.labelsUnparsable}) | ` +
+      `tags links=${result.linksUpdated} goods=${result.goodsUpdated} | ` +
+      `families created=${result.familiesCreated} recomputed=${result.familiesRecomputed}`,
+  );
+  await prisma.onModuleDestroy();
+}
+
+main().catch((error) => {
+  console.error(error);
+  process.exit(1);
+});

apps/api/prisma/fix-category-parens.ts

@@ -0,0 +1,51 @@
+/**
+ * 存量修复脚本（幂等）：分类名去括号 —— 删除所有括号段（型号限定词/内容性括号，
+ * 整段删除）。分类名每小时被 SDS 同步覆盖，清洗已落在 syncCategories 入库路径；
+ * 本脚本用于部署后立即生效（不等下一轮同步）或修人工建的历史分类。
+ *
+ * 运行：
+ *   pnpm --filter @inkreach/api fix:category-names             # dry-run，只打印清单
+ *   pnpm --filter @inkreach/api fix:category-names -- --apply  # 实际写库
+ */
+import { PrismaService } from '../src/prisma/prisma.service';
+import { cleanCategoryDisplayName } from '../src/sync/sync.service';
+
+async function main() {
+  const apply = process.argv.includes('--apply');
+  const prisma = new PrismaService();
+  await prisma.onModuleInit();
+
+  const rows = await prisma.category.findMany({
+    select: { id: true, categoryName: true },
+    orderBy: { id: 'asc' },
+  });
+  const renames = rows
+    .map((row) => ({
+      id: row.id,
+      from: row.categoryName,
+      to: cleanCategoryDisplayName(row.categoryName) ?? row.categoryName,
+    }))
+    .filter((r) => r.from !== r.to);
+
+  if (apply && renames.length > 0) {
+    await prisma.$transaction(
+      renames.map((r) =>
+        prisma.category.update({
+          where: { id: r.id },
+          data: { categoryName: r.to },
+        }),
+      ),
+    );
+  }
+  const mode = apply ? 'APPLIED' : 'DRY-RUN（未写库，加 --apply 执行）';
+  console.log(`[fix:category-names] ${mode} renamed=${renames.length}`);
+  for (const r of renames) {
+    console.log(`  #${r.id}  ${r.from}  ->  ${r.to}`);
+  }
+  await prisma.onModuleDestroy();
+}
+
+main().catch((error) => {
+  console.error(error);
+  process.exit(1);
+});

apps/api/prisma/fix-pure-sku-good-names.ts

@@ -0,0 +1,44 @@
+/**
+ * 存量修复脚本（幂等）：把纯款号商品名（如 `PLTK016`）按主链接 SDS 分类名
+ * 补成「描述名 款号」（如 `童装纯色插肩短袖T恤 PLTK016`）。
+ *
+ * 运行：
+ *   pnpm --filter @inkreach/api fix:good-names             # dry-run，只打印清单
+ *   pnpm --filter @inkreach/api fix:good-names -- --apply  # 实际写库
+ * origin_goods.good_name 为 SDS 纯镜像（每小时同步覆盖），本脚本只改 goods.good_name。
+ */
+import { PrismaService } from '../src/prisma/prisma.service';
+import { PublicCacheService } from '../src/public/public-cache.service';
+import { SyncService } from '../src/sync/sync.service';
+import { FamilyRecomputeService } from '../src/product-families/family-recompute.service';
+import { GoodsService } from '../src/goods/goods.service';
+
+async function main() {
+  const dryRun = !process.argv.includes('--apply');
+  const prisma = new PrismaService();
+  await prisma.onModuleInit();
+  const recompute = new FamilyRecomputeService(prisma, new PublicCacheService());
+  // 回填路径不触发详情同步，SyncService 仅作占位依赖
+  const goods = new GoodsService(
+    prisma,
+    { queueProductDetailSync: async () => undefined } as unknown as SyncService,
+    recompute,
+    new PublicCacheService(),
+  );
+
+  const result = await goods.backfillPureSkuGoodNames({ dryRun });
+  const mode = dryRun ? 'DRY-RUN（未写库，加 --apply 执行）' : 'APPLIED';
+  console.log(`[fix:good-names] ${mode} renamed=${result.renamed} unmapped=${result.unmapped.length}`);
+  for (const r of result.renames) {
+    console.log(`  #${r.id}  ${r.from}  ->  ${r.to}`);
+  }
+  for (const u of result.unmapped) {
+    console.log(`  #${u.id}  ${u.from}  ->  （无分类映射，保留原名）`);
+  }
+  await prisma.onModuleDestroy();
+}
+
+main().catch((error) => {
+  console.error(error);
+  process.exit(1);
+});

apps/api/prisma/migrations/20260827100523_add_good_origin_goods/migration.sql

@@ -0,0 +1,17 @@
+-- CreateTable
+CREATE TABLE "good_origin_goods" (
+    "good_id" BIGINT NOT NULL,
+    "origin_good_id" BIGINT NOT NULL,
+    "created_at" TIMESTAMPTZ(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "good_origin_goods_pkey" PRIMARY KEY ("good_id","origin_good_id")
+);
+
+-- CreateIndex
+CREATE INDEX "good_origin_goods_origin_good_id_idx" ON "good_origin_goods"("origin_good_id");
+
+-- AddForeignKey
+ALTER TABLE "good_origin_goods" ADD CONSTRAINT "good_origin_goods_good_id_fkey" FOREIGN KEY ("good_id") REFERENCES "goods"("good_id") ON DELETE CASCADE ON UPDATE NO ACTION;
+
+-- AddForeignKey
+ALTER TABLE "good_origin_goods" ADD CONSTRAINT "good_origin_goods_origin_good_id_fkey" FOREIGN KEY ("origin_good_id") REFERENCES "origin_goods"("origin_good_id") ON DELETE CASCADE ON UPDATE NO ACTION;

apps/api/prisma/migrations/20260828042358_add_product_families/migration.sql

@@ -0,0 +1,79 @@
+-- AlterTable
+ALTER TABLE "origin_goods" ADD COLUMN     "craft_label" TEXT,
+ADD COLUMN     "family_id" BIGINT,
+ADD COLUMN     "logistics_label" TEXT,
+ADD COLUMN     "sku_code" TEXT,
+ADD COLUMN     "warehouse_label" TEXT;
+
+-- CreateTable
+CREATE TABLE "product_families" (
+    "family_id" BIGSERIAL NOT NULL,
+    "family_code" TEXT,
+    "family_name" TEXT NOT NULL,
+    "family_image" TEXT,
+    "country_id" BIGINT,
+    "category_id" BIGINT,
+    "primary_origin_good_id" BIGINT,
+    "detail" JSONB,
+    "size_chart" JSONB,
+    "package_specs" JSONB,
+    "price_matrix" JSONB,
+    "auto_managed" BOOLEAN NOT NULL DEFAULT true,
+    "stale" BOOLEAN NOT NULL DEFAULT false,
+    "created_at" TIMESTAMPTZ(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updated_at" TIMESTAMPTZ(6) NOT NULL,
+
+    CONSTRAINT "product_families_pkey" PRIMARY KEY ("family_id")
+);
+
+-- CreateTable
+CREATE TABLE "family_price_overrides" (
+    "family_price_override_id" BIGSERIAL NOT NULL,
+    "family_id" BIGINT NOT NULL,
+    "size_id" TEXT NOT NULL,
+    "color_id" TEXT NOT NULL,
+    "craft" TEXT NOT NULL,
+    "logistics" TEXT NOT NULL,
+    "price" DECIMAL(12,2) NOT NULL,
+    "note" TEXT,
+    "created_at" TIMESTAMPTZ(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updated_at" TIMESTAMPTZ(6) NOT NULL,
+
+    CONSTRAINT "family_price_overrides_pkey" PRIMARY KEY ("family_price_override_id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "product_families_family_code_key" ON "product_families"("family_code");
+
+-- CreateIndex
+CREATE INDEX "product_families_country_id_idx" ON "product_families"("country_id");
+
+-- CreateIndex
+CREATE INDEX "product_families_category_id_idx" ON "product_families"("category_id");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "family_price_overrides_family_id_size_id_color_id_craft_log_key" ON "family_price_overrides"("family_id", "size_id", "color_id", "craft", "logistics");
+
+-- CreateIndex
+CREATE INDEX "origin_goods_family_id_idx" ON "origin_goods"("family_id");
+
+-- CreateIndex
+CREATE INDEX "origin_goods_sku_code_idx" ON "origin_goods"("sku_code");
+
+-- CreateIndex
+CREATE INDEX "origin_goods_logistics_label_idx" ON "origin_goods"("logistics_label");
+
+-- CreateIndex
+CREATE INDEX "origin_goods_craft_label_idx" ON "origin_goods"("craft_label");
+
+-- AddForeignKey
+ALTER TABLE "origin_goods" ADD CONSTRAINT "origin_goods_family_id_fkey" FOREIGN KEY ("family_id") REFERENCES "product_families"("family_id") ON DELETE SET NULL ON UPDATE NO ACTION;
+
+-- AddForeignKey
+ALTER TABLE "product_families" ADD CONSTRAINT "product_families_country_id_fkey" FOREIGN KEY ("country_id") REFERENCES "countries"("country_id") ON DELETE SET NULL ON UPDATE NO ACTION;
+
+-- AddForeignKey
+ALTER TABLE "product_families" ADD CONSTRAINT "product_families_category_id_fkey" FOREIGN KEY ("category_id") REFERENCES "categories"("category_id") ON DELETE SET NULL ON UPDATE NO ACTION;
+
+-- AddForeignKey
+ALTER TABLE "family_price_overrides" ADD CONSTRAINT "family_price_overrides_family_id_fkey" FOREIGN KEY ("family_id") REFERENCES "product_families"("family_id") ON DELETE CASCADE ON UPDATE NO ACTION;

apps/api/prisma/migrations/20260828053415_add_good_family_id/migration.sql

@@ -0,0 +1,14 @@
+-- AlterTable
+ALTER TABLE "goods" ADD COLUMN     "family_id" BIGINT;
+
+-- CreateIndex
+CREATE INDEX "goods_family_id_idx" ON "goods"("family_id");
+
+-- AddForeignKey
+ALTER TABLE "goods" ADD CONSTRAINT "goods_family_id_fkey" FOREIGN KEY ("family_id") REFERENCES "product_families"("family_id") ON DELETE SET NULL ON UPDATE NO ACTION;
+
+-- Backfill: Good 的族 = 其主链接所属族（派生数据，后续由服务层联动维护）
+UPDATE "goods" SET "family_id" = (
+  SELECT "o"."family_id" FROM "origin_goods" "o"
+  WHERE "o"."origin_good_id" = "goods"."origin_good_id"
+);

apps/api/prisma/migrations/20260828074150_add_origin_good_tags/migration.sql

@@ -0,0 +1,25 @@
+-- AlterTable
+ALTER TABLE "origin_goods" ADD COLUMN     "tags_manual" BOOLEAN NOT NULL DEFAULT false;
+
+-- CreateTable
+CREATE TABLE "origin_good_tags" (
+    "id" BIGSERIAL NOT NULL,
+    "origin_good_id" BIGINT NOT NULL,
+    "tag_id" BIGINT NOT NULL,
+    "manual" BOOLEAN NOT NULL DEFAULT false,
+    "created_at" TIMESTAMPTZ(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "origin_good_tags_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "origin_good_tags_tag_id_idx" ON "origin_good_tags"("tag_id");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "origin_good_tags_origin_good_id_tag_id_key" ON "origin_good_tags"("origin_good_id", "tag_id");
+
+-- AddForeignKey
+ALTER TABLE "origin_good_tags" ADD CONSTRAINT "origin_good_tags_origin_good_id_fkey" FOREIGN KEY ("origin_good_id") REFERENCES "origin_goods"("origin_good_id") ON DELETE CASCADE ON UPDATE NO ACTION;
+
+-- AddForeignKey
+ALTER TABLE "origin_good_tags" ADD CONSTRAINT "origin_good_tags_tag_id_fkey" FOREIGN KEY ("tag_id") REFERENCES "tags"("tag_id") ON DELETE CASCADE ON UPDATE NO ACTION;

apps/api/prisma/migrations/20260828120000_override_print_count/migration.sql

@@ -0,0 +1,6 @@
+-- 价格矩阵五维化：覆盖表补 印花数量 维度（表当前 0 行，无需数据回填）
+ALTER TABLE "family_price_overrides" ADD COLUMN "print_count" TEXT NOT NULL DEFAULT '单面印花';
+
+DROP INDEX "family_price_overrides_family_id_size_id_color_id_craft_log_key";
+CREATE UNIQUE INDEX "family_price_overrides_family_id_size_id_color_id_print_count_craft_log_key"
+  ON "family_price_overrides"("family_id", "size_id", "color_id", "print_count", "craft", "logistics");

apps/api/prisma/migrations/20260828194000_country_sort_order/migration.sql

@@ -0,0 +1,2 @@
+-- 国家自定义排序：默认 0 保持既有 id 序，后台可拖拽调整
+ALTER TABLE "countries" ADD COLUMN "sort_order" INTEGER NOT NULL DEFAULT 0;

apps/api/prisma/migrations/20260901000000_add_category_sort_order/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "categories" ADD COLUMN "sort_order" INTEGER NOT NULL DEFAULT 0;

apps/api/prisma/migrations/migration_lock.toml

@@ -1,3 +1,3 @@
-# Please do not edit this file manually
+# Please do not edit this file manually
-# It should be added in your version-control system (i.e. Git)
+# It should be added in your version-control system (i.e. Git)
 provider = "postgresql"

apps/api/prisma/recompute-all-families.ts

@@ -0,0 +1,41 @@
+/**
+ * 全量族重算（一次性维护脚本）：
+ * 逐族调用 FamilyRecomputeService.recomputeFamily，刷新物化字段
+ * （并集尺码表/包装规则 + 五维价格矩阵，含选项组词表序排序）。
+ * autoManaged=false 的族内部只置 stale，不会覆盖人工物化字段。
+ *
+ * 运行：pnpm --filter @inkreach/api recompute:families
+ */
+import { PrismaService } from '../src/prisma/prisma.service';
+import { PublicCacheService } from '../src/public/public-cache.service';
+import { FamilyRecomputeService } from '../src/product-families/family-recompute.service';
+
+async function main() {
+  const prisma = new PrismaService();
+  await prisma.onModuleInit();
+  const recompute = new FamilyRecomputeService(prisma, new PublicCacheService());
+
+  const families = await prisma.productFamily.findMany({
+    select: { id: true },
+    orderBy: { id: 'asc' },
+  });
+  let ok = 0;
+  let failed = 0;
+  for (const { id } of families) {
+    try {
+      await recompute.recomputeFamily(id);
+      ok++;
+    } catch (error) {
+      failed++;
+      console.error(`family ${id} recompute failed: ${String(error)}`);
+    }
+  }
+  console.log(`[recompute:families] total=${families.length} ok=${ok} failed=${failed}`);
+  await prisma.onModuleDestroy();
+  if (failed > 0) process.exit(1);
+}
+
+main().catch((error) => {
+  console.error(error);
+  process.exit(1);
+});

apps/api/prisma/schema.prisma

@@ -30,18 +30,49 @@ model OriginGood {
   goodPrice     Decimal? @map("good_price") @db.Decimal(12, 2)
   delisted      Boolean  @default(false)
   source        OriginGoodSource @default(SDS)
+  familyId       BigInt?  @map("family_id")
+  skuCode        String?  @map("sku_code")
+  logisticsLabel String?  @map("logistics_label")
+  craftLabel     String?  @map("craft_label")
+  warehouseLabel String?  @map("warehouse_label")
   createdAt     DateTime @default(now()) @map("created_at") @db.Timestamptz(6)
   updatedAt     DateTime @default(now()) @updatedAt @map("updated_at") @db.Timestamptz(6)
 
+  family    ProductFamily?  @relation(fields: [familyId], references: [id], onDelete: SetNull, onUpdate: NoAction)
   goods    Good[]
   detail   OriginGoodDetail?
   variants OriginGoodVariant[]
+  mergedIntoGoods GoodOriginGood[]
+  // 链接级标签：自动派生（manual=false）或人工接管（tagsManual=true 后全部 manual）
+  tagsManual Boolean @default(false) @map("tags_manual")
+  originGoodTags OriginGoodTag[]
 
   @@index([sdsCategoryId])
   @@index([source])
+  @@index([familyId])
+  @@index([skuCode])
+  @@index([logisticsLabel])
+  @@index([craftLabel])
   @@map("origin_goods")
 }
 
+// ---------- OriginGood-Tag Junction（链接级标签：自动派生 + 人工修正） ----------
+model OriginGoodTag {
+  id           BigInt   @id @default(autoincrement())
+  originGoodId BigInt   @map("origin_good_id")
+  tagId        BigInt   @map("tag_id")
+  // true = 人工配置（自动同步永不覆盖）；false = 按链接名称自动派生
+  manual    Boolean  @default(false)
+  createdAt DateTime @default(now()) @map("created_at") @db.Timestamptz(6)
+
+  originGood OriginGood @relation(fields: [originGoodId], references: [id], onDelete: Cascade, onUpdate: NoAction)
+  tag        Tag        @relation(fields: [tagId], references: [id], onDelete: Cascade, onUpdate: NoAction)
+
+  @@unique([originGoodId, tagId])
+  @@index([tagId])
+  @@map("origin_good_tags")
+}
+
 // ---------- Origin Good Details (cached from SDS /products/{id}) ----------
 model OriginGoodDetail {
   originGoodId         BigInt    @id @map("origin_good_id")
@@ -112,11 +143,13 @@ model Country {
   id          BigInt   @id @default(autoincrement()) @map("country_id")
   countryName String   @unique @map("country_name")
   countryIcon String?  @map("country_icon")
+  sortOrder   Int      @default(0) @map("sort_order")
   createdAt   DateTime @default(now()) @map("created_at") @db.Timestamptz(6)
   updatedAt   DateTime @default(now()) @updatedAt @map("updated_at") @db.Timestamptz(6)
 
   goods     Good[]
   positions Position[]
+  families  ProductFamily[]
 
   @@map("countries")
 }
@@ -128,6 +161,7 @@ model Category {
   categoryName     String   @map("category_name")
   categoryIcon     String?  @map("category_icon")
   sdsCategoryId    String?  @unique @map("sds_category_id")
+  sortOrder        Int      @default(0) @map("sort_order")
   createdAt        DateTime @default(now()) @map("created_at") @db.Timestamptz(6)
   updatedAt        DateTime @default(now()) @updatedAt @map("updated_at") @db.Timestamptz(6)
 
@@ -135,6 +169,7 @@ model Category {
   children  Category[] @relation("CategoryToCategory")
   goods     Good[]
   positions Position[]
+  families  ProductFamily[]
 
   @@index([parentCategoryId])
   @@map("categories")
@@ -169,6 +204,7 @@ model Tag {
 
   goods    Good[]
   goodTags GoodTag[]
+  originGoodTags OriginGoodTag[]
   tagGroup TagGroup? @relation(fields: [tagGroupId], references: [id], onDelete: SetNull, onUpdate: NoAction)
 
   @@index([tagGroupId])
@@ -199,6 +235,7 @@ model Position {
 model Good {
   id           BigInt   @id @default(autoincrement()) @map("good_id")
   originGoodId BigInt   @map("origin_good_id")
+  familyId     BigInt?  @map("family_id")
   countryId    BigInt   @map("country_id")
   categoryId   BigInt   @map("category_id")
   tagId        BigInt?  @map("tag_id")
@@ -210,13 +247,16 @@ model Good {
   updatedAt    DateTime @default(now()) @updatedAt @map("updated_at") @db.Timestamptz(6)
 
   originGood OriginGood @relation(fields: [originGoodId], references: [id], onDelete: Restrict, onUpdate: NoAction)
+  family     ProductFamily? @relation(fields: [familyId], references: [id], onDelete: SetNull, onUpdate: NoAction)
   country    Country    @relation(fields: [countryId], references: [id], onDelete: Restrict, onUpdate: NoAction)
   category   Category   @relation(fields: [categoryId], references: [id], onDelete: Restrict, onUpdate: NoAction)
   tag        Tag?       @relation(fields: [tagId], references: [id], onDelete: SetNull, onUpdate: NoAction)
   position   Position?  @relation(fields: [positionId], references: [id], onDelete: SetNull, onUpdate: NoAction)
   goodTags   GoodTag[]
+  mergedOriginGoods GoodOriginGood[]
 
   @@index([originGoodId])
+  @@index([familyId])
   @@index([countryId])
   @@index([categoryId])
   @@index([tagId])
@@ -241,6 +281,73 @@ model GoodTag {
   @@map("good_tags")
 }
 
+// ---------- Good-OriginGood Junction (merged secondary sources, M:N) ----------
+// Primary source stays on goods.origin_good_id and is NOT stored here.
+model GoodOriginGood {
+  goodId       BigInt   @map("good_id")
+  originGoodId BigInt   @map("origin_good_id")
+  createdAt    DateTime @default(now()) @map("created_at") @db.Timestamptz(6)
+
+  good       Good       @relation(fields: [goodId], references: [id], onDelete: Cascade, onUpdate: NoAction)
+  originGood OriginGood @relation(fields: [originGoodId], references: [id], onDelete: Cascade, onUpdate: NoAction)
+
+  @@id([goodId, originGoodId])
+  @@index([originGoodId])
+  @@map("good_origin_goods")
+}
+
+// ---------- Product Families (SPU layer over origin goods) ----------
+// 设计文档：docs/superpowers/specs/2026-08-28-product-family-merge-design.md
+// primaryOriginGoodId 刻意不建 FK：避免与 origin_goods 相互依赖，主链接被同步删除时由服务层清理。
+model ProductFamily {
+  id                  BigInt   @id @default(autoincrement()) @map("family_id")
+  familyCode          String?  @unique @map("family_code")
+  familyName          String   @map("family_name")
+  familyImage         String?  @map("family_image")
+  countryId           BigInt?  @map("country_id")
+  categoryId          BigInt?  @map("category_id")
+  primaryOriginGoodId BigInt?  @map("primary_origin_good_id")
+  detail              Json?
+  sizeChart           Json?    @map("size_chart")
+  packageSpecs        Json?    @map("package_specs")
+  priceMatrix         Json?    @map("price_matrix")
+  autoManaged         Boolean  @default(true) @map("auto_managed")
+  stale               Boolean  @default(false)
+  createdAt           DateTime @default(now()) @map("created_at") @db.Timestamptz(6)
+  updatedAt           DateTime @updatedAt @map("updated_at") @db.Timestamptz(6)
+
+  originGoods    OriginGood[]
+  priceOverrides FamilyPriceOverride[]
+  goods          Good[]
+  country        Country?  @relation(fields: [countryId], references: [id], onDelete: SetNull, onUpdate: NoAction)
+  category       Category? @relation(fields: [categoryId], references: [id], onDelete: SetNull, onUpdate: NoAction)
+
+  @@index([countryId])
+  @@index([categoryId])
+  @@map("product_families")
+}
+
+// ---------- Family Price Overrides (manual per-cell price) ----------
+// 独立于推导矩阵：重算只重建推导部分，本表永不被动覆盖。
+model FamilyPriceOverride {
+  id          BigInt   @id @default(autoincrement()) @map("family_price_override_id")
+  familyId    BigInt   @map("family_id")
+  sizeId      String   @map("size_id")
+  colorId     String   @map("color_id")
+  printCount  String   @default("单面印花") @map("print_count")
+  craft       String
+  logistics   String
+  price       Decimal  @db.Decimal(12, 2)
+  note        String?
+  createdAt   DateTime @default(now()) @map("created_at") @db.Timestamptz(6)
+  updatedAt   DateTime @updatedAt @map("updated_at") @db.Timestamptz(6)
+
+  family ProductFamily @relation(fields: [familyId], references: [id], onDelete: Cascade, onUpdate: NoAction)
+
+  @@unique([familyId, sizeId, colorId, printCount, craft, logistics])
+  @@map("family_price_overrides")
+}
+
 // ---------- Users (admin authentication) ----------
 enum Role {
   ADMIN

apps/api/src/app.module.ts

@@ -11,9 +11,11 @@ import { TagsModule } from './tags/tags.module';
 import { TagGroupsModule } from './tag-groups/tag-groups.module';
 import { PositionsModule } from './positions/positions.module';
 import { OriginGoodsModule } from './origin-goods/origin-goods.module';
+import { ProductFamiliesModule } from './product-families/product-families.module';
 import { GoodsModule } from './goods/goods.module';
 import { SyncModule } from './sync/sync.module';
 import { PublicModule } from './public/public.module';
+import { PublicCacheModule } from './public/public-cache.module';
 import { UploadModule } from './upload/upload.module';
 
 @Module({
@@ -30,6 +32,8 @@ import { UploadModule } from './upload/upload.module';
       },
     ]),
     PrismaModule,
+    // public 读路径缓存（分域版本失效，@Global 供各写路径注入 bump 入口）
+    PublicCacheModule,
     AuthModule,
     CountriesModule,
     CategoriesModule,
@@ -37,6 +41,7 @@ import { UploadModule } from './upload/upload.module';
     TagGroupsModule,
     PositionsModule,
     OriginGoodsModule,
+    ProductFamiliesModule,
     GoodsModule,
     SyncModule,
     PublicModule,

apps/api/src/auth/auth.controller.ts

@@ -64,8 +64,9 @@ export class AuthController {
       httpOnly: true,
       sameSite: 'lax',
       secure: isProd,
-      // Only ever sent to /auth/refresh and /auth/logout
+      // 浏览器实际请求路径带代理前缀（/api/auth/*、/v2-api/auth/*），cookie path
-      path: '/auth',
+      // 必须用 '/' 才能命中；否则 refresh cookie 永远带不上 → 访问令牌一过期就掉线
+      path: '/',
     });
     // The refresh token deliberately stays HttpOnly-only.
     return {
@@ -86,7 +87,7 @@ export class AuthController {
   ): Promise<LoginResponseDto> {
     const token = req.cookies?.[REFRESH_TOKEN_COOKIE];
     if (!token) {
-      res.clearCookie(REFRESH_TOKEN_COOKIE, { path: '/auth' });
+      res.clearCookie(REFRESH_TOKEN_COOKIE, { path: '/' });
       throw new UnauthorizedException('Missing refresh token');
     }
     const result = await this.authService.refresh(token);
@@ -100,7 +101,7 @@ export class AuthController {
       httpOnly: true,
       sameSite: 'lax',
       secure: isProd,
-      path: '/auth',
+      path: '/',
     });
     return {
       accessToken: result.accessToken,
@@ -126,7 +127,7 @@ export class AuthController {
   ): Promise<{ success: true }> {
     await this.authService.logout(req.user.id);
     res.clearCookie(ACCESS_TOKEN_COOKIE, { path: '/' });
-    res.clearCookie(REFRESH_TOKEN_COOKIE, { path: '/auth' });
+    res.clearCookie(REFRESH_TOKEN_COOKIE, { path: '/' });
     return { success: true };
   }
 }

apps/api/src/categories/categories.service.spec.ts

@@ -1,3 +1,4 @@
+import { PublicCacheService } from '../public/public-cache.service';
 import { Test } from '@nestjs/testing';
 import {
   BadRequestException,
@@ -13,7 +14,7 @@ describe('CategoriesService', () => {
 
   beforeAll(async () => {
     const moduleRef = await Test.createTestingModule({
-      providers: [CategoriesService, PrismaService],
+      providers: [CategoriesService, PrismaService, PublicCacheService],
     }).compile();
     service = moduleRef.get(CategoriesService);
     prisma = moduleRef.get(PrismaService);

apps/api/src/categories/categories.service.ts

@@ -5,13 +5,17 @@ import {
   NotFoundException,
 } from '@nestjs/common';
 import { PrismaService } from '../prisma/prisma.service';
+import { PublicCacheService } from '../public/public-cache.service';
 import { CreateCategoryDto } from './dto/create-category.dto';
 import { UpdateCategoryDto } from './dto/update-category.dto';
 import { CategoryNodeDto } from './dto/category-node.dto';
 
 @Injectable()
 export class CategoriesService {
-  constructor(private readonly prisma: PrismaService) {}
+  constructor(
+    private readonly prisma: PrismaService,
+    private readonly publicCache: PublicCacheService,
+  ) {}
 
   async findAll(): Promise<CategoryNodeDto[]> {
     const all = await this.prisma.category.findMany({
@@ -37,7 +41,7 @@ export class CategoriesService {
       // Validate the parent exists to produce a clean 404 instead of FK error.
       await this.findOne(BigInt(dto.parentCategoryId));
     }
-    return this.prisma.category.create({
+    const created = await this.prisma.category.create({
       data: {
         categoryName: dto.categoryName,
         categoryIcon: dto.categoryIcon ?? null,
@@ -47,6 +51,8 @@ export class CategoriesService {
             : BigInt(dto.parentCategoryId),
       },
     });
+    this.publicCache.bump('meta');
+    return created;
   }
 
   async update(id: bigint, dto: UpdateCategoryDto) {
@@ -66,7 +72,9 @@ export class CategoriesService {
         ? { disconnect: true }
         : { connect: { id: BigInt(dto.parentCategoryId) } };
     }
-    return this.prisma.category.update({ where: { id }, data });
+    const updated = await this.prisma.category.update({ where: { id }, data });
+    this.publicCache.bump('meta');
+    return updated;
   }
 
   async remove(id: bigint) {
@@ -80,7 +88,9 @@ export class CategoriesService {
       );
     }
     try {
-      return await this.prisma.category.delete({ where: { id } });
+      const removed = await this.prisma.category.delete({ where: { id } });
+      this.publicCache.bump('meta');
+      return removed;
     } catch (err) {
       if (this.isForeignKeyViolation(err)) {
         throw new BadRequestException(

apps/api/src/countries/countries.controller.ts

@@ -18,6 +18,7 @@ import { JwtAuthGuard } from '../auth/guards/jwt-auth.guard';
 import { CountriesService } from './countries.service';
 import { CreateCountryDto } from './dto/create-country.dto';
 import { UpdateCountryDto } from './dto/update-country.dto';
+import { ReorderCountriesDto } from './dto/reorder-countries.dto';
 
 @ApiTags('countries')
 @ApiBearerAuth()
@@ -32,6 +33,13 @@ export class CountriesController {
     return this.service.findAll();
   }
 
+  // 注意：'sort' 静态路由必须声明在 ':id' 之前，否则会被参数路由吞掉
+  @Patch('sort')
+  @ApiOperation({ summary: 'Batch update country sort order (drag reorder)' })
+  reorder(@Body() dto: ReorderCountriesDto) {
+    return this.service.reorder(dto);
+  }
+
   @Get(':id')
   @ApiOperation({ summary: 'Get one country' })
   findOne(@Param('id', ParseIntPipe) id: string) {

apps/api/src/countries/countries.service.spec.ts

@@ -1,3 +1,4 @@
+import { PublicCacheService } from '../public/public-cache.service';
 import { Test } from '@nestjs/testing';
 import {
   BadRequestException,
@@ -14,7 +15,7 @@ describe('CountriesService', () => {
 
   beforeAll(async () => {
     const moduleRef = await Test.createTestingModule({
-      providers: [CountriesService, PrismaService],
+      providers: [CountriesService, PrismaService, PublicCacheService],
     }).compile();
     service = moduleRef.get(CountriesService);
     prisma = moduleRef.get(PrismaService);
@@ -112,4 +113,30 @@ describe('CountriesService', () => {
     const idx = created.indexOf(`${name}-v2`);
     if (idx !== -1) created.splice(idx, 1);
   });
+
+  it('reorder persists sortOrder and findAll honors it', async () => {
+    const stamp = Date.now();
+    const a = await service.create({ countryName: `Sort A ${stamp}` });
+    const b = await service.create({ countryName: `Sort B ${stamp}` });
+    const c = await service.create({ countryName: `Sort C ${stamp}` });
+    created.push(a.countryName, b.countryName, c.countryName);
+
+    // 新顺序 C, A, B（id 序与 sortOrder 无关时也能稳定验证）
+    const reordered = await service.reorder({
+      items: [
+        { id: Number(c.id), sortOrder: 0 },
+        { id: Number(a.id), sortOrder: 1 },
+        { id: Number(b.id), sortOrder: 2 },
+      ],
+    });
+    const ours = reordered.filter((r) =>
+      [a.id, b.id, c.id].some((id) => id.toString() === r.id.toString()),
+    );
+    expect(ours.map((r) => r.id.toString())).toEqual([c.id.toString(), a.id.toString(), b.id.toString()]);
+
+    const list = await service.findAll();
+    const pos = (id: bigint) => list.findIndex((r) => r.id.toString() === id.toString());
+    expect(pos(c.id)).toBeLessThan(pos(a.id));
+    expect(pos(a.id)).toBeLessThan(pos(b.id));
+  });
 });

apps/api/src/countries/countries.service.ts

@@ -6,15 +6,36 @@ import {
   NotFoundException,
 } from '@nestjs/common';
 import { PrismaService } from '../prisma/prisma.service';
+import { PublicCacheService } from '../public/public-cache.service';
 import { CreateCountryDto } from './dto/create-country.dto';
 import { UpdateCountryDto } from './dto/update-country.dto';
+import { ReorderCountriesDto } from './dto/reorder-countries.dto';
 
 @Injectable()
 export class CountriesService {
-  constructor(private readonly prisma: PrismaService) {}
+  constructor(
+    private readonly prisma: PrismaService,
+    private readonly publicCache: PublicCacheService,
+  ) {}
 
   findAll() {
-    return this.prisma.country.findMany({ orderBy: { id: 'asc' } });
+    return this.prisma.country.findMany({
+      orderBy: [{ sortOrder: 'asc' }, { id: 'asc' }],
+    });
+  }
+
+  /** 批量保存拖拽后的顺序（全量提交，sortOrder = 目标下标） */
+  async reorder(dto: ReorderCountriesDto) {
+    await this.prisma.$transaction(
+      dto.items.map((item) =>
+        this.prisma.country.update({
+          where: { id: BigInt(item.id) },
+          data: { sortOrder: item.sortOrder },
+        }),
+      ),
+    );
+    this.publicCache.bump('meta');
+    return this.findAll();
   }
 
   async findOne(id: bigint) {
@@ -27,12 +48,14 @@ export class CountriesService {
 
   async create(dto: CreateCountryDto) {
     try {
-      return await this.prisma.country.create({
+      const created = await this.prisma.country.create({
         data: {
           countryName: dto.countryName,
           countryIcon: dto.countryIcon ?? null,
         },
       });
+      this.publicCache.bump('meta');
+      return created;
     } catch (err) {
       if (
         err instanceof Prisma.PrismaClientKnownRequestError &&
@@ -47,13 +70,15 @@ export class CountriesService {
   async update(id: bigint, dto: UpdateCountryDto) {
     await this.findOne(id);
     try {
-      return await this.prisma.country.update({
+      const updated = await this.prisma.country.update({
         where: { id },
         data: {
           countryName: dto.countryName,
           countryIcon: dto.countryIcon === undefined ? undefined : dto.countryIcon,
         },
       });
+      this.publicCache.bump('meta');
+      return updated;
     } catch (err) {
       if (
         err instanceof Prisma.PrismaClientKnownRequestError &&
@@ -68,7 +93,9 @@ export class CountriesService {
   async remove(id: bigint) {
     await this.findOne(id);
     try {
-      return await this.prisma.country.delete({ where: { id } });
+      const removed = await this.prisma.country.delete({ where: { id } });
+      this.publicCache.bump('meta');
+      return removed;
     } catch (err) {
       if (this.isForeignKeyViolation(err)) {
         throw new BadRequestException(

apps/api/src/countries/dto/reorder-countries.dto.ts

@@ -0,0 +1,30 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { Type } from 'class-transformer';
+import {
+  ArrayMinSize,
+  IsArray,
+  IsInt,
+  Min,
+  ValidateNested,
+} from 'class-validator';
+
+export class CountryOrderItem {
+  @ApiProperty()
+  @IsInt()
+  @Min(1)
+  id!: number;
+
+  @ApiProperty()
+  @IsInt()
+  @Min(0)
+  sortOrder!: number;
+}
+
+export class ReorderCountriesDto {
+  @ApiProperty({ type: [CountryOrderItem] })
+  @IsArray()
+  @ArrayMinSize(1)
+  @ValidateNested({ each: true })
+  @Type(() => CountryOrderItem)
+  items!: CountryOrderItem[];
+}

apps/api/src/goods/dto/batch-create-good.dto.ts

@@ -15,6 +15,13 @@ export class BatchCreateItemDto {
   @Min(1)
   originGoodId!: number;
 
+  @ApiProperty({ required: false, nullable: true, type: [Number], description: '副源原产品 ID，不含主源' })
+  @IsOptional()
+  @IsArray()
+  @IsInt({ each: true })
+  @Min(1, { each: true })
+  mergedOriginGoodIds?: number[];
+
   @ApiProperty({ required: false })
   @IsOptional()
   @IsInt()

apps/api/src/goods/dto/create-good.dto.ts

@@ -20,6 +20,13 @@ export class CreateGoodDto {
   @Min(1)
   originGoodId!: number;
 
+  @ApiProperty({ required: false, nullable: true, type: [Number], description: '副源原产品 ID，不含主源' })
+  @IsOptional()
+  @IsArray()
+  @IsInt({ each: true })
+  @Min(1, { each: true })
+  mergedOriginGoodIds?: number[];
+
   @ApiProperty()
   @IsInt()
   @Min(1)

apps/api/src/goods/dto/custom-good.dto.ts

@@ -211,6 +211,31 @@ export class CreateCustomGoodDto extends OmitType(CreateGoodDto, [
   @IsNumberString()
   goodPrice?: string | null;
 
+  @ApiProperty({ required: false, description: '物流归因（入族后参与价格矩阵）', example: '包邮' })
+  @IsOptional()
+  @IsString()
+  logisticsLabel?: string;
+
+  @ApiProperty({ required: false, description: '工艺/印花数量归因', example: '双面印花' })
+  @IsOptional()
+  @IsString()
+  craftLabel?: string;
+
+  @ApiProperty({ required: false })
+  @IsOptional()
+  @IsString()
+  skuCode?: string;
+
+  @ApiProperty({ required: false })
+  @IsOptional()
+  @IsString()
+  warehouseLabel?: string;
+
+  @ApiProperty({ required: false, description: '挂入的产品族 id（缺省为独立商品）', example: '12' })
+  @IsOptional()
+  @IsNumberString()
+  familyId?: string;
+
   @ApiProperty({ required: false, type: CustomGoodDetailDto })
   @IsOptional()
   @ValidateNested()

apps/api/src/goods/dto/good.dto.ts

@@ -6,33 +6,59 @@ export interface GoodRelations {
   category?: { id: bigint; categoryName: string; categoryIcon: string | null } | null;
   tag?: { id: bigint; tagName: string; tagColor: string | null; tagFontColor: string | null } | null;
   position?: { id: bigint; indexVal: number } | null;
-  originGood?: {
+  originGood?: {
     id: bigint;
-    sdsGoodId: string;
+    sdsGoodId: string;
-    source: 'SDS' | 'CUSTOM';
+    source: 'SDS' | 'CUSTOM';
     goodName: string | null;
     goodImage: string | null;
-    goodPrice: unknown;
+    goodPrice: unknown;
-    detail?: {
+    family?: { id: bigint; familyCode: string | null; familyName: string; _count?: { originGoods: number } } | null;
-      productCode: string | null;
+    detail?: {
-      syncedAt: Date;
+      productCode: string | null;
-      sizeChart: unknown;
+      syncedAt: Date;
-      packageSpecs: unknown;
+      sizeChart: unknown;
-      [key: string]: unknown;
+      packageSpecs: unknown;
-    } | null;
+      [key: string]: unknown;
-    variants?: Array<{
+    } | null;
-      sdsVariantId: string;
+    variants?: Array<{
-      sku: string;
+      sdsVariantId: string;
-      sizeName: string | null;
+      sku: string;
-      colorName: string | null;
+      sizeName: string | null;
-      colorHex: string | null;
+      colorName: string | null;
-      price: unknown;
+      colorHex: string | null;
-      enabled: boolean;
+      price: unknown;
-      [key: string]: unknown;
+      enabled: boolean;
-    }>;
+      [key: string]: unknown;
-    _count?: { variants: number };
+    }>;
+    _count?: { variants: number };
   } | null;
-  goodTags?: { tag: { id: bigint; tagName: string; tagColor: string | null; tagFontColor: string | null } }[];
+  goodTags?: { tag: { id: bigint; tagName: string; tagColor: string | null; tagFontColor: string | null; tagGroupId: bigint | null } }[];
+  mergedOriginGoods?: Array<{
+    originGood: {
+      id: bigint;
+      sdsGoodId: string;
+      source: 'SDS' | 'CUSTOM';
+      goodName: string | null;
+      goodImage: string | null;
+      goodPrice: unknown;
+      detail?: { syncedAt: Date } | Record<string, unknown> | null;
+      variants?: Array<{ [key: string]: unknown }>;
+      _count?: { variants: number };
+    };
+  }>;
+}
+
+export interface MergedOriginGoodSummary {
+  id: string;
+  sdsGoodId: string;
+  source: 'SDS' | 'CUSTOM';
+  isCustom: boolean;
+  goodName: string | null;
+  goodImage: string | null;
+  goodPrice: string | null;
+  hasDetail: boolean;
+  variantCount: number;
 }
 
 export class GoodDto {
@@ -81,24 +107,28 @@ export class GoodDto {
   @ApiProperty({ required: false, type: Array })
   tags!: Array<{ id: string; tagName: string; tagColor: string | null; tagFontColor: string | null }>;
 
+  @ApiProperty({ required: false, type: Array })
+  mergedOriginGoods!: MergedOriginGoodSummary[];
+
   @ApiProperty({ required: false, nullable: true })
   position?: { id: string; indexVal: number } | null;
 
   @ApiProperty({ required: false, nullable: true })
-  originGood?: {
+  originGood?: {
     id: string;
-    sdsGoodId: string;
+    sdsGoodId: string;
-    source: 'SDS' | 'CUSTOM';
+    source: 'SDS' | 'CUSTOM';
-    isCustom: boolean;
+    isCustom: boolean;
     goodName: string | null;
     goodImage: string | null;
-    goodPrice: string | null;
+    goodPrice: string | null;
-    hasDetail: boolean;
+    hasDetail: boolean;
-    detailSyncedAt: string | null;
+    detailSyncedAt: string | null;
-    variantCount: number;
+    variantCount: number;
-    sizeRowCount: number;
+    sizeRowCount: number;
-    packageRowCount: number;
+    packageRowCount: number;
-    productCode: string | null;
+    productCode: string | null;
+    family?: { familyId: string; familyCode: string | null; familyName: string; memberCount?: number } | null;
   } | null;
 
   static from(
@@ -145,72 +175,119 @@ export class GoodDto {
             tagName: gt.tag.tagName,
             tagColor: gt.tag.tagColor,
             tagFontColor: gt.tag.tagFontColor,
+            tagGroupId: gt.tag.tagGroupId?.toString() ?? null,
           }))
         : [],
+      mergedOriginGoods: (rel.mergedOriginGoods ?? []).map((m) => ({
+        id: m.originGood.id.toString(),
+        sdsGoodId: m.originGood.sdsGoodId,
+        source: m.originGood.source,
+        isCustom: m.originGood.source === 'CUSTOM',
+        goodName: m.originGood.goodName,
+        goodImage: m.originGood.goodImage,
+        goodPrice:
+          m.originGood.goodPrice === null || m.originGood.goodPrice === undefined
+            ? null
+            : (m.originGood.goodPrice as { toString(): string }).toString(),
+        hasDetail: Boolean(m.originGood.detail),
+        variantCount:
+          m.originGood._count?.variants ?? m.originGood.variants?.length ?? 0,
+      })),
       position: rel.position
         ? {
             id: rel.position.id.toString(),
             indexVal: rel.position.indexVal,
           }
         : null,
-      originGood: rel.originGood
+      originGood: rel.originGood
-        ? {
+        ? {
             id: rel.originGood.id.toString(),
-            sdsGoodId: rel.originGood.sdsGoodId,
+            sdsGoodId: rel.originGood.sdsGoodId,
-            source: rel.originGood.source,
+            source: rel.originGood.source,
-            isCustom: rel.originGood.source === 'CUSTOM',
+            isCustom: rel.originGood.source === 'CUSTOM',
             goodName: rel.originGood.goodName,
             goodImage: rel.originGood.goodImage,
             goodPrice:
               rel.originGood.goodPrice === null ||
               rel.originGood.goodPrice === undefined
                 ? null
-                : (rel.originGood.goodPrice as { toString(): string }).toString(),
+                : (rel.originGood.goodPrice as { toString(): string }).toString(),
-            hasDetail: Boolean(rel.originGood.detail),
+            hasDetail: Boolean(rel.originGood.detail),
-            detailSyncedAt: rel.originGood.detail?.syncedAt.toISOString() ?? null,
+            detailSyncedAt: rel.originGood.detail?.syncedAt.toISOString() ?? null,
-            variantCount: rel.originGood._count?.variants ?? rel.originGood.variants?.length ?? 0,
+            variantCount: rel.originGood._count?.variants ?? rel.originGood.variants?.length ?? 0,
-            sizeRowCount: GoodDto.jsonRows(rel.originGood.detail?.sizeChart),
+            sizeRowCount: GoodDto.jsonRows(rel.originGood.detail?.sizeChart),
-            packageRowCount: GoodDto.jsonRows(rel.originGood.detail?.packageSpecs),
+            packageRowCount: GoodDto.jsonRows(rel.originGood.detail?.packageSpecs),
-            productCode: rel.originGood.detail?.productCode ?? null,
+            productCode: rel.originGood.detail?.productCode ?? null,
-          }
+            family: rel.originGood.family
+              ? {
+                  familyId: rel.originGood.family.id.toString(),
+                  familyCode: rel.originGood.family.familyCode,
+                  familyName: rel.originGood.family.familyName,
+                  memberCount: rel.originGood.family._count?.originGoods,
+                }
+              : null,
+          }
         : null,
-    };
+    };
-  }
+  }
-
+
-  private static jsonRows(value: unknown): number {
+  private static jsonRows(value: unknown): number {
-    if (!value || typeof value !== 'object' || !('rows' in value)) return 0;
+    if (!value || typeof value !== 'object' || !('rows' in value)) return 0;
-    const rows = (value as { rows?: unknown }).rows;
+    const rows = (value as { rows?: unknown }).rows;
-    return Array.isArray(rows) ? rows.length : 0;
+    return Array.isArray(rows) ? rows.length : 0;
-  }
+  }
-}
+}
-
+
-export class GoodDetailDto extends GoodDto {
+export class GoodDetailDto extends GoodDto {
-  @ApiProperty({ nullable: true, type: Object })
+  @ApiProperty({ nullable: true, type: Object })
-  originDetail!: Record<string, unknown> | null;
+  originDetail!: Record<string, unknown> | null;
-
+
-  @ApiProperty({ type: Array })
+  @ApiProperty({ type: Array })
-  variants!: Array<Record<string, unknown>>;
+  variants!: Array<Record<string, unknown>>;
-
+
-  static fromGood(good: PrismaGood, rel: GoodRelations): GoodDetailDto {
+  static fromGood(good: PrismaGood, rel: GoodRelations): GoodDetailDto {
-    const base = GoodDto.from(good, rel);
+    const base = GoodDto.from(good, rel);
-    const detail = rel.originGood?.detail;
+    const detail = rel.originGood?.detail;
-    return {
+    const toAnnotated = (
-      ...base,
+      variant: Record<string, unknown>,
-      originDetail: detail ? { ...detail, syncedAt: detail.syncedAt.toISOString() } : null,
+      originGoodId: string,
-      variants: (rel.originGood?.variants ?? []).map((variant) => ({
+      originGoodName: string | null,
-        ...variant,
+    ) => ({
-        price:
+      ...variant,
-          variant.price === null || variant.price === undefined
+      price:
-            ? null
+        variant.price === null || variant.price === undefined
-            : (variant.price as { toString(): string }).toString(),
+          ? null
-      })),
+          : (variant.price as unknown as { toString(): string }).toString(),
-    };
+      originGoodId,
-  }
+      originGoodName,
-}
+    });
+    const primaryId = good.originGoodId.toString();
+    const primaryName = rel.originGood?.goodName ?? null;
+    const mergedVariants = [
+      ...(rel.originGood?.variants ?? []).map((variant) =>
+        toAnnotated(variant as Record<string, unknown>, primaryId, primaryName),
+      ),
+      ...(rel.mergedOriginGoods ?? []).flatMap((m) =>
+        (m.originGood.variants ?? []).map((variant) =>
+          toAnnotated(
+            variant,
+            m.originGood.id.toString(),
+            m.originGood.goodName,
+          ),
+        ),
+      ),
+    ];
+    return {
+      ...base,
+      originDetail: detail ? { ...detail, syncedAt: detail.syncedAt.toISOString() } : null,
+      variants: mergedVariants,
+    };
+  }
+}
 
 export interface PaginatedGoods {
   items: GoodDto[];
   total: number;
   page: number;
   pageSize: number;
-}
+}

apps/api/src/goods/dto/query-good.dto.ts

@@ -21,7 +21,7 @@ export class QueryGoodDto {
   @Type(() => Number)
   @IsInt()
   @Min(1)
-  @Max(200)
+  @Max(1000)
   pageSize: number = 20;
 
   @ApiProperty({ required: false })

apps/api/src/goods/dto/update-good.dto.ts

@@ -19,6 +19,13 @@ export class UpdateGoodDto {
   @Min(1)
   originGoodId?: number;
 
+  @ApiProperty({ required: false, nullable: true, type: [Number], description: '副源原产品 ID 全量覆盖，不含主源' })
+  @IsOptional()
+  @IsArray()
+  @IsInt({ each: true })
+  @Min(1, { each: true })
+  mergedOriginGoodIds?: number[];
+
   @ApiProperty({ required: false })
   @IsOptional()
   @IsInt()
@@ -54,4 +61,15 @@ export class UpdateGoodDto {
   @IsOptional()
   @IsString()
   goodImage?: string | null;
+
+  @ApiProperty({
+    required: false,
+    nullable: true,
+    type: Number,
+    description: '所属产品族 id（null = 脱离族）',
+  })
+  @IsOptional()
+  @IsInt()
+  @Min(1)
+  familyId?: number | null;
 }

apps/api/src/goods/goods.module.ts

@@ -1,10 +1,11 @@
 import { Module } from '@nestjs/common';
 import { GoodsController } from './goods.controller';
-import { GoodsService } from './goods.service';
+import { GoodsService } from './goods.service';
-import { SyncModule } from '../sync/sync.module';
+import { SyncModule } from '../sync/sync.module';
-
+import { ProductFamiliesModule } from '../product-families/product-families.module';
-@Module({
+
-  imports: [SyncModule],
+@Module({
+  imports: [SyncModule, ProductFamiliesModule],
   controllers: [GoodsController],
   providers: [GoodsService],
   exports: [GoodsService],

apps/api/src/goods/goods.service.spec.ts

@@ -1,11 +1,18 @@
+import { PublicCacheService } from '../public/public-cache.service';
 import { Test } from '@nestjs/testing';
 import {
   BadRequestException,
   NotFoundException,
 } from '@nestjs/common';
-import { GoodsService } from './goods.service';
+import {
-import { PrismaService } from '../prisma/prisma.service';
+  cleanGoodDisplayName,
-import { SyncService } from '../sync/sync.service';
+  describePureSkuGoodName,
+  GoodsService,
+  isPureSkuGoodName,
+} from './goods.service';
+import { PrismaService } from '../prisma/prisma.service';
+import { SyncService } from '../sync/sync.service';
+import { FamilyRecomputeService } from '../product-families/family-recompute.service';
 
 describe('GoodsService', () => {
   let service: GoodsService;
@@ -23,14 +30,27 @@ describe('GoodsService', () => {
 
   beforeAll(async () => {
     const moduleRef = await Test.createTestingModule({
-      providers: [
+      providers: [
-        GoodsService,
+        PublicCacheService,
-        PrismaService,
+        GoodsService,
-        {
+        PrismaService,
-          provide: SyncService,
+        {
-          useValue: { queueProductDetailSync: jest.fn() },
+          provide: SyncService,
-        },
+          useValue: { queueProductDetailSync: jest.fn() },
-      ],
+        },
+        {
+          provide: FamilyRecomputeService,
+          // 全量并行跑时其他套件的扫名归族可能把本套件夹具链接收进族，
+          // create/update 会调用 syncFamilyTags —— mock 必须覆盖全部被调方法
+          useValue: {
+            enqueue: jest.fn(),
+            recomputeFamily: jest.fn().mockResolvedValue(undefined),
+            syncFamilyTags: jest.fn().mockResolvedValue({ goodsUpdated: 0, linksUpdated: 0 }),
+            refreshLinkTags: jest.fn().mockResolvedValue(undefined),
+            mirrorLinkTagsToGoods: jest.fn().mockResolvedValue(undefined),
+          },
+        },
+      ],
     }).compile();
     service = moduleRef.get(GoodsService);
     prisma = moduleRef.get(PrismaService);
@@ -101,7 +121,7 @@ describe('GoodsService', () => {
     expect(service).toBeDefined();
   });
 
-  it('creates and reads back a good', async () => {
+  it('creates and reads back a good', async () => {
     const created = await service.create({
       goodName: `Goods Test ${stamp} basic`,
       originGoodId: Number(originGoodIds[0]),
@@ -117,52 +137,52 @@ describe('GoodsService', () => {
 
     const fetched = await service.findOne(BigInt(created.id));
     expect(fetched.goodName).toBe(`Goods Test ${stamp} basic`);
-  });
+  });
-
+
-  it('creates, edits, and removes a fully editable custom good', async () => {
+  it('creates, edits, and removes a fully editable custom good', async () => {
-    const created = await service.createCustom({
+    const created = await service.createCustom({
-      goodName: `Goods Test ${stamp} custom`,
+      goodName: `Goods Test ${stamp} custom`,
-      goodImage: 'https://example.com/custom.png',
+      goodImage: 'https://example.com/custom.png',
-      goodPrice: '29.90',
+      goodPrice: '29.90',
-      countryId: Number(countryId),
+      countryId: Number(countryId),
-      categoryId: Number(categoryId),
+      categoryId: Number(categoryId),
-      tagIds: [Number(tagId)],
+      tagIds: [Number(tagId)],
-      detail: {
+      detail: {
-        productCode: `CUSTOM-${stamp}`,
+        productCode: `CUSTOM-${stamp}`,
-        materialDescription: 'Cotton',
+        materialDescription: 'Cotton',
-        sizeChart: { columns: [], rows: [] },
+        sizeChart: { columns: [], rows: [] },
-        packageSpecs: { rows: [] },
+        packageSpecs: { rows: [] },
-      },
+      },
-      variants: [
+      variants: [
-        { sku: `CUSTOM-SKU-${stamp}`, sizeName: 'S', price: '29.90' },
+        { sku: `CUSTOM-SKU-${stamp}`, sizeName: 'S', price: '29.90' },
-      ],
+      ],
-    });
+    });
-
+
-    expect(created.originGood?.source).toBe('CUSTOM');
+    expect(created.originGood?.source).toBe('CUSTOM');
-    expect(created.originGood?.isCustom).toBe(true);
+    expect(created.originGood?.isCustom).toBe(true);
-    expect(created.originGood?.goodPrice).toBe('29.9');
+    expect(created.originGood?.goodPrice).toBe('29.9');
-    expect(created.variants).toHaveLength(1);
+    expect(created.variants).toHaveLength(1);
-
+
-    const updated = await service.updateCustomContent(BigInt(created.id), {
+    const updated = await service.updateCustomContent(BigInt(created.id), {
-      goodName: `Goods Test ${stamp} custom edited`,
+      goodName: `Goods Test ${stamp} custom edited`,
-      goodPrice: '39.90',
+      goodPrice: '39.90',
-      detail: { materialDescription: 'Organic cotton' },
+      detail: { materialDescription: 'Organic cotton' },
-      variants: [
+      variants: [
-        { sku: `CUSTOM-SKU-${stamp}-M`, sizeName: 'M', price: '39.90' },
+        { sku: `CUSTOM-SKU-${stamp}-M`, sizeName: 'M', price: '39.90' },
-      ],
+      ],
-    });
+    });
-    expect(updated.goodName).toContain('custom edited');
+    expect(updated.goodName).toContain('custom edited');
-    expect(updated.originGood?.goodPrice).toBe('39.9');
+    expect(updated.originGood?.goodPrice).toBe('39.9');
-    expect(updated.originDetail?.materialDescription).toBe('Organic cotton');
+    expect(updated.originDetail?.materialDescription).toBe('Organic cotton');
-    expect(updated.originDetail?.productCode).toBe(`CUSTOM-${stamp}`);
+    expect(updated.originDetail?.productCode).toBe(`CUSTOM-${stamp}`);
-    expect(updated.variants[0]?.sizeName).toBe('M');
+    expect(updated.variants[0]?.sizeName).toBe('M');
-
+
-    const customOriginId = BigInt(updated.originGoodId);
+    const customOriginId = BigInt(updated.originGoodId);
-    await service.remove(BigInt(updated.id));
+    await service.remove(BigInt(updated.id));
-    await expect(
+    await expect(
-      prisma.originGood.findUnique({ where: { id: customOriginId } }),
+      prisma.originGood.findUnique({ where: { id: customOriginId } }),
-    ).resolves.toBeNull();
+    ).resolves.toBeNull();
-  });
+  });
 
   it('filters by countryId, tagId, positionId and keyword', async () => {
     const result = await service.findAll({
@@ -261,6 +281,390 @@ describe('GoodsService', () => {
     expect(after.total).toBe(before.total);
   });
 
+  describe('good name normalization', () => {
+    it('create/update 时把结构完整的原始链接名规范化为 品名+型号', async () => {
+      const created = await service.create({
+        goodName: '德国(不包邮)230g水洗T恤-DETM002-双面印花',
+        originGoodId: Number(originGoodIds[0]),
+        countryId: Number(countryId),
+        categoryId: Number(categoryId),
+      });
+      try {
+        expect(created.goodName).toBe('230g水洗T恤 DETM002');
+        const updated = await service.update(BigInt(created.id), {
+          goodName: '加拿大（不包邮）180g纯棉T恤-CATM001-单面印花',
+        });
+        expect(updated.goodName).toBe('180g纯棉T恤 CATM001');
+      } finally {
+        await prisma.good.delete({ where: { id: BigInt(created.id) } });
+      }
+    });
+
+    it('非链接结构的名称原样保留（已解析名/自定义名）', async () => {
+      const created = await service.create({
+        goodName: '230g水洗T恤 DETM002',
+        originGoodId: Number(originGoodIds[0]),
+        countryId: Number(countryId),
+        categoryId: Number(categoryId),
+      });
+      try {
+        expect(created.goodName).toBe('230g水洗T恤 DETM002');
+        const updated = await service.update(BigInt(created.id), {
+          goodName: '自定义商品 ABC',
+        });
+        expect(updated.goodName).toBe('自定义商品 ABC');
+      } finally {
+        await prisma.good.delete({ where: { id: BigInt(created.id) } });
+      }
+    });
+  });
+
+  describe('pure sku good name（纯款号补描述）', () => {
+    const pskuCode = `PSKU${stamp}`;
+    const pskuDesc = `童装纯色测试插肩T恤${stamp}`;
+    let pskuOriginGoodId: bigint;
+    let bareOriginGoodId: bigint;
+
+    beforeAll(async () => {
+      await prisma.category.create({
+        data: {
+          categoryName: `${pskuCode} ${pskuDesc}`,
+          sdsCategoryId: `psku-cat-${stamp}`,
+        },
+      });
+      const pskuOg = await prisma.originGood.create({
+        data: {
+          sdsGoodId: `sds-psku-${stamp}`,
+          goodName: pskuCode,
+          sdsCategoryId: `psku-cat-${stamp}`,
+        },
+      });
+      pskuOriginGoodId = pskuOg.id;
+      const bareOg = await prisma.originGood.create({
+        data: {
+          sdsGoodId: `sds-psku-bare-${stamp}`,
+          goodName: `PSKB${stamp}`,
+        },
+      });
+      bareOriginGoodId = bareOg.id;
+    });
+
+    afterAll(async () => {
+      await prisma.good.deleteMany({
+        where: { OR: [{ goodName: { contains: pskuCode } }, { goodName: { contains: `PSKB${stamp}` } }] },
+      });
+      await prisma.originGood.deleteMany({
+        where: { id: { in: [pskuOriginGoodId, bareOriginGoodId] } },
+      });
+      await prisma.category.deleteMany({
+        where: { sdsCategoryId: `psku-cat-${stamp}` },
+      });
+    });
+
+    it('isPureSkuGoodName：仅纯字母数字为真', () => {
+      expect(isPureSkuGoodName('PLTK016')).toBe(true);
+      expect(isPureSkuGoodName(' pltk016 ')).toBe(true);
+      expect(isPureSkuGoodName('PSKU1')).toBe(true);
+      expect(isPureSkuGoodName('童装纯色插肩短袖T恤 PLTK016')).toBe(false);
+      expect(isPureSkuGoodName('德国(不包邮)T恤-DG001-烫画')).toBe(false);
+      expect(isPureSkuGoodName('230g水洗T恤 DETM002')).toBe(false);
+      expect(isPureSkuGoodName('P')).toBe(false);
+      expect(isPureSkuGoodName('')).toBe(false);
+    });
+
+    it('cleanGoodDisplayName：品名内的 ASCII 型号限定词剥离，中文括号内容保留', () => {
+      expect(
+        cleanGoodDisplayName('波兰（包邮）童装纯色插肩短袖T恤（DTG180）-PLTK016-双面印花'),
+      ).toBe('童装纯色插肩短袖T恤 PLTK016');
+      expect(cleanGoodDisplayName('童装纯色插肩短袖T恤（DTG180） PLTK016')).toBe(
+        '童装纯色插肩短袖T恤 PLTK016',
+      );
+      expect(cleanGoodDisplayName('180G纯棉T恤 （JSA002） DG001')).toBe('180G纯棉T恤 DG001');
+      expect(cleanGoodDisplayName('牛奶丝T恤（女款） DG601')).toBe('牛奶丝T恤（女款） DG601');
+      expect(cleanGoodDisplayName('230g水洗T恤 DETM002')).toBe('230g水洗T恤 DETM002');
+    });
+
+    it('describePureSkuGoodName：标准分类名剥款号补描述', () => {
+      expect(
+        describePureSkuGoodName('PLTK016', 'PLTK016 童装纯色插肩短袖T恤'),
+      ).toBe('童装纯色插肩短袖T恤 PLTK016');
+    });
+
+    it('describePureSkuGoodName：分类名无款号前缀时用全名', () => {
+      expect(
+        describePureSkuGoodName('PLTK016', '童装纯色插肩短袖T恤'),
+      ).toBe('童装纯色插肩短袖T恤 PLTK016');
+    });
+
+    it('describePureSkuGoodName：分类名即款号/空分类名/非纯款号名原样返回', () => {
+      expect(describePureSkuGoodName('PLTK016', 'PLTK016')).toBe('PLTK016');
+      expect(describePureSkuGoodName('PLTK016', null)).toBe('PLTK016');
+      expect(describePureSkuGoodName('PLTK016', undefined)).toBe('PLTK016');
+      expect(
+        describePureSkuGoodName('童装T恤 PLTK016', 'PLTK016 童装T恤'),
+      ).toBe('童装T恤 PLTK016');
+      expect(describePureSkuGoodName('230g水洗T恤 DETM002', 'PLTK016 童装T恤')).toBe(
+        '230g水洗T恤 DETM002',
+      );
+    });
+
+    it('describePureSkuGoodName：分类名中的 ASCII 型号限定词一并剥离', () => {
+      expect(
+        describePureSkuGoodName('PLTK016', 'PLTK016 童装纯色插肩短袖T恤（DTG180）'),
+      ).toBe('童装纯色插肩短袖T恤 PLTK016');
+    });
+
+    it('create：纯款号名按主链接 SDS 分类名补描述', async () => {
+      const created = await service.create({
+        goodName: pskuCode,
+        originGoodId: Number(pskuOriginGoodId),
+        countryId: Number(countryId),
+        categoryId: Number(categoryId),
+      });
+      try {
+        expect(created.goodName).toBe(`${pskuDesc} ${pskuCode}`);
+      } finally {
+        await prisma.good.delete({ where: { id: BigInt(created.id) } });
+      }
+    });
+
+    it('create：主链接无 sdsCategoryId 映射时纯款号原样保留', async () => {
+      const created = await service.create({
+        goodName: `PSKB${stamp}`,
+        originGoodId: Number(bareOriginGoodId),
+        countryId: Number(countryId),
+        categoryId: Number(categoryId),
+      });
+      try {
+        expect(created.goodName).toBe(`PSKB${stamp}`);
+      } finally {
+        await prisma.good.delete({ where: { id: BigInt(created.id) } });
+      }
+    });
+
+    it('update：改成纯款号名按商品主链接分类名补描述', async () => {
+      const created = await service.create({
+        goodName: `Goods Test ${stamp} psku-rename`,
+        originGoodId: Number(pskuOriginGoodId),
+        countryId: Number(countryId),
+        categoryId: Number(categoryId),
+      });
+      try {
+        const updated = await service.update(BigInt(created.id), {
+          goodName: pskuCode,
+        });
+        expect(updated.goodName).toBe(`${pskuDesc} ${pskuCode}`);
+      } finally {
+        await prisma.good.delete({ where: { id: BigInt(created.id) } });
+      }
+    });
+
+    it('batchCreate：纯款号链接名补描述、完整链接名规范化', async () => {
+      const created = await service.batchCreate({
+        countryId: Number(countryId),
+        categoryId: Number(categoryId),
+        items: [{ originGoodId: Number(pskuOriginGoodId) }],
+      });
+      try {
+        expect(created[0]?.goodName).toBe(`${pskuDesc} ${pskuCode}`);
+      } finally {
+        await prisma.good.deleteMany({
+          where: { id: { in: created.map((g) => BigInt(g.id)) } },
+        });
+      }
+    });
+
+    it('backfillPureSkuGoodNames：dry-run 只列不改，apply 改名且幂等', async () => {
+      // 绕过写路径直写库，模拟存量纯款号名
+      const row = await prisma.good.create({
+        data: {
+          goodName: pskuCode,
+          originGoodId: pskuOriginGoodId,
+          countryId,
+          categoryId,
+        },
+      });
+      try {
+        // dry-run / apply 均用 goodId 限定在本夹具，避免测试副作用波及共享库真实数据
+        const dry = await service.backfillPureSkuGoodNames({ dryRun: true, goodId: row.id });
+        expect(dry.renames).toEqual([
+          { id: row.id.toString(), from: pskuCode, to: `${pskuDesc} ${pskuCode}` },
+        ]);
+        expect(
+          (await prisma.good.findUniqueOrThrow({ where: { id: row.id } })).goodName,
+        ).toBe(pskuCode);
+
+        const applied = await service.backfillPureSkuGoodNames({ dryRun: false, goodId: row.id });
+        expect(applied.renamed).toBe(1);
+        expect(
+          (await prisma.good.findUniqueOrThrow({ where: { id: row.id } })).goodName,
+        ).toBe(`${pskuDesc} ${pskuCode}`);
+
+        // 幂等：已改名的行不再出现在后续清单
+        const again = await service.backfillPureSkuGoodNames({ dryRun: true, goodId: row.id });
+        expect(again.renames).toEqual([]);
+      } finally {
+        await prisma.good.delete({ where: { id: row.id } });
+      }
+    });
+
+    it('backfillPureSkuGoodNames：剥离「品名（型号限定词） SKU」存量名中的限定词', async () => {
+      const row = await prisma.good.create({
+        data: {
+          goodName: `${pskuDesc}（DTG180） ${pskuCode}`,
+          originGoodId: pskuOriginGoodId,
+          countryId,
+          categoryId,
+        },
+      });
+      try {
+        const dry = await service.backfillPureSkuGoodNames({ dryRun: true, goodId: row.id });
+        expect(dry.renames).toEqual([
+          {
+            id: row.id.toString(),
+            from: `${pskuDesc}（DTG180） ${pskuCode}`,
+            to: `${pskuDesc} ${pskuCode}`,
+          },
+        ]);
+        await service.backfillPureSkuGoodNames({ dryRun: false, goodId: row.id });
+        expect(
+          (await prisma.good.findUniqueOrThrow({ where: { id: row.id } })).goodName,
+        ).toBe(`${pskuDesc} ${pskuCode}`);
+      } finally {
+        await prisma.good.delete({ where: { id: row.id } });
+      }
+    });
+  });
+
+  describe('merged origin goods', () => {
+    it('creates a good with merged origin goods and reads them back', async () => {
+      const created = await service.create({
+        goodName: `Goods Test ${stamp} merged`,
+        originGoodId: Number(originGoodIds[1]),
+        mergedOriginGoodIds: [Number(originGoodIds[2]), Number(originGoodIds[3])],
+        countryId: Number(countryId),
+        categoryId: Number(categoryId),
+      });
+      expect(created.mergedOriginGoods.map((m) => m.id).sort()).toEqual(
+        [originGoodIds[2].toString(), originGoodIds[3].toString()].sort(),
+      );
+      const fetched = await service.findOne(BigInt(created.id));
+      expect(fetched.mergedOriginGoods.length).toBe(2);
+    });
+
+    it('rejects mergedOriginGoodIds containing the primary', async () => {
+      await expect(
+        service.create({
+          goodName: `Goods Test ${stamp} bad-primary`,
+          originGoodId: Number(originGoodIds[1]),
+          mergedOriginGoodIds: [Number(originGoodIds[1])],
+          countryId: Number(countryId),
+          categoryId: Number(categoryId),
+        }),
+      ).rejects.toThrow(BadRequestException);
+    });
+
+    it('rejects mergedOriginGoodIds that do not exist', async () => {
+      await expect(
+        service.create({
+          goodName: `Goods Test ${stamp} bad-missing`,
+          originGoodId: Number(originGoodIds[1]),
+          mergedOriginGoodIds: [999999999],
+          countryId: Number(countryId),
+          categoryId: Number(categoryId),
+        }),
+      ).rejects.toThrow(BadRequestException);
+    });
+
+    it('replaces merged origin goods on update', async () => {
+      const created = await service.create({
+        goodName: `Goods Test ${stamp} replace`,
+        originGoodId: Number(originGoodIds[1]),
+        mergedOriginGoodIds: [Number(originGoodIds[2])],
+        countryId: Number(countryId),
+        categoryId: Number(categoryId),
+      });
+      const updated = await service.update(BigInt(created.id), {
+        mergedOriginGoodIds: [Number(originGoodIds[3]), Number(originGoodIds[4])],
+      });
+      expect(updated.mergedOriginGoods.map((m) => m.id).sort()).toEqual(
+        [originGoodIds[3].toString(), originGoodIds[4].toString()].sort(),
+      );
+    });
+
+    it('moves old primary into merged list when switching primary', async () => {
+      const created = await service.create({
+        goodName: `Goods Test ${stamp} switch`,
+        originGoodId: Number(originGoodIds[1]),
+        mergedOriginGoodIds: [Number(originGoodIds[2])],
+        countryId: Number(countryId),
+        categoryId: Number(categoryId),
+      });
+      const updated = await service.update(BigInt(created.id), {
+        originGoodId: Number(originGoodIds[2]),
+        mergedOriginGoodIds: [Number(originGoodIds[1]), Number(originGoodIds[3])],
+      });
+      expect(updated.originGoodId).toBe(originGoodIds[2].toString());
+      expect(updated.mergedOriginGoods.map((m) => m.id).sort()).toEqual(
+        [originGoodIds[1].toString(), originGoodIds[3].toString()].sort(),
+      );
+    });
+
+    it('cascades merged rows on good removal', async () => {
+      const created = await service.create({
+        goodName: `Goods Test ${stamp} cascade`,
+        originGoodId: Number(originGoodIds[1]),
+        mergedOriginGoodIds: [Number(originGoodIds[2])],
+        countryId: Number(countryId),
+        categoryId: Number(categoryId),
+      });
+      await service.remove(BigInt(created.id));
+      const rows = await prisma.goodOriginGood.count({
+        where: { goodId: BigInt(created.id) },
+      });
+      expect(rows).toBe(0);
+    });
+
+    it('returns merged variants with source annotation in detail', async () => {
+      const v1 = await prisma.originGoodVariant.create({
+        data: {
+          originGoodId: originGoodIds[1],
+          sdsVariantId: `mv-pri-${stamp}`,
+          sku: `MV-PRI-${stamp}`,
+          colorName: '黑色',
+        },
+      });
+      const v2 = await prisma.originGoodVariant.create({
+        data: {
+          originGoodId: originGoodIds[2],
+          sdsVariantId: `mv-sec-${stamp}`,
+          sku: `MV-SEC-${stamp}`,
+          colorName: '白色',
+        },
+      });
+      try {
+        const created = await service.create({
+          goodName: `Goods Test ${stamp} variants`,
+          originGoodId: Number(originGoodIds[1]),
+          mergedOriginGoodIds: [Number(originGoodIds[2])],
+          countryId: Number(countryId),
+          categoryId: Number(categoryId),
+        });
+        const detail = await service.findOne(BigInt(created.id));
+        const sources = new Set(
+          detail.variants.map((v) => v['originGoodId'] as string),
+        );
+        expect(sources.has(originGoodIds[1].toString())).toBe(true);
+        expect(sources.has(originGoodIds[2].toString())).toBe(true);
+        expect(detail.variants).toHaveLength(2);
+        expect(detail.mergedOriginGoods.find((m) => m.id === originGoodIds[2].toString())?.variantCount).toBe(1);
+      } finally {
+        await prisma.originGoodVariant.delete({ where: { id: v1.id } });
+        await prisma.originGoodVariant.delete({ where: { id: v2.id } });
+      }
+    });
+  });
+
   it('throws NotFoundException for unknown id', async () => {
     await expect(service.findOne(BigInt(99999999))).rejects.toBeInstanceOf(
       NotFoundException,

apps/api/src/main.ts

@@ -30,10 +30,22 @@ async function bootstrap() {
     }),
   );
 
-  // Security headers (X-Content-Type-Options, X-Frame-Options, CSP, HSTS, ...)
+  // Security headers (X-Content-Type-Options, X-Frame-Options, HSTS, ...)
   // Static assets (/uploads, /assets) are embedded cross-origin by other
-  // sites, so CORP must allow cross-origin reads.
+  // sites, so CORP must allow cross-origin reads. CSP 去掉默认的
-  app.use(helmet({ crossOriginResourcePolicy: { policy: 'cross-origin' } }));
+  // upgrade-insecure-requests：Swagger UI 经纯 http 访问时该指令会把
+  // 自身子资源升级为 https，导致 ERR_SSL_PROTOCOL_ERROR。
+  app.use(
+    helmet({
+      crossOriginResourcePolicy: { policy: 'cross-origin' },
+      contentSecurityPolicy: {
+        useDefaults: true,
+        directives: {
+          'upgrade-insecure-requests': null,
+        },
+      },
+    }),
+  );
 
   // Parse auth cookies (HttpOnly access/refresh tokens). Resolve both the
   // namespace and its `default` interop shape so it works regardless of

apps/api/src/origin-goods/dto/update-origin-good-tags.dto.ts

@@ -0,0 +1,18 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { Type } from 'class-transformer';
+import {
+  ArrayMaxSize,
+  ArrayNotEmpty,
+  IsArray,
+  IsNumber,
+} from 'class-validator';
+
+export class UpdateOriginGoodTagsDto {
+  @ApiProperty({ description: '链接标签 id 全量集合（人工接管）', type: [Number] })
+  @IsArray()
+  @ArrayNotEmpty()
+  @ArrayMaxSize(50)
+  @IsNumber({}, { each: true })
+  @Type(() => Number)
+  tagIds: number[];
+}

apps/api/src/origin-goods/origin-goods.controller.ts

@@ -1,8 +1,9 @@
-import { Controller, Get, Query, UseGuards } from '@nestjs/common';
+import { Body, Controller, Delete, Get, Param, Put, Query, UseGuards } from '@nestjs/common';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { JwtAuthGuard } from '../auth/guards/jwt-auth.guard';
 import { OriginGoodsService } from './origin-goods.service';
 import { QueryOriginGoodDto } from './dto/query-origin-good.dto';
+import { UpdateOriginGoodTagsDto } from './dto/update-origin-good-tags.dto';
 
 @ApiTags('origin-goods')
 @ApiBearerAuth()
@@ -24,4 +25,28 @@ export class OriginGoodsController {
   findAll(@Query() query: QueryOriginGoodDto) {
     return this.service.findAll(query);
   }
+
+  @Get(':id')
+  @ApiOperation({ summary: '单链接详情（detail + variants，成员展开面板用）' })
+  findOne(@Param('id') id: string) {
+    return this.service.findOne(BigInt(id));
+  }
+
+  @Get(':id/tags')
+  @ApiOperation({ summary: '链接当前标签（含 manual 标记）' })
+  getTags(@Param('id') id: string) {
+    return this.service.getTags(BigInt(id));
+  }
+
+  @Put(':id/tags')
+  @ApiOperation({ summary: '人工接管链接标签（全量替换，自动同步不再覆盖）' })
+  updateTags(@Param('id') id: string, @Body() dto: UpdateOriginGoodTagsDto) {
+    return this.service.updateTags(BigInt(id), dto.tagIds);
+  }
+
+  @Delete(':id/tags')
+  @ApiOperation({ summary: '恢复自动派生（清掉人工标签）' })
+  resetTags(@Param('id') id: string) {
+    return this.service.resetTags(BigInt(id));
+  }
 }

apps/api/src/origin-goods/origin-goods.module.ts

@@ -1,8 +1,10 @@
 import { Module } from '@nestjs/common';
 import { OriginGoodsController } from './origin-goods.controller';
 import { OriginGoodsService } from './origin-goods.service';
+import { ProductFamiliesModule } from '../product-families/product-families.module';
 
 @Module({
+  imports: [ProductFamiliesModule],
   controllers: [OriginGoodsController],
   providers: [OriginGoodsService],
 })

apps/api/src/origin-goods/origin-goods.service.spec.ts

@@ -1,18 +1,26 @@
+import { PublicCacheService } from '../public/public-cache.service';
 import { Test } from '@nestjs/testing';
 import { OriginGoodsService } from './origin-goods.service';
+import { FamilyRecomputeService } from '../product-families/family-recompute.service';
+import { ProductFamiliesService } from '../product-families/product-families.service';
+import { OrganizeService } from '../product-families/organize.service';
 import { PrismaService } from '../prisma/prisma.service';
 
 describe('OriginGoodsService', () => {
   let service: OriginGoodsService;
+  let organize: OrganizeService;
+  let families: ProductFamiliesService;
   let prisma: PrismaService;
   const stamp = Date.now();
   const createdSds: string[] = [];
 
   beforeAll(async () => {
     const moduleRef = await Test.createTestingModule({
-      providers: [OriginGoodsService, PrismaService],
+      providers: [OriginGoodsService, FamilyRecomputeService, ProductFamiliesService, OrganizeService, PrismaService, PublicCacheService],
     }).compile();
     service = moduleRef.get(OriginGoodsService);
+    organize = moduleRef.get(OrganizeService);
+    families = moduleRef.get(ProductFamiliesService);
     prisma = moduleRef.get(PrismaService);
     await prisma.onModuleInit();
 
@@ -39,6 +47,20 @@ describe('OriginGoodsService', () => {
     expect(service).toBeDefined();
   });
 
+  it('findOne returns og with detail/variants payload', async () => {
+    const og = await prisma.originGood.findFirstOrThrow({
+      where: { sdsGoodId: `sds-${stamp}-3` },
+    });
+    const result = await service.findOne(og.id);
+    expect(result.id).toBe(og.id.toString());
+    expect(result.sdsGoodId).toBe(`sds-${stamp}-3`);
+    expect(result.variantCount).toBe(0);
+    expect(result.hasDetail).toBe(false);
+    expect(result.detail).toBeNull();
+    expect(result.variants).toEqual([]);
+    await expect(service.findOne(og.id + 10_000_000n)).rejects.toThrow();
+  });
+
   it('returns paginated results', async () => {
     const page1 = await service.findAll({
       page: 1,
@@ -77,4 +99,163 @@ describe('OriginGoodsService', () => {
     expect(result.total).toBe(0);
     expect(result.items.length).toBe(0);
   });
+
+  describe('getTree merged references', () => {
+    /* eslint-disable @typescript-eslint/no-explicit-any */
+    function findOgNode(
+      treeResponse: { tree: any[] },
+      ogId: string,
+    ): { configuredCount: number; configuredCountries: string[] } {
+      let found: { configuredCount: number; configuredCountries: string[] } | null = null;
+      const walk = (nodes: any[]) => {
+        for (const n of nodes) {
+          const hit = (n.originGoods ?? []).find((o: any) => o.id === ogId);
+          if (hit) {
+            found = hit;
+            return;
+          }
+          if (n.children?.length) walk(n.children);
+        }
+      };
+      walk(treeResponse.tree);
+      if (!found) throw new Error(`og node ${ogId} not found in tree`);
+      return found;
+    }
+
+    it('counts secondary references as configured', async () => {
+      const sdsCat = `tree-cat-${stamp}`;
+      await prisma.originGood.createMany({
+        data: [
+          { sdsGoodId: `tree-a-${stamp}`, goodName: `Tree A ${stamp}`, sdsCategoryId: sdsCat },
+          { sdsGoodId: `tree-b-${stamp}`, goodName: `Tree B ${stamp}`, sdsCategoryId: sdsCat },
+        ],
+      });
+      createdSds.push(`tree-a-${stamp}`, `tree-b-${stamp}`);
+      const originA = await prisma.originGood.findUniqueOrThrow({ where: { sdsGoodId: `tree-a-${stamp}` } });
+      const originB = await prisma.originGood.findUniqueOrThrow({ where: { sdsGoodId: `tree-b-${stamp}` } });
+
+      const cat = await prisma.category.create({
+        data: { categoryName: `Tree Cat ${stamp}`, sdsCategoryId: sdsCat },
+      });
+      const country = await prisma.country.create({
+        data: { countryName: `Tree Country ${stamp}` },
+      });
+      const good = await prisma.good.create({
+        data: {
+          goodName: `Tree Good ${stamp}`,
+          originGoodId: originA.id,
+          countryId: country.id,
+          categoryId: cat.id,
+        },
+      });
+      await prisma.goodOriginGood.create({
+        data: { goodId: good.id, originGoodId: originB.id },
+      });
+
+      try {
+        const tree = await service.getTree();
+        const nodeB = findOgNode(tree, originB.id.toString());
+        expect(nodeB.configuredCount).toBeGreaterThanOrEqual(1);
+        expect(nodeB.configuredCountries).toContain(`Tree Country ${stamp}`);
+      } finally {
+        // 先删引用行，否则 good.delete 被外键限制挡住（错误被吞后分类/商品/国家全残留）
+        await prisma.goodOriginGood.deleteMany({ where: { goodId: good.id } }).catch(() => undefined);
+        await prisma.good.delete({ where: { id: good.id } }).catch(() => undefined);
+        await prisma.country.delete({ where: { id: country.id } }).catch(() => undefined);
+        await prisma.category.delete({ where: { id: cat.id } }).catch(() => undefined);
+      }
+    });
+  });
+
+  describe('updateTags：缺啥补啥 + 自动归族', () => {
+    const tagIdByNames = async (names: string[]) => {
+      const rows = await prisma.tag.findMany({ where: { tagName: { in: names } } });
+      return rows.map((r) => r.id);
+    };
+    const tagNamesOf = async (ogId: bigint) => {
+      const rows = await prisma.originGoodTag.findMany({
+        where: { originGoodId: ogId },
+        include: { tag: true },
+      });
+      return rows.map((r) => r.tag.tagName).sort();
+    };
+    let ogFill: any;
+
+    beforeAll(async () => {
+      ogFill = await prisma.originGood.create({
+        data: { sdsGoodId: `ogt-fill-${stamp}`, goodName: '美国（包邮）测试K-OG1-单面印花' },
+      });
+      createdSds.push(ogFill.sdsGoodId);
+      // 派生一次，确保三个维度组的标签字典存在
+      await organize.deriveTagsForOg(ogFill.id);
+    });
+
+    it('缺维度自动补齐：只勾「不包邮」→ 补 单面印花+烫画，全部人工行', async () => {
+      const [nfs] = await tagIdByNames(['不包邮']);
+      const res = await service.updateTags(ogFill.id, [Number(nfs)]);
+      expect(res.tagsManual).toBe(true);
+      expect(res.tags.map((t: any) => t.tagName).sort()).toEqual(
+        ['不包邮', '单面印花', '烫画'].sort(),
+      );
+      expect((res as any).filledDimensionTags?.sort()).toEqual(['单面印花', '烫画'].sort());
+      const rows = await prisma.originGoodTag.findMany({ where: { originGoodId: ogFill.id } });
+      expect(rows.every((r) => r.manual)).toBe(true);
+    });
+
+    it('人工勾齐不补；旧词「热转印」经别名视为工艺维度已齐', async () => {
+      const full = await tagIdByNames(['包邮', '单面印花', '烫画']);
+      const res1 = await service.updateTags(ogFill.id, full.map(Number));
+      expect((res1 as any).filledDimensionTags ?? []).toEqual([]);
+      // 热转印（旧词）满足工艺维度，不再补 烫画
+      const alias = await tagIdByNames(['包邮', '单面印花', '热转印']);
+      // 旧词可能不存在于字典：ensureDerivedTagMap 只建封闭词；此处兜底创建
+      if (alias.length === 3) {
+        const res2 = await service.updateTags(ogFill.id, alias.map(Number));
+        expect((res2 as any).filledDimensionTags ?? []).toEqual([]);
+      } else {
+        const g = await prisma.tagGroup.upsert({
+          where: { groupName: '印刷工艺' },
+          create: { groupName: '印刷工艺' },
+          update: {},
+        });
+        const t = await prisma.tag.upsert({
+          where: { tagName: '热转印' },
+          create: { tagName: '热转印', tagGroupId: g.id },
+          update: {},
+        });
+        const [baoyou, danmian] = await tagIdByNames(['包邮', '单面印花']);
+        const res2 = await service.updateTags(ogFill.id, [Number(baoyou), Number(danmian), Number(t.id)]);
+        expect((res2 as any).filledDimensionTags ?? []).toEqual([]);
+      }
+      expect(await tagNamesOf(ogFill.id)).toEqual(['包邮', '单面印花', '热转印'].sort());
+    });
+
+    it('无族链接保存标签后自动并入匹配族（同分类优先），响应带 attachedFamilyId', async () => {
+      const cat = `cat-ogt-${stamp}`;
+      const a = await prisma.originGood.create({
+        data: { sdsGoodId: `ogt-fam-${stamp}-a`, goodName: '美国（包邮）测试K-OG2-双面印花', sdsCategoryId: cat },
+      });
+      const b = await prisma.originGood.create({
+        data: { sdsGoodId: `ogt-fam-${stamp}-b`, goodName: '美国（不包邮）测试K-OG2-双面印花', sdsCategoryId: cat },
+      });
+      createdSds.push(a.sdsGoodId, b.sdsGoodId);
+      const family = await families.create({
+        familyName: `测试K族${stamp}`,
+        originGoodIds: [a.id.toString()],
+        primaryOriginGoodId: a.id.toString(),
+      });
+      try {
+        await organize.deriveTagsForOg(b.id);
+        const tagIds = (await prisma.originGoodTag.findMany({ where: { originGoodId: b.id } })).map((r) => Number(r.tagId));
+        const res = await service.updateTags(b.id, tagIds);
+        expect((res as any).attachedFamilyId).toBe(String(family.id));
+        const after = await prisma.originGood.findUniqueOrThrow({ where: { id: b.id } });
+        expect(after.familyId).toBe(BigInt(family.id));
+      } finally {
+        await prisma.originGoodTag.deleteMany({ where: { originGoodId: { in: [a.id, b.id] } } }).catch(() => undefined);
+        await prisma.originGood.deleteMany({ where: { id: { in: [a.id, b.id] } } }).catch(() => undefined);
+        await prisma.productFamily.deleteMany({ where: { id: BigInt(family.id) } }).catch(() => undefined);
+      }
+    });
+  });
 });

apps/api/src/origin-goods/origin-goods.service.ts

@@ -1,8 +1,34 @@
-import { Injectable } from '@nestjs/common';
+import {
+  BadRequestException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
 import { Prisma } from '@prisma/client';
 import { PrismaService } from '../prisma/prisma.service';
+import { FamilyRecomputeService } from '../product-families/family-recompute.service';
+import { OrganizeService } from '../product-families/organize.service';
+import { ProductFamiliesService } from '../product-families/product-families.service';
+import { PublicCacheService } from '../public/public-cache.service';
 import { QueryOriginGoodDto } from './dto/query-origin-good.dto';
 
+/** 链接标签（origin_good_tags 行，含人工/派生标记） */
+export interface OriginGoodTagItem {
+  id: string;
+  tagName: string;
+  tagColor: string | null;
+  tagFontColor: string | null;
+  manual: boolean;
+}
+
+export interface OriginGoodTagsResult {
+  tagsManual: boolean;
+  tags: OriginGoodTagItem[];
+  /** 人工勾选缺定价维度时按链接名自动补齐的标签名（缺啥补啥） */
+  filledDimensionTags?: string[];
+  /** 保存时链接无族且自动并入成功的目标族 id */
+  attachedFamilyId?: string;
+}
+
 export interface PaginatedOriginGoods {
   items: Array<{
     id: string;
@@ -12,10 +38,10 @@ export interface PaginatedOriginGoods {
     goodPrice: string | null;
     sdsCategoryId: string | null;
     createdAt: string;
-    updatedAt: string;
+    updatedAt: string;
-    hasDetail: boolean;
+    hasDetail: boolean;
-    detailSyncedAt: string | null;
+    detailSyncedAt: string | null;
-    variantCount: number;
+    variantCount: number;
   }>;
   total: number;
   page: number;
@@ -35,12 +61,16 @@ export interface OriginGoodsTreeNode {
   delisted: boolean;
   configuredCount: number;
   configuredCountries: string[];
-  configuredTags: { tagName: string; tagColor: string | null; tagFontColor: string | null; tagGroupId: string | null; tagGroupName: string | null; sortOrder: number }[];
+  configuredTags: { tagName: string; tagColor: string | null; tagFontColor: string | null; tagGroupId: string | null; tagGroupName: string | null; sortOrder: number }[];
-  hasDetail: boolean;
+  hasDetail: boolean;
-  detailSyncedAt: string | null;
+  detailSyncedAt: string | null;
-  variantCount: number;
+  variantCount: number;
-  sizeRowCount: number;
+  sizeRowCount: number;
-  packageRowCount: number;
+  packageRowCount: number;
+  familyId: string | null;
+  familyName: string | null;
+  familyCode: string | null;
+  familyStale: boolean | null;
 }
 
 /** A category node in the hierarchical tree, with origin goods as leaves. */
@@ -63,23 +93,191 @@ export interface OriginGoodsTreeResponse {
 
 @Injectable()
 export class OriginGoodsService {
-  constructor(private readonly prisma: PrismaService) {}
+  constructor(
+    private readonly prisma: PrismaService,
+    private readonly familyRecompute: FamilyRecomputeService,
+    private readonly organize: OrganizeService,
+    private readonly families: ProductFamiliesService,
+    private readonly publicCache: PublicCacheService,
+  ) {}
+
+  /** 链接当前标签（含 manual 标记） */
+  async getTags(id: bigint): Promise<OriginGoodTagsResult> {
+    const og = await this.prisma.originGood.findUnique({
+      where: { id },
+      include: {
+        originGoodTags: {
+          include: {
+            tag: { select: { id: true, tagName: true, tagColor: true, tagFontColor: true } },
+          },
+          orderBy: { tagId: 'asc' },
+        },
+      },
+    });
+    if (!og) throw new NotFoundException(`Origin good ${id} not found`);
+    return {
+      tagsManual: og.tagsManual,
+      tags: og.originGoodTags.map((r) => ({
+        id: r.tag.id.toString(),
+        tagName: r.tag.tagName,
+        tagColor: r.tag.tagColor,
+        tagFontColor: r.tag.tagFontColor,
+        manual: r.manual,
+      })),
+    };
+  }
+
+  /**
+   * 人工接管链接标签：人工勾选全量保存为 manual 行（自动同步永不覆盖）；
+   * 三个定价维度组（印花数量/工艺/物流）缺哪组按链接名自动补哪组（缺啥补啥），
+   * 保证链接 SKU 不掉出族价格矩阵；未归族链接随后自动并入匹配族。
+   */
+  async updateTags(id: bigint, tagIds: number[]): Promise<OriginGoodTagsResult> {
+    const og = await this.prisma.originGood.findUnique({
+      where: { id },
+      select: { id: true, goodName: true, source: true },
+    });
+    if (!og) throw new NotFoundException(`Origin good ${id} not found`);
+    let uniqueIds = [...new Set(tagIds.map((v) => BigInt(v)))].sort((a, b) =>
+      Number(a - b),
+    );
+    if (uniqueIds.length) {
+      const count = await this.prisma.tag.count({ where: { id: { in: uniqueIds } } });
+      if (count !== uniqueIds.length) {
+        throw new BadRequestException('存在无效标签');
+      }
+    }
+    // CUSTOM 成员的归因走管理员显式 craftLabel/logisticsLabel，名称不解析、不补齐
+    const fill =
+      og.source === 'SDS'
+        ? await this.organize.fillMissingDimTags(og.goodName, uniqueIds)
+        : { tagIds: [] as bigint[], names: [] as string[] };
+    if (fill.tagIds.length) {
+      uniqueIds = [...new Set([...uniqueIds, ...fill.tagIds])].sort((a, b) =>
+        Number(a - b),
+      );
+    }
+    await this.prisma.$transaction([
+      this.prisma.originGoodTag.deleteMany({ where: { originGoodId: id } }),
+      ...(!uniqueIds.length
+        ? []
+        : [
+            this.prisma.originGoodTag.createMany({
+              data: uniqueIds.map((tagId) => ({
+                originGoodId: id,
+                tagId,
+                manual: true,
+              })),
+            }),
+          ]),
+      this.prisma.originGood.update({ where: { id }, data: { tagsManual: true } }),
+    ]);
+    await this.familyRecompute.mirrorLinkTagsToGoods(id);
+    // 标签镜像改变 good_tags（meta 域的标签组过滤）；无族链接挂靠失败时
+    // 后续 recompute 不会执行，此处显式 bump 兜住全部路径（含 matrix 归因）
+    this.publicCache.bump('meta', 'goods', 'matrix');
+    // 人工改标签 → 归因维度可能变化，自动重算族矩阵（有族才重算）
+    const ogFull = await this.prisma.originGood.findUnique({
+      where: { id },
+      select: { familyId: true },
+    });
+    let attachedFamilyId: string | undefined;
+    if (ogFull?.familyId) {
+      await this.familyRecompute.recomputeFamily(ogFull.familyId);
+    } else {
+      // 无族链接：自动并入匹配的同款族（同 SDS 分类优先，回退族语义名称键）
+      const fid = await this.families.attachToMatchingFamily(id);
+      if (fid) attachedFamilyId = fid.toString();
+    }
+    const base = await this.getTags(id);
+    return {
+      ...base,
+      filledDimensionTags: fill.names,
+      ...(attachedFamilyId ? { attachedFamilyId } : {}),
+    };
+  }
+
+  /** 恢复自动：清掉全部标签行（含人工行），按链接名称重新派生（显式人工动作） */
+  async resetTags(id: bigint): Promise<OriginGoodTagsResult> {
+    const og = await this.prisma.originGood.findUnique({
+      where: { id },
+      select: { id: true, familyId: true },
+    });
+    if (!og) throw new NotFoundException(`Origin good ${id} not found`);
+    await this.prisma.$transaction([
+      this.prisma.originGoodTag.deleteMany({ where: { originGoodId: id } }),
+      this.prisma.originGood.update({ where: { id }, data: { tagsManual: false } }),
+    ]);
+    // 派生集中在整理服务（解析去运行时化）；「恢复自动」本身是显式人工动作
+    await this.organize.deriveTagsForOg(id);
+    this.publicCache.bump('meta', 'goods', 'matrix');
+    if (og.familyId) await this.familyRecompute.recomputeFamily(og.familyId);
+    return this.getTags(id);
+  }
+
+  /** 单链接详情（含 detail 与 variants，成员展开面板用） */
+  async findOne(id: bigint) {
+    const og = await this.prisma.originGood.findUnique({
+      where: { id },
+      include: {
+        detail: true,
+        variants: { orderBy: [{ sortOrder: 'asc' }, { id: 'asc' }] },
+        _count: { select: { variants: true } },
+      },
+    });
+    if (!og) throw new NotFoundException(`Origin good ${id} not found`);
+    const detail = og.detail;
+    return {
+      id: og.id.toString(),
+      sdsGoodId: og.sdsGoodId,
+      goodName: og.goodName,
+      goodImage: og.goodImage,
+      goodPrice: og.goodPrice === null || og.goodPrice === undefined ? null : og.goodPrice.toString(),
+      source: og.source,
+      delisted: og.delisted,
+      hasDetail: Boolean(detail),
+      detailSyncedAt: detail?.syncedAt.toISOString() ?? null,
+      variantCount: og._count.variants,
+      detail: detail
+        ? {
+            productCode: detail.productCode,
+            englishName: detail.englishName,
+            productionCycleHours: detail.productionCycleHours,
+            minWeightG: detail.minWeightG === null ? null : detail.minWeightG.toString(),
+            productionProcess: detail.productionProcess,
+            materialDescription: detail.materialDescription,
+            sizeChart: (detail.sizeChart ?? null) as unknown,
+            packageSpecs: (detail.packageSpecs ?? null) as unknown,
+          }
+        : null,
+      variants: og.variants.map((v) => ({
+        sdsVariantId: v.sdsVariantId,
+        sku: v.sku,
+        sizeId: v.sizeId,
+        sizeName: v.sizeName,
+        colorId: v.colorId,
+        colorName: v.colorName,
+        price: v.price === null ? null : v.price.toString(),
+        enabled: v.enabled,
+      })),
+    };
+  }
 
   async findAll(query: QueryOriginGoodDto): Promise<PaginatedOriginGoods> {
     const { page, pageSize, keyword } = query;
-    const where: Prisma.OriginGoodWhereInput = {
+    const where: Prisma.OriginGoodWhereInput = {
-      source: 'SDS',
+      source: 'SDS',
-      ...(keyword
+      ...(keyword
-        ? { goodName: { contains: keyword, mode: 'insensitive' as const } }
+        ? { goodName: { contains: keyword, mode: 'insensitive' as const } }
-        : {}),
+        : {}),
-    };
+    };
 
     const [total, rows] = await this.prisma.$transaction([
       this.prisma.originGood.count({ where }),
-      this.prisma.originGood.findMany({
+      this.prisma.originGood.findMany({
-        where,
+        where,
-        orderBy: { id: 'desc' },
+        orderBy: { id: 'desc' },
-        include: { detail: true, _count: { select: { variants: true } } },
+        include: { detail: true, _count: { select: { variants: true } } },
         skip: (page - 1) * pageSize,
         take: pageSize,
       }),
@@ -94,10 +292,10 @@ export class OriginGoodsService {
         goodPrice: r.goodPrice === null || r.goodPrice === undefined ? null : r.goodPrice.toString(),
         sdsCategoryId: r.sdsCategoryId,
         createdAt: r.createdAt.toISOString(),
-        updatedAt: r.updatedAt.toISOString(),
+        updatedAt: r.updatedAt.toISOString(),
-        hasDetail: Boolean(r.detail),
+        hasDetail: Boolean(r.detail),
-        detailSyncedAt: r.detail?.syncedAt.toISOString() ?? null,
+        detailSyncedAt: r.detail?.syncedAt.toISOString() ?? null,
-        variantCount: r._count.variants,
+        variantCount: r._count.variants,
       })),
       total,
       page,
@@ -114,7 +312,7 @@ export class OriginGoodsService {
    * under a synthetic "未分类" root node.
    */
   async getTree(): Promise<OriginGoodsTreeResponse> {
-    const [allCategories, allOriginGoods, configCounts, goodsWithCountries, goodsWithTags] =
+    const [allCategories, allOriginGoods, configCounts, goodsWithCountries, goodsWithTags, mergedCounts, mergedWithCountries] =
       await Promise.all([
         this.prisma.category.findMany({
           where: { sdsCategoryId: { not: null } },
@@ -126,11 +324,15 @@ export class OriginGoodsService {
             parentCategoryId: true,
           },
         }),
-        this.prisma.originGood.findMany({
+        this.prisma.originGood.findMany({
-          where: { delisted: false, source: 'SDS' },
+          where: { delisted: false, source: 'SDS' },
-          orderBy: { goodName: 'asc' },
+          orderBy: { goodName: 'asc' },
-          include: { detail: true, _count: { select: { variants: true } } },
+          include: {
-        }),
+            detail: true,
+            _count: { select: { variants: true } },
+            family: { select: { id: true, familyName: true, familyCode: true, stale: true } },
+          },
+        }),
         this.prisma.good.groupBy({
           by: ['originGoodId'],
           _count: { _all: true },
@@ -144,7 +346,12 @@ export class OriginGoodsService {
         }),
         this.prisma.goodTag.findMany({
           select: {
-            good: { select: { originGoodId: true } },
+            good: {
+              select: {
+                originGoodId: true,
+                mergedOriginGoods: { select: { originGoodId: true } },
+              },
+            },
             tag: {
               select: {
                 tagName: true,
@@ -157,26 +364,57 @@ export class OriginGoodsService {
             },
           },
         }),
+        // Secondary-source references (good_origin_goods)
+        this.prisma.goodOriginGood.groupBy({
+          by: ['originGoodId'],
+          _count: { _all: true },
+        }),
+        this.prisma.goodOriginGood.findMany({
+          select: {
+            originGoodId: true,
+            good: { select: { country: { select: { countryName: true } } } },
+          },
+        }),
       ]);
 
     const countMap = new Map<string, number>();
     configCounts.forEach((c) =>
       countMap.set(c.originGoodId.toString(), c._count._all),
     );
-
+    // Secondary (merged) references count towards configured status too.
-    const countryMap = new Map<string, string[]>();
+    mergedCounts.forEach((c) => {
-    goodsWithCountries.forEach((g) => {
+      const key = c.originGoodId.toString();
-      const key = g.originGoodId.toString();
+      countMap.set(key, (countMap.get(key) ?? 0) + c._count._all);
-      const name = g.country?.countryName;
-      if (!name) return;
-      const arr = countryMap.get(key);
-      if (arr) arr.push(name);
-      else countryMap.set(key, [name]);
     });
 
+    const countryMap = new Map<string, string[]>();
+    const addCountry = (key: string, name?: string | null) => {
+      if (!name) return;
+      const arr = countryMap.get(key);
+      if (!arr?.includes(name)) {
+        countryMap.set(key, [...(arr ?? []), name]);
+      }
+    };
+    goodsWithCountries.forEach((g) =>
+      addCountry(g.originGoodId.toString(), g.country?.countryName),
+    );
+    mergedWithCountries.forEach((m) =>
+      addCountry(m.originGoodId.toString(), m.good.country?.countryName),
+    );
+
     const tagMap = new Map<string, { tagName: string; tagColor: string | null; tagFontColor: string | null; tagGroupId: string | null; tagGroupName: string | null; sortOrder: number }[]>();
+    const addTag = (
+      key: string,
+      tagInfo: { tagName: string; tagColor: string | null; tagFontColor: string | null; tagGroupId: string | null; tagGroupName: string | null; sortOrder: number },
+    ) => {
+      const arr = tagMap.get(key);
+      if (arr) {
+        if (!arr.some((t) => t.tagName === tagInfo.tagName)) arr.push(tagInfo);
+      } else {
+        tagMap.set(key, [tagInfo]);
+      }
+    };
     goodsWithTags.forEach((gt) => {
-      const key = gt.good.originGoodId.toString();
       const tagInfo = {
         tagName: gt.tag.tagName,
         tagColor: gt.tag.tagColor,
@@ -185,11 +423,10 @@ export class OriginGoodsService {
         tagGroupName: gt.tag.tagGroup?.groupName ?? null,
         sortOrder: gt.tag.sortOrder,
       };
-      const arr = tagMap.get(key);
+      addTag(gt.good.originGoodId.toString(), tagInfo);
-      if (arr) {
+      // A good's tags also mark its secondary origin goods as configured.
-        if (!arr.some((t) => t.tagName === tagInfo.tagName)) arr.push(tagInfo);
+      for (const m of gt.good.mergedOriginGoods) {
-      } else {
+        addTag(m.originGoodId.toString(), tagInfo);
-        tagMap.set(key, [tagInfo]);
       }
     });
 
@@ -230,12 +467,16 @@ export class OriginGoodsService {
         delisted: og.delisted,
         configuredCount: countMap.get(og.id.toString()) ?? 0,
         configuredCountries: countryMap.get(og.id.toString()) ?? [],
-        configuredTags: tagMap.get(og.id.toString()) ?? [],
+        configuredTags: tagMap.get(og.id.toString()) ?? [],
-        hasDetail: Boolean(og.detail),
+        hasDetail: Boolean(og.detail),
-        detailSyncedAt: og.detail?.syncedAt.toISOString() ?? null,
+        detailSyncedAt: og.detail?.syncedAt.toISOString() ?? null,
-        variantCount: og._count.variants,
+        variantCount: og._count.variants,
-        sizeRowCount: this.jsonRows(og.detail?.sizeChart),
+        sizeRowCount: this.jsonRows(og.detail?.sizeChart),
-        packageRowCount: this.jsonRows(og.detail?.packageSpecs),
+        packageRowCount: this.jsonRows(og.detail?.packageSpecs),
+        familyId: og.family?.id.toString() ?? null,
+        familyName: og.family?.familyName ?? null,
+        familyCode: og.family?.familyCode ?? null,
+        familyStale: og.family?.stale ?? null,
       }));
 
       const childTotal = childNodes.reduce((s, n) => s + n.totalCount, 0);
@@ -281,12 +522,16 @@ export class OriginGoodsService {
           delisted: og.delisted,
           configuredCount: countMap.get(og.id.toString()) ?? 0,
           configuredCountries: countryMap.get(og.id.toString()) ?? [],
-          configuredTags: tagMap.get(og.id.toString()) ?? [],
+          configuredTags: tagMap.get(og.id.toString()) ?? [],
-          hasDetail: Boolean(og.detail),
+          hasDetail: Boolean(og.detail),
-          detailSyncedAt: og.detail?.syncedAt.toISOString() ?? null,
+          detailSyncedAt: og.detail?.syncedAt.toISOString() ?? null,
-          variantCount: og._count.variants,
+          variantCount: og._count.variants,
-          sizeRowCount: this.jsonRows(og.detail?.sizeChart),
+          sizeRowCount: this.jsonRows(og.detail?.sizeChart),
-          packageRowCount: this.jsonRows(og.detail?.packageSpecs),
+          packageRowCount: this.jsonRows(og.detail?.packageSpecs),
+          familyId: og.family?.id.toString() ?? null,
+          familyName: og.family?.familyName ?? null,
+          familyCode: og.family?.familyCode ?? null,
+          familyStale: og.family?.stale ?? null,
         })),
       });
     }
@@ -297,16 +542,16 @@ export class OriginGoodsService {
       (og) => (countMap.get(og.id.toString()) ?? 0) > 0,
     ).length;
 
-    return {
+    return {
       tree,
       totalOriginGoods: allOriginGoods.length,
       configuredCount: totalConfigured,
-    };
+    };
-  }
+  }
-
+
-  private jsonRows(value: unknown): number {
+  private jsonRows(value: unknown): number {
-    if (!value || typeof value !== 'object' || !('rows' in value)) return 0;
+    if (!value || typeof value !== 'object' || !('rows' in value)) return 0;
-    const rows = (value as { rows?: unknown }).rows;
+    const rows = (value as { rows?: unknown }).rows;
-    return Array.isArray(rows) ? rows.length : 0;
+    return Array.isArray(rows) ? rows.length : 0;
-  }
+  }
-}
+}

apps/api/src/positions/positions.service.spec.ts

@@ -1,3 +1,4 @@
+import { PublicCacheService } from '../public/public-cache.service';
 import { Test } from '@nestjs/testing';
 import { NotFoundException } from '@nestjs/common';
 import { PositionsService } from './positions.service';
@@ -12,7 +13,7 @@ describe('PositionsService', () => {
 
   beforeAll(async () => {
     const moduleRef = await Test.createTestingModule({
-      providers: [PositionsService, PrismaService],
+      providers: [PositionsService, PrismaService, PublicCacheService],
     }).compile();
     service = moduleRef.get(PositionsService);
     prisma = moduleRef.get(PrismaService);

apps/api/src/positions/positions.service.ts

@@ -3,12 +3,16 @@ import {
   NotFoundException,
 } from '@nestjs/common';
 import { PrismaService } from '../prisma/prisma.service';
+import { PublicCacheService } from '../public/public-cache.service';
 import { CreatePositionDto } from './dto/create-position.dto';
 import { UpdatePositionDto } from './dto/update-position.dto';
 
 @Injectable()
 export class PositionsService {
-  constructor(private readonly prisma: PrismaService) {}
+  constructor(
+    private readonly prisma: PrismaService,
+    private readonly publicCache: PublicCacheService,
+  ) {}
 
   findAll(filters?: { countryId?: bigint; categoryId?: bigint }) {
     const where: { countryId?: bigint; categoryId?: bigint } = {};
@@ -37,7 +41,7 @@ export class PositionsService {
     if (dto.categoryId !== undefined) {
       await this.ensureCategory(dto.categoryId);
     }
-    return this.prisma.position.create({
+    const created = await this.prisma.position.create({
       data: {
         indexVal: dto.indexVal,
         countryId: dto.countryId === undefined ? null : BigInt(dto.countryId),
@@ -45,6 +49,8 @@ export class PositionsService {
       },
       include: { country: true, category: true },
     });
+    this.publicCache.bump('goods');
+    return created;
   }
 
   async update(id: bigint, dto: UpdatePositionDto) {
@@ -55,7 +61,7 @@ export class PositionsService {
     if (dto.categoryId !== undefined && dto.categoryId !== null) {
       await this.ensureCategory(dto.categoryId);
     }
-    return this.prisma.position.update({
+    const updated = await this.prisma.position.update({
       where: { id },
       data: {
         indexVal: dto.indexVal,
@@ -74,11 +80,15 @@ export class PositionsService {
       },
       include: { country: true, category: true },
     });
+    this.publicCache.bump('goods');
+    return updated;
   }
 
   async remove(id: bigint) {
     await this.findOne(id);
-    return this.prisma.position.delete({ where: { id } });
+    const removed = await this.prisma.position.delete({ where: { id } });
+    this.publicCache.bump('goods');
+    return removed;
   }
 
   private async ensureCountry(id: number) {

apps/api/src/product-families/auto-tag-rules.spec.ts

@@ -0,0 +1,75 @@
+import { deriveLinkTagNames, isAutoTagGroupName } from './auto-tag-rules';
+
+describe('auto-tag-rules / deriveLinkTagNames', () => {
+  it('单面印花 + 包邮 + 无工艺关键字 → 单面印花/烫画/包邮', () => {
+    expect(
+      deriveLinkTagNames('美国（包邮）180g纯棉T恤成人款-DG001-单面印花'),
+    ).toEqual(['单面印花', '烫画', '包邮']);
+  });
+
+  it('双面印花 + 不包邮 → 双面印花/烫画/不包邮', () => {
+    expect(
+      deriveLinkTagNames('美国（不包邮）180g纯棉T恤成人款-DG001-双面印花·美东新泽西仓'),
+    ).toEqual(['双面印花', '烫画', '不包邮']);
+  });
+
+  it('工艺段写法「直喷双面/直喷单面」→ 裸 双面/单面 也归入印花数量', () => {
+    expect(
+      deriveLinkTagNames('日本（包邮）200g纯棉T恤-JPTM001-直喷双面'),
+    ).toEqual(['双面印花', '直喷', '包邮']);
+    expect(
+      deriveLinkTagNames('日本（包邮）200g纯棉T恤-JPTM001-直喷单面'),
+    ).toEqual(['单面印花', '直喷', '包邮']);
+  });
+
+  it('不打印 + 光板（物流备注）+ 不包邮 → 归并为单个 不打印 工艺标签（光板即不打印）', () => {
+    expect(
+      deriveLinkTagNames('美国（不包邮光板）180GT恤成人款-JSA002-不打印·美西洛杉矶二仓'),
+    ).toEqual(['不打印', '不包邮']);
+  });
+
+  it('仅光板（无不打印字样）同样归为 不打印', () => {
+    expect(deriveLinkTagNames('美国（包邮光板）T恤-DG001')).toEqual(['不打印', '包邮']);
+  });
+
+  it('直喷命中时不给默认烫画；名称未写单/双面时印花数量默认单面印花', () => {
+    expect(deriveLinkTagNames('美国（包邮）卫衣-DG002-直喷')).toEqual(['单面印花', '直喷', '包邮']);
+  });
+
+  it('不打印/光板（无印花面）不补默认印花数量', () => {
+    expect(deriveLinkTagNames('美国（不包邮光板）T恤-DG001-不打印')).toEqual(['不打印', '不包邮']);
+  });
+
+  it('物流备注既无包邮也无不包邮时不下发物流标签', () => {
+    const names = deriveLinkTagNames('美国（快递）卫衣-DG002-单面印花');
+    expect(names).toContain('单面印花');
+    expect(names).toContain('烫画');
+    expect(names).not.toContain('包邮');
+    expect(names).not.toContain('不包邮');
+  });
+
+  it('空名称返回空数组', () => {
+    expect(deriveLinkTagNames(null)).toEqual([]);
+    expect(deriveLinkTagNames('')).toEqual([]);
+  });
+
+  it('先判「不包邮」再判「包邮」，避免子串误命中', () => {
+    const names = deriveLinkTagNames('美国（不包邮）T恤-DG001-单面印花');
+    expect(names).toContain('不包邮');
+    expect(names).not.toContain('包邮');
+  });
+});
+
+describe('auto-tag-rules / isAutoTagGroupName', () => {
+  it('命中真实派生组：物流渠道 / 印刷工艺 / 印花数量 / 印刷位置', () => {
+    expect(isAutoTagGroupName('物流渠道')).toBe(true);
+    expect(isAutoTagGroupName('印刷工艺')).toBe(true);
+    expect(isAutoTagGroupName('印花数量')).toBe(true);
+    expect(isAutoTagGroupName('印刷位置')).toBe(true);
+  });
+
+  it('其他分组不视为自动组', () => {
+    expect(isAutoTagGroupName('潮流')).toBe(false);
+    expect(isAutoTagGroupName('场景')).toBe(false);
+  });
+});

apps/api/src/product-families/auto-tag-rules.ts

@@ -0,0 +1,80 @@
+/**
+ * 链接标签自动派生规则（产品确认版，2026-08-28）：
+ *
+ * 标签与「产品链接」一一对应 —— 每条链接因 印花数量/工艺/物流 不同而价格不同
+ * （价格矩阵维度 = 印花数量·工艺 × 物流 × 尺码 × 颜色），因此标签按链接名称解析：
+ *
+ * - 印花数量：名称含「双面印花」→ 双面印花；否则含「单面印花」→ 单面印花；
+ * - 工艺：名称含「直喷」「不打印」「光板」→ 对应标签（可多个）；都不含 → 默认「烫画」；
+ * - 物流：名称含「不包邮」→ 不包邮；否则含「包邮」→ 包邮（先判「不包邮」，避免子串误命中）。
+ *
+ * 这些分组（印花数量 / 印刷工艺 / 物流渠道）下的标签为派生数据，不接受手动写入；
+ * 其他分组保持人工管理。
+ */
+
+/** 自动（派生）标签组名匹配：命中即视为族托管，手输的这类标签会被剔除 */
+export function isAutoTagGroupName(name: string): boolean {
+  return /物流|工艺|位置|印花数量/.test(name);
+}
+
+/**
+ * 工艺旧词 → 封闭词表别名：人工标签历史上建过「热转印」（= 烫画，热转印工艺），
+ * 归一后才能进价格矩阵 —— 别名只影响矩阵归因，不改标签字典本身。
+ */
+export const CRAFT_TAG_ALIASES: Record<string, string> = {
+  热转印: '烫画',
+};
+
+export function normalizeCraftTag(name: string): string {
+  return CRAFT_TAG_ALIASES[name] ?? name;
+}
+
+export interface DerivedTagGroupSpec {
+  /** 标签组名（查找用 includes 匹配，缺失时自动建组） */
+  group: string;
+  /** 组内规则标签（缺失时自动建标） */
+  tags: string[];
+}
+
+/** 派生标签所属组及其全部合法取值（光板 = 不打印，不单独设标签） */
+export const DERIVED_TAG_GROUP_SPECS: DerivedTagGroupSpec[] = [
+  { group: '物流渠道', tags: ['包邮', '不包邮'] },
+  { group: '印花数量', tags: ['单面印花', '双面印花'] },
+  { group: '印刷工艺', tags: ['烫画', '直喷', '不打印'] },
+];
+
+/** 工艺关键字 → 标签名（光板即为不打印） */
+const CRAFT_KEYWORD_MAP: Record<string, string> = {
+  直喷: '直喷',
+  不打印: '不打印',
+  光板: '不打印',
+};
+const CRAFT_DEFAULT = '烫画';
+
+/**
+ * 由链接名称解析标签名集合（不含组信息）。
+ * 确定性、纯函数 —— 同名链接在任何环境派生结果一致。
+ */
+export function deriveLinkTagNames(name: string | null | undefined): string[] {
+  if (!name) return [];
+  const names: string[] = [];
+
+  // 「双面印花/单面印花」显式命中，或工艺段写作「直喷双面/直喷单面」的裸「双面/单面」；
+  // 双面优先判断，避免「单面」误吞。名称完全没写且工艺非「不打印」时默认单面印花
+  // （解析假设集中在整理脚本层，可审查可重跑；不打印/光板 无印花面，不补）
+  const craftTags = new Set<string>();
+  for (const [keyword, tagName] of Object.entries(CRAFT_KEYWORD_MAP)) {
+    if (name.includes(keyword)) craftTags.add(tagName);
+  }
+  const noPrint = craftTags.has('不打印');
+  if (name.includes('双面')) names.push('双面印花');
+  else if (name.includes('单面')) names.push('单面印花');
+  else if (!noPrint) names.push('单面印花');
+  if (craftTags.size > 0) names.push(...craftTags);
+  else names.push(CRAFT_DEFAULT);
+
+  if (name.includes('不包邮')) names.push('不包邮');
+  else if (name.includes('包邮')) names.push('包邮');
+
+  return names;
+}

apps/api/src/product-families/dto/product-family.dto.ts

@@ -0,0 +1,280 @@
+import { ApiProperty, PartialType } from '@nestjs/swagger';
+import { Type } from 'class-transformer';
+import {
+  IsArray,
+  IsBoolean,
+  IsNotEmpty,
+  IsNumber,
+  IsNumberString,
+  IsObject,
+  IsOptional,
+  IsString,
+  MaxLength,
+  Min,
+  ValidateNested,
+} from 'class-validator';
+
+export class CreateProductFamilyDto {
+  @ApiProperty({ example: '180g纯棉T恤（成人款）' })
+  @IsString()
+  @IsNotEmpty()
+  @MaxLength(200)
+  familyName!: string;
+
+  @ApiProperty({ required: false, example: 'DG001' })
+  @IsOptional()
+  @IsString()
+  @MaxLength(100)
+  familyCode?: string;
+
+  @ApiProperty({ required: false, nullable: true })
+  @IsOptional()
+  @IsString()
+  familyImage?: string | null;
+
+  @ApiProperty({ required: false, example: '1' })
+  @IsOptional()
+  @IsNumberString()
+  countryId?: string;
+
+  @ApiProperty({ required: false, example: '2' })
+  @IsOptional()
+  @IsNumberString()
+  categoryId?: string;
+
+  @ApiProperty({
+    required: false,
+    description: '主链接 origin_good_id（canonical 详情与跳转兜底）',
+    example: '123',
+  })
+  @IsOptional()
+  @IsNumberString()
+  primaryOriginGoodId?: string;
+
+  @ApiProperty({ required: false, type: [String], example: ['123', '124'] })
+  @IsOptional()
+  @IsArray()
+  @IsNumberString({}, { each: true })
+  originGoodIds?: string[];
+}
+
+export class PatchProductFamilyDto extends PartialType(CreateProductFamilyDto) {
+  @ApiProperty({ required: false, description: 'false = 人工锁定，重算只置 stale' })
+  @IsOptional()
+  @IsBoolean()
+  autoManaged?: boolean;
+}
+
+export class QueryProductFamilyDto {
+  @ApiProperty({ required: false, description: '匹配 familyName / familyCode' })
+  @IsOptional()
+  @IsString()
+  keyword?: string;
+
+  @ApiProperty({ required: false, default: 1 })
+  @IsOptional()
+  @Type(() => Number)
+  @IsNumber()
+  @Min(1)
+  page?: number;
+
+  @ApiProperty({ required: false, default: 20 })
+  @IsOptional()
+  @Type(() => Number)
+  @IsNumber()
+  @Min(1)
+  pageSize?: number;
+}
+
+export class AutoGroupDto {
+  @ApiProperty({ required: false, default: false, description: 'true = 实际建族' })
+  @IsOptional()
+  @IsBoolean()
+  apply?: boolean;
+}
+
+export class UpdateFamilyMembersDto {
+  @ApiProperty({ required: false, type: [String] })
+  @IsOptional()
+  @IsArray()
+  @IsNumberString({}, { each: true })
+  addOriginGoodIds?: string[];
+
+  @ApiProperty({ required: false, type: [String] })
+  @IsOptional()
+  @IsArray()
+  @IsNumberString({}, { each: true })
+  removeOriginGoodIds?: string[];
+}
+
+export class CustomMemberVariantDto {
+  @ApiProperty()
+  @IsString()
+  @IsNotEmpty()
+  sku!: string;
+
+  @ApiProperty({ required: false, nullable: true })
+  @IsOptional()
+  @IsString()
+  sizeId?: string | null;
+
+  @ApiProperty({ required: false, nullable: true })
+  @IsOptional()
+  @IsString()
+  sizeName?: string | null;
+
+  @ApiProperty({ required: false, nullable: true })
+  @IsOptional()
+  @IsString()
+  colorId?: string | null;
+
+  @ApiProperty({ required: false, nullable: true })
+  @IsOptional()
+  @IsString()
+  colorName?: string | null;
+
+  @ApiProperty({ required: false, nullable: true })
+  @IsOptional()
+  @IsString()
+  colorHex?: string | null;
+
+  @ApiProperty({ required: false, nullable: true })
+  @IsOptional()
+  @IsString()
+  imageUrl?: string | null;
+
+  @ApiProperty({ example: '28.00' })
+  @IsNumber()
+  @Min(0.01)
+  price!: number;
+}
+
+export class CreateCustomMemberDto {
+  @ApiProperty({ example: '美国（包邮）180g纯棉T恤-DG001-双面印花（自建）' })
+  @IsString()
+  @IsNotEmpty()
+  @MaxLength(300)
+  goodName!: string;
+
+  @ApiProperty({ required: false, nullable: true })
+  @IsOptional()
+  @IsString()
+  goodImage?: string | null;
+
+  @ApiProperty({ description: '物流归因（价格矩阵维度，必填）', example: '包邮' })
+  @IsString()
+  @IsNotEmpty()
+  @MaxLength(100)
+  logisticsLabel!: string;
+
+  @ApiProperty({ description: '工艺/印花数量归因（价格矩阵维度，必填）', example: '双面印花' })
+  @IsString()
+  @IsNotEmpty()
+  @MaxLength(100)
+  craftLabel!: string;
+
+  @ApiProperty({ required: false })
+  @IsOptional()
+  @IsString()
+  skuCode?: string;
+
+  @ApiProperty({ required: false })
+  @IsOptional()
+  @IsString()
+  warehouseLabel?: string;
+
+  @ApiProperty({ type: [CustomMemberVariantDto], minItems: 1 })
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => CustomMemberVariantDto)
+  variants!: CustomMemberVariantDto[];
+
+  @ApiProperty({
+    required: false,
+    type: Object,
+    description: '可选人工详情（尺码表/包装规则参与并集）',
+  })
+  @IsOptional()
+  @IsObject()
+  detail?: { sizeChart?: Record<string, unknown>; packageSpecs?: Record<string, unknown> };
+}
+
+export class PriceOverrideItemDto {
+  @ApiProperty({ example: 'size_S' })
+  @IsString()
+  @IsNotEmpty()
+  sizeId!: string;
+
+  @ApiProperty({ example: 'color_blk' })
+  @IsString()
+  @IsNotEmpty()
+  colorId!: string;
+
+  @ApiProperty({ example: '单面印花', description: '印花数量维：单面印花 / 双面印花' })
+  @IsString()
+  @IsNotEmpty()
+  printCount!: string;
+
+  @ApiProperty({ example: '烫画', description: '工艺维：烫画 / 直喷 / 不打印' })
+  @IsString()
+  @IsNotEmpty()
+  craft!: string;
+
+  @ApiProperty({ example: '包邮' })
+  @IsString()
+  @IsNotEmpty()
+  logistics!: string;
+
+  @ApiProperty({ example: '23.00' })
+  @IsNumber()
+  @Min(0.01)
+  price!: number;
+
+  @ApiProperty({ required: false, description: '改价原因（审计）' })
+  @IsOptional()
+  @IsString()
+  note?: string;
+}
+
+export class PutPriceOverridesDto {
+  @ApiProperty({ type: [PriceOverrideItemDto] })
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => PriceOverrideItemDto)
+  items!: PriceOverrideItemDto[];
+}
+
+export class PriceOverrideCellDto {
+  @ApiProperty({ example: 'size_S' })
+  @IsString()
+  @IsNotEmpty()
+  sizeId!: string;
+
+  @ApiProperty({ example: 'color_blk' })
+  @IsString()
+  @IsNotEmpty()
+  colorId!: string;
+
+  @ApiProperty({ example: '单面印花', description: '印花数量维：单面印花 / 双面印花' })
+  @IsString()
+  @IsNotEmpty()
+  printCount!: string;
+
+  @ApiProperty({ example: '烫画', description: '工艺维：烫画 / 直喷 / 不打印' })
+  @IsString()
+  @IsNotEmpty()
+  craft!: string;
+
+  @ApiProperty({ example: '包邮' })
+  @IsString()
+  @IsNotEmpty()
+  logistics!: string;
+}
+
+export class DeletePriceOverridesDto {
+  @ApiProperty({ type: [PriceOverrideCellDto] })
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => PriceOverrideCellDto)
+  cells!: PriceOverrideCellDto[];
+}

apps/api/src/product-families/family-recompute.service.spec.ts

@@ -0,0 +1,503 @@
+import { PublicCacheService } from '../public/public-cache.service';
+import { Test } from '@nestjs/testing';
+import { Prisma } from '@prisma/client';
+import {
+  FamilyRecomputeService,
+  derivePriceMatrix,
+  memberMatrixCombos,
+} from './family-recompute.service';
+import { ProductFamiliesService } from './product-families.service';
+import { OrganizeService } from './organize.service';
+import { PrismaService } from '../prisma/prisma.service';
+
+/**
+ * 集成测试（连真实库，与 goods.service.spec.ts 同模式）：
+ * 验证并集尺码表/包装规则裁决、五维价格矩阵推导（最低价/来源累积/维度过滤）、
+ * 覆盖合并、autoManaged 锁定语义与 canonical detail 初始化。
+ */
+describe('FamilyRecomputeService', () => {
+  let service: FamilyRecomputeService;
+  let organize!: OrganizeService;
+  let prisma: PrismaService;
+  const stamp = Date.now();
+  const createdOriginGoodIds: bigint[] = [];
+  const createdFamilyIds: bigint[] = [];
+  const createdTagIds: bigint[] = [];
+  const createdTagGroupIds: bigint[] = [];
+
+  const mkOriginGood = async (over: {
+    goodName?: string;
+    source?: 'SDS' | 'CUSTOM';
+    craftLabel?: string | null;
+    logisticsLabel?: string | null;
+    variants?: Array<{
+      sdsVariantId: string;
+      sku: string;
+      sizeId?: string;
+      sizeName?: string;
+      colorId?: string;
+      colorName?: string;
+      price: number;
+      enabled?: boolean;
+    }>;
+    sizeChart?: object;
+    packageSpecs?: object;
+  }) => {
+    const og = await prisma.originGood.create({
+      data: {
+        sdsGoodId: `recompute-${stamp}-${createdOriginGoodIds.length}-${Math.random().toString(36).slice(2, 7)}`,
+        goodName: over.goodName ?? `测试链接-${stamp}`,
+        source: over.source ?? 'CUSTOM',
+        craftLabel: over.craftLabel ?? null,
+        logisticsLabel: over.logisticsLabel ?? null,
+      },
+    });
+    createdOriginGoodIds.push(og.id);
+    if (over.variants?.length) {
+      await prisma.originGoodVariant.createMany({
+        data: over.variants.map((v) => ({
+          originGoodId: og.id,
+          sdsVariantId: v.sdsVariantId,
+          sku: v.sku,
+          sizeId: v.sizeId ?? null,
+          sizeName: v.sizeName ?? null,
+          colorId: v.colorId ?? null,
+          colorName: v.colorName ?? null,
+          price: new Prisma.Decimal(v.price),
+          enabled: v.enabled ?? true,
+        })),
+      });
+    }
+    if (over.sizeChart || over.packageSpecs) {
+      await prisma.originGoodDetail.create({
+        data: {
+          originGoodId: og.id,
+          sizeChart: (over.sizeChart ?? undefined) as Prisma.InputJsonValue,
+          packageSpecs: (over.packageSpecs ?? undefined) as Prisma.InputJsonValue,
+        },
+      });
+    }
+    return og;
+  };
+
+  const mkFamily = async (over: {
+    primaryOriginGoodId?: bigint | null;
+    autoManaged?: boolean;
+    memberIds?: bigint[];
+  }) => {
+    const family = await prisma.productFamily.create({
+      data: {
+        familyName: `测试族-${stamp}-${createdFamilyIds.length}`,
+        autoManaged: over.autoManaged ?? true,
+        primaryOriginGoodId: over.primaryOriginGoodId ?? null,
+      },
+    });
+    createdFamilyIds.push(family.id);
+    if (over.memberIds?.length) {
+      await prisma.originGood.updateMany({
+        where: { id: { in: over.memberIds } },
+        data: { familyId: family.id },
+      });
+    }
+    return family;
+  };
+
+  beforeAll(async () => {
+    const moduleRef = await Test.createTestingModule({
+      providers: [FamilyRecomputeService, PrismaService, PublicCacheService],
+    }).compile();
+    service = moduleRef.get(FamilyRecomputeService);
+    organize = new OrganizeService(
+      moduleRef.get(PrismaService),
+      service,
+      new ProductFamiliesService(moduleRef.get(PrismaService), service),
+      moduleRef.get(PublicCacheService),
+    );
+    prisma = moduleRef.get(PrismaService);
+    await prisma.onModuleInit();
+  });
+
+  afterAll(async () => {
+    await prisma.originGood.deleteMany({ where: { id: { in: createdOriginGoodIds } } });
+    await prisma.productFamily.deleteMany({ where: { id: { in: createdFamilyIds } } });
+    await prisma.tag.deleteMany({ where: { id: { in: createdTagIds } } });
+    await prisma.tagGroup.deleteMany({ where: { id: { in: createdTagGroupIds } } });
+    await prisma.$disconnect();
+  });
+
+  it('并集尺码表：覆盖最全的成员优先、主链接次之、按首现顺序合并', async () => {
+    // A：主链接，2 行；C：非主链接，3 行 → C 的 S 行胜出
+    const a = await mkOriginGood({
+      craftLabel: '单面印花',
+      logisticsLabel: '包邮',
+      sizeChart: { columns: [{ key: 'chest', name: '胸围' }], rows: [
+        { sizeId: 'size_S', sizeName: 'S', chest: 100 },
+        { sizeId: 'size_XL', sizeName: 'XL', chest: 108 },
+      ] },
+    });
+    const c = await mkOriginGood({
+      craftLabel: '单面印花',
+      logisticsLabel: '包邮',
+      sizeChart: { columns: [{ key: 'chest', name: '胸围' }], rows: [
+        { sizeId: 'size_S', sizeName: 'S', chest: 98 },
+        { sizeId: 'size_XXL', sizeName: 'XXL', chest: 112 },
+        { sizeId: 'size_XXXL', sizeName: 'XXXL', chest: 116 },
+      ] },
+    });
+    const family = await mkFamily({ primaryOriginGoodId: a.id, memberIds: [a.id, c.id] });
+
+    await service.recomputeFamily(family.id);
+
+    const after = await prisma.productFamily.findUniqueOrThrow({ where: { id: family.id } });
+    const chart = after.sizeChart as { rows: Array<{ sizeName: string; chest: number }> };
+    const names = chart.rows.map((r) => r.sizeName);
+    expect(names).toEqual(['S', 'XXL', 'XXXL', 'XL']); // C(3行) 优先遍历，A 补充 XL
+    expect(chart.rows.find((r) => r.sizeName === 'S')?.chest).toBe(98); // 冲突取覆盖最全成员
+    expect(after.stale).toBe(false);
+  });
+
+  it('价格矩阵：五维格子取最低价并累积来源；维度取整理派生的链接标签；停用变体不参与', async () => {
+    const a = await mkOriginGood({
+      source: 'SDS',
+      goodName: '美国（包邮）测试A-PA1-单面印花',
+      variants: [
+        { sdsVariantId: 'v1', sku: 'A-S-BLK', sizeId: 'size_S', sizeName: 'S', colorId: 'color_blk', colorName: '黑色', price: 25 },
+        { sdsVariantId: 'v2', sku: 'A-XL-WHT', sizeId: 'size_XL', sizeName: 'XL', colorId: 'color_wht', colorName: '白色', price: 27 },
+        { sdsVariantId: 'v3', sku: 'A-S-BLK-OFF', sizeId: 'size_S', sizeName: 'S', colorId: 'color_blk', colorName: '黑色', price: 20, enabled: false },
+      ],
+    });
+    const b = await mkOriginGood({
+      source: 'SDS',
+      goodName: '美国（包邮）测试B-PB1-单面印花', // 同格子（不同仓库）
+      variants: [
+        { sdsVariantId: 'v4', sku: 'B-S-BLK', sizeId: 'size_S', sizeName: 'S', colorId: 'color_blk', colorName: '黑色', price: 24.5 },
+        { sdsVariantId: 'v5', sku: 'B-XXXL-BLK', sizeId: 'size_XXXL', sizeName: 'XXXL', colorId: 'color_blk', colorName: '黑色', price: 29 },
+      ],
+    });
+    const d = await mkOriginGood({
+      source: 'SDS',
+      goodName: '美国（包邮）测试D-PD1-直喷双面',
+      variants: [
+        { sdsVariantId: 'v6', sku: 'D-S-BLK', sizeId: 'size_S', sizeName: 'S', colorId: 'color_blk', colorName: '黑色', price: 30 },
+      ],
+    });
+    const e = await mkOriginGood({
+      source: 'SDS',
+      goodName: '美国（不包邮）测试E-PE1-光板', // 整理派生：不打印 + 不包邮（无印花数量标签 → 结构化占位单面）
+      variants: [
+        { sdsVariantId: 'v7', sku: 'E-S-BLK', sizeId: 'size_S', sizeName: 'S', colorId: 'color_blk', colorName: '黑色', price: 22 },
+      ],
+    });
+    const family = await mkFamily({ primaryOriginGoodId: a.id, memberIds: [a.id, b.id, d.id, e.id] });
+
+    // 整理（显式派生标签）→ 重算（纯聚合）。运行时不解析名称，未派生的成员不进矩阵
+    await organize.deriveFamilyTags(family.id);
+    await service.recomputeFamily(family.id);
+
+    const after = await prisma.productFamily.findUniqueOrThrow({ where: { id: family.id } });
+    const matrix = after.priceMatrix as any;
+    const cell = matrix.rows.find(
+      (r: any) => r.sizeId === 'size_S' && r.colorId === 'color_blk'
+        && r.printCount === '单面印花' && r.craft === '烫画' && r.logistics === '包邮',
+    );
+    expect(cell.price).toBe('24.5');
+    expect(cell.manual).toBe(false);
+    expect(cell.sources).toHaveLength(2); // a.v1 + b.v4；停用 v3 排除
+    // 直喷双面 → 印花数量/工艺两维正确拆分
+    const dg = matrix.rows.find((r: any) => r.printCount === '双面印花' && r.craft === '直喷' && r.price === '30');
+    expect(dg).toBeTruthy();
+    // 光板 → 工艺=不打印、印花数量占位单面、物流=不包邮
+    const blank = matrix.rows.find((r: any) => r.craft === '不打印' && r.logistics === '不包邮');
+    expect(blank).toBeTruthy();
+    expect(blank.printCount).toBe('单面印花');
+    expect(matrix.printCounts.sort()).toEqual(['单面印花', '双面印花']);
+    expect(matrix.crafts.sort()).toEqual(['不打印', '烫画', '直喷']);
+    expect(matrix.logistics.sort()).toEqual(['不包邮', '包邮']);
+    expect(matrix.sizes.map((s: any) => s.name).sort()).toEqual(['S', 'XL', 'XXXL']);
+  });
+
+  it('价格矩阵：未整理（无标签）的 SDS 成员不进矩阵', async () => {
+    const a = await mkOriginGood({
+      source: 'SDS',
+      goodName: '美国（包邮）测试U-PU1-单面印花',
+      variants: [
+        { sdsVariantId: 'v1', sku: 'U-S-BLK', sizeId: 'size_S', sizeName: 'S', colorId: 'color_blk', colorName: '黑色', price: 25 },
+      ],
+    });
+    const family = await mkFamily({ primaryOriginGoodId: a.id, memberIds: [a.id] });
+    // 只重算、不整理 → 无标签 → 空矩阵
+    await service.recomputeFamily(family.id);
+    let after = await prisma.productFamily.findUniqueOrThrow({ where: { id: family.id } });
+    expect((after.priceMatrix as any).rows).toHaveLength(0);
+    // 整理后进入矩阵
+    await organize.deriveFamilyTags(family.id);
+    await service.recomputeFamily(family.id);
+    after = await prisma.productFamily.findUniqueOrThrow({ where: { id: family.id } });
+    expect((after.priceMatrix as any).rows).toHaveLength(1);
+  });
+
+  it('价格矩阵：人工接管标签即权威维度（人工标签 > 一切）', async () => {
+    const a = await mkOriginGood({
+      goodName: '美国（包邮）测试M-PM1-单面印花', // 名称派生是 单面/烫画/包邮
+      variants: [
+        { sdsVariantId: 'v1', sku: 'M-S-BLK', sizeId: 'size_S', sizeName: 'S', colorId: 'color_blk', colorName: '黑色', price: 25 },
+      ],
+    });
+    // 人工把该链接标签改成 双面印花/直喷/不包邮（手工造标签行，模拟 updateTags 结果）
+    const tagIds: bigint[] = [];
+    for (const groupName of ['印花数量', '印刷工艺', '物流渠道']) {
+      const group = await prisma.tagGroup.findFirst({ where: { groupName } });
+      const g = group ?? (await prisma.tagGroup.create({ data: { groupName } }));
+      if (!group) createdTagGroupIds.push(g.id);
+      for (const tagName of groupName === '印花数量' ? ['双面印花'] : groupName === '印刷工艺' ? ['直喷'] : ['不包邮']) {
+        const existing = await prisma.tag.findFirst({ where: { tagName } });
+        const t = existing ?? (await prisma.tag.create({ data: { tagName, tagGroupId: g.id } }));
+        if (!existing) createdTagIds.push(t.id);
+        tagIds.push(t.id);
+      }
+    }
+    await prisma.originGoodTag.createMany({
+      data: tagIds.map((tagId) => ({ originGoodId: a.id, tagId, manual: true })),
+    });
+    const family = await mkFamily({ primaryOriginGoodId: a.id, memberIds: [a.id] });
+
+    await service.recomputeFamily(family.id);
+
+    const after = await prisma.productFamily.findUniqueOrThrow({ where: { id: family.id } });
+    const matrix = after.priceMatrix as any;
+    expect(matrix.rows).toHaveLength(1);
+    expect(matrix.rows[0].printCount).toBe('双面印花');
+    expect(matrix.rows[0].craft).toBe('直喷');
+    expect(matrix.rows[0].logistics).toBe('不包邮');
+  });
+
+  it('覆盖：命中改价 manual=true，未命中新增行并扩充选项', async () => {
+    const a = await mkOriginGood({
+      goodName: '美国（包邮）测试O-PO1-单面印花',
+      variants: [
+        { sdsVariantId: 'v1', sku: 'A-S-BLK', sizeId: 'size_S', sizeName: 'S', colorId: 'color_blk', colorName: '黑色', price: 25 },
+      ],
+    });
+    const family = await mkFamily({ primaryOriginGoodId: a.id, memberIds: [a.id] });
+    await prisma.familyPriceOverride.createMany({
+      data: [
+        { familyId: family.id, sizeId: 'size_S', colorId: 'color_blk', printCount: '单面印花', craft: '烫画', logistics: '包邮', price: new Prisma.Decimal(23) },
+        { familyId: family.id, sizeId: 'size_M', colorId: 'color_red', printCount: '四面印花', craft: '丝印', logistics: '海运', price: new Prisma.Decimal(40) },
+      ],
+    });
+
+    await service.recomputeFamily(family.id);
+
+    const after = await prisma.productFamily.findUniqueOrThrow({ where: { id: family.id } });
+    const matrix = after.priceMatrix as any;
+    const hit = matrix.rows.find(
+      (r: any) => r.sizeId === 'size_S' && r.colorId === 'color_blk' && r.printCount === '单面印花' && r.craft === '烫画' && r.logistics === '包邮',
+    );
+    expect(hit.price).toBe('23');
+    expect(hit.manual).toBe(true);
+    const added = matrix.rows.find((r: any) => r.sizeId === 'size_M' && r.craft === '丝印');
+    expect(added).toBeTruthy();
+    expect(added.manual).toBe(true);
+    expect(added.printCount).toBe('四面印花');
+    expect(added.sources).toEqual([]);
+    expect(matrix.crafts).toContain('丝印');
+    expect(matrix.printCounts).toContain('四面印花');
+    expect(matrix.logistics).toContain('海运');
+    expect(matrix.sizes.some((s: any) => s.key === 'size_M')).toBe(true);
+  });
+
+  it('autoManaged=false：只置 stale，不覆盖物化字段', async () => {
+    const a = await mkOriginGood({
+      craftLabel: '单面印花',
+      logisticsLabel: '包邮',
+      variants: [
+        { sdsVariantId: 'v1', sku: 'A-S-BLK', sizeId: 'size_S', sizeName: 'S', colorId: 'color_blk', colorName: '黑色', price: 25 },
+      ],
+    });
+    const family = await mkFamily({ primaryOriginGoodId: a.id, memberIds: [a.id], autoManaged: false });
+    await prisma.productFamily.update({
+      where: { id: family.id },
+      data: { priceMatrix: { version: 'locked' } as Prisma.InputJsonValue },
+    });
+
+    await service.recomputeFamily(family.id);
+
+    const after = await prisma.productFamily.findUniqueOrThrow({ where: { id: family.id } });
+    expect(after.stale).toBe(true);
+    expect((after.priceMatrix as any).version).toBe('locked'); // 未被覆盖
+  });
+
+  it('canonical detail：为空时从主链接初始化一次，非空不动', async () => {
+    const a = await mkOriginGood({ craftLabel: '单面印花', logisticsLabel: '包邮' });
+    await prisma.originGoodDetail.create({
+      data: { originGoodId: a.id, englishName: 'Cotton Tee', materialDescription: '100% 棉' },
+    });
+    const b = await mkOriginGood({ craftLabel: '单面印花', logisticsLabel: '包邮' });
+    await prisma.originGoodDetail.create({
+      data: { originGoodId: b.id, englishName: 'Should Not Win' },
+    });
+    const family = await mkFamily({ primaryOriginGoodId: a.id, memberIds: [a.id, b.id] });
+
+    await service.recomputeFamily(family.id);
+    let after = await prisma.productFamily.findUniqueOrThrow({ where: { id: family.id } });
+    expect((after.detail as any).englishName).toBe('Cotton Tee');
+    expect((after.detail as any).materialDescription).toBe('100% 棉');
+
+    await prisma.productFamily.update({
+      where: { id: family.id },
+      data: { detail: { englishName: '人工已改' } as Prisma.InputJsonValue },
+    });
+    await service.recomputeFamily(family.id);
+    after = await prisma.productFamily.findUniqueOrThrow({ where: { id: family.id } });
+    expect((after.detail as any).englishName).toBe('人工已改');
+  });
+
+  it('族不存在时 no-op 不抛错', async () => {
+    await expect(service.recomputeFamily(999999n)).resolves.toBeUndefined();
+  });
+
+  it('enqueue 去重且串行执行', async () => {
+    const a = await mkOriginGood({
+      craftLabel: '单面印花',
+      logisticsLabel: '包邮',
+      variants: [{ sdsVariantId: 'v1', sku: 'A-S-BLK', sizeId: 'size_S', sizeName: 'S', colorId: 'color_blk', colorName: '黑色', price: 25 }],
+    });
+    const family = await mkFamily({ primaryOriginGoodId: a.id, memberIds: [a.id] });
+    const spy = jest.spyOn(service, 'recomputeFamily').mockResolvedValue();
+
+    service.enqueue(family.id);
+    service.enqueue(family.id);
+    service.enqueue(family.id);
+    await new Promise((r) => setTimeout(r, 50));
+
+    expect(spy).toHaveBeenCalledTimes(1);
+    spy.mockRestore();
+  });
+});
+
+/**
+ * derivePriceMatrix 纯函数单测：选项组排序（词表序 + 未知值沉底）。
+ * 业务确认的展示顺序：printCount 单面→双面；craft 烫画→直喷→不打印；logistics 不包邮→包邮。
+ * 词表外自由文本（CUSTOM craftLabel/logisticsLabel，如"海运"）沉底，相互间保持首次遇到序。
+ */
+describe('derivePriceMatrix 选项组排序', () => {
+  const mkMember = (
+    id: number,
+    over: { tags?: string[]; source?: 'SDS' | 'CUSTOM'; craftLabel?: string | null; logisticsLabel?: string | null },
+  ) =>
+    ({
+      id: BigInt(id),
+      source: over.source ?? 'SDS',
+      originGoodTags: (over.tags ?? []).map((t) => ({ tag: { tagName: t } })),
+      variants: [],
+      craftLabel: over.craftLabel ?? null,
+      logisticsLabel: over.logisticsLabel ?? null,
+    }) as any;
+
+  it('成员顺序无关：三个维度恒为词表序', () => {
+    // 故意让"遇到序"与目标词表序全部相反（双面在前/直喷在前/不包邮在前）
+    const members = [
+      mkMember(1, { tags: ['直喷', '双面印花', '不包邮'] }),
+      mkMember(2, { tags: ['烫画', '单面印花', '包邮'] }),
+    ];
+    const m = derivePriceMatrix(members, []);
+    expect(m.printCounts).toEqual(['单面印花', '双面印花']);
+    expect(m.crafts).toEqual(['烫画', '直喷']);
+    expect(m.logistics).toEqual(['不包邮', '包邮']);
+  });
+
+  it('子集保序：只出现部分取值时相对顺序不变', () => {
+    const m = derivePriceMatrix([mkMember(1, { tags: ['直喷', '双面印花', '不包邮'] })], []);
+    expect(m.printCounts).toEqual(['双面印花']);
+    expect(m.crafts).toEqual(['直喷']);
+    expect(m.logistics).toEqual(['不包邮']);
+  });
+
+  it('未知自由文本沉底且相互保持首次遇到序', () => {
+    const members = [
+      // CUSTOM：自由文本标签 + tags 提供印花数量（无印花维度不进矩阵的既有语义）
+      mkMember(1, { source: 'CUSTOM', tags: ['双面印花'], craftLabel: '丝印', logisticsLabel: '海运' }),
+      mkMember(2, { source: 'CUSTOM', tags: ['双面印花'], craftLabel: '水洗', logisticsLabel: '空运' }),
+      mkMember(3, { tags: ['烫画', '单面印花', '包邮'] }),
+    ];
+    const m = derivePriceMatrix(members, []);
+    expect(m.printCounts).toEqual(['单面印花', '双面印花']);
+    expect(m.crafts).toEqual(['烫画', '丝印', '水洗']);
+    expect(m.logistics).toEqual(['包邮', '海运', '空运']);
+  });
+
+  it('人工覆盖新增取值参与同一排序', () => {
+    const members = [mkMember(1, { tags: ['烫画', '单面印花', '包邮'] })];
+    const overrides = [
+      {
+        sizeId: 'size_M',
+        colorId: 'color_red',
+        printCount: '四面印花',
+        craft: '丝印',
+        logistics: '海运',
+        price: '40',
+      },
+    ] as any;
+    const m = derivePriceMatrix(members, overrides);
+    expect(m.printCounts).toEqual(['单面印花', '四面印花']);
+    expect(m.crafts).toEqual(['烫画', '丝印']);
+    expect(m.logistics).toEqual(['包邮', '海运']);
+  });
+
+  it('幂等：同输入多跑两遍输出全等（含顺序），与成员遍历顺序无关', () => {
+    const members = [
+      mkMember(1, { tags: ['直喷', '双面印花', '不包邮'] }),
+      mkMember(2, { source: 'CUSTOM', tags: ['双面印花'], craftLabel: '丝印', logisticsLabel: '海运' }),
+      mkMember(3, { tags: ['烫画', '单面印花', '包邮'] }),
+    ];
+    const first = derivePriceMatrix(members, []);
+    const second = derivePriceMatrix(members, []);
+    const reversed = derivePriceMatrix([...members].reverse(), []);
+    expect(JSON.stringify(second)).toBe(JSON.stringify(first));
+    expect(JSON.stringify(reversed)).toBe(JSON.stringify(first));
+  });
+});
+
+/**
+ * 印刷工艺新增"热转印"：矩阵维度词表放开准入 + 展示序追加末尾。
+ * 自动派生规则不改 —— SDS 链接只能人工打标；不打标的链接/族零影响。
+ */
+describe('热转印工艺', () => {
+  const mkMember = (
+    id: number,
+    over: { tags?: string[]; source?: 'SDS' | 'CUSTOM'; craftLabel?: string | null; logisticsLabel?: string | null },
+  ) =>
+    ({
+      id: BigInt(id),
+      source: over.source ?? 'SDS',
+      originGoodTags: (over.tags ?? []).map((t) => ({ tag: { tagName: t } })),
+      variants: [],
+      craftLabel: over.craftLabel ?? null,
+      logisticsLabel: over.logisticsLabel ?? null,
+    }) as any;
+
+  it('memberMatrixCombos：打标热转印的链接产出矩阵组合（此前被词表过滤为空）', () => {
+    const combos = memberMatrixCombos({ tagNames: ['单面印花', '热转印', '包邮'] });
+    expect(combos).toEqual([{ printCount: '单面印花', craft: '热转印', logistics: '包邮' }]);
+  });
+
+  it('derivePriceMatrix：crafts 展示序为 烫画→直喷→不打印→热转印（词表内，不再沉底）', () => {
+    const members = [
+      mkMember(1, { tags: ['热转印', '单面印花', '包邮'] }),
+      mkMember(2, { tags: ['烫画', '单面印花', '包邮'] }),
+      mkMember(3, { tags: ['直喷', '单面印花', '不包邮'] }),
+      mkMember(4, { tags: ['不打印', '单面印花', '包邮'] }),
+    ];
+    const m = derivePriceMatrix(members, []);
+    expect(m.crafts).toEqual(['烫画', '直喷', '不打印', '热转印']);
+  });
+
+  it('词表外自由文本（丝印/水洗）仍然沉底，与热转印区分', () => {
+    const members = [
+      mkMember(1, { tags: ['热转印', '单面印花', '包邮'] }),
+      mkMember(2, { source: 'CUSTOM', tags: ['单面印花'], craftLabel: '丝印', logisticsLabel: '包邮' }),
+    ];
+    const m = derivePriceMatrix(members, []);
+    expect(m.crafts).toEqual(['热转印', '丝印']);
+  });
+});

apps/api/src/product-families/family-recompute.service.ts

@@ -0,0 +1,461 @@
+import { Injectable, Logger } from '@nestjs/common';
+import { Prisma } from '@prisma/client';
+import { PrismaService } from '../prisma/prisma.service';
+import { PublicCacheService } from '../public/public-cache.service';
+import { isAutoTagGroupName } from './auto-tag-rules';
+
+/**
+ * 产品族重算：并集尺码表/包装规则 + 五维价格矩阵物化。
+ * 设计：docs/superpowers/specs/2026-08-28-product-family-merge-design.md §7-§9
+ *
+ * 关键不变量：
+ * - 推导输入全部为确定性数据（成员镜像、覆盖表），重算幂等；
+ * - autoManaged=false 的族只置 stale，绝不覆盖人工物化字段；
+ * - 覆盖表与自定义成员数据只读，永不写回。
+ */
+
+export interface PriceMatrixSource {
+  sdsGoodId: string;
+  sdsVariantId: string;
+  price: string;
+}
+
+export interface PriceMatrixRow {
+  sizeId: string;
+  sizeName: string | null;
+  colorId: string;
+  colorName: string | null;
+  /** 印花数量维：单面印花 / 双面印花 */
+  printCount: string;
+  /** 工艺维：烫画 / 直喷 / 不打印 */
+  craft: string;
+  logistics: string;
+  price: string;
+  manual: boolean;
+  sources: PriceMatrixSource[];
+}
+
+export interface PriceMatrix {
+  sizes: Array<{ key: string; name: string | null }>;
+  colors: Array<{ key: string; name: string | null; hex: string | null; imageUrl: string | null }>;
+  printCounts: string[];
+  crafts: string[];
+  logistics: string[];
+  rows: PriceMatrixRow[];
+}
+
+export interface ChartSizeRow {
+  sizeId?: string | null;
+  sizeName?: string | null;
+  [key: string]: unknown;
+}
+
+export interface ChartLike {
+  columns?: unknown;
+  rows?: ChartSizeRow[];
+}
+
+type Member = Prisma.OriginGoodGetPayload<{
+  include: {
+    detail: true;
+    variants: true;
+    originGoodTags: { select: { tag: { select: { tagName: true } } } };
+  };
+}>;
+type OverrideRow = Prisma.FamilyPriceOverrideGetPayload<{}>;
+
+/** 矩阵三个归因维度的合法取值（封闭集合，与派生标签组一致） */
+const DIM_VALUES = {
+  printCount: ['单面印花', '双面印花'],
+  craft: ['烫画', '直喷', '不打印', '热转印'],
+  logistics: ['包邮', '不包邮'],
+} as const satisfies Record<string, readonly string[]>;
+
+type DimKey = keyof typeof DIM_VALUES;
+
+/**
+ * 选项组展示顺序（业务确认）：printCount 单面→双面；craft 烫画→直喷→不打印→热转印；logistics 不包邮→包邮。
+ * 与 DIM_VALUES 的"组合生成序"是两回事，物化前对聚合数组按此稳定排序；
+ * 词表外自由文本（CUSTOM 标签，如"海运"）沉底，相互间保持首次遇到序。
+ */
+const OPTION_DISPLAY_ORDER = {
+  printCount: ['单面印花', '双面印花'],
+  craft: ['烫画', '直喷', '不打印', '热转印'],
+  logistics: ['不包邮', '包邮'],
+} as const;
+
+function optionRank(value: string, canon: readonly string[]): number {
+  const i = canon.indexOf(value);
+  return i === -1 ? canon.length : i;
+}
+
+function sortOptions(values: string[], canon: readonly string[]): string[] {
+  return [...values].sort((a, b) => optionRank(a, canon) - optionRank(b, canon));
+}
+export interface MatrixCombo {
+  printCount: string;
+  craft: string;
+  logistics: string;
+}
+
+/**
+ * 成员在矩阵中的归因维度组合（纯函数），取值只有两个来源——
+ * 1. 链接有效标签（人工接管后仍准确，仅认封闭词表内的标签）；
+ * 2. CUSTOM 成员的管理员显式标签（craftLabel/logisticsLabel，自由文本）。
+ * 【不解析名称】：SDS 成员无标签 → 返回空（不进矩阵），由整理（OrganizeService）显式补标签。
+ * 多值时取笛卡尔积 —— 一个链接理论上只属一个组合，此处只是容错。
+ */
+export function memberMatrixCombos(input: {
+  tagNames: string[];
+  customLabels?: { craft?: string | null; logistics?: string | null };
+}): MatrixCombo[] {
+  const values = (dim: DimKey): string[] =>
+    DIM_VALUES[dim].filter((v) => input.tagNames.includes(v));
+
+  let printCounts = values('printCount');
+  let crafts = values('craft');
+  let logistics = values('logistics');
+  // CUSTOM 成员：管理员显式标签是唯一来源（craftLabel/logisticsLabel，自由文本）
+  const craftLabel = input.customLabels?.craft ?? '';
+  const logisticsLabel = input.customLabels?.logistics ?? '';
+  if (!crafts.length && craftLabel) crafts = [craftLabel];
+  if (!logistics.length && logisticsLabel) logistics = [logisticsLabel];
+  // 结构化占位规则（非名称解析）：工艺=不打印 时印花面不存在，印花数量固定单面占位，
+  // 保证光板链接的价格进矩阵；工艺=烫画/直喷 而缺印花数量标签 → 缺维度不进矩阵（等整理补标签）
+  const noPrintCraft =
+    crafts.includes('不打印') || craftLabel.includes('不打印') || craftLabel.includes('光板');
+  if (!printCounts.length && noPrintCraft) {
+    printCounts = [DIM_VALUES.printCount[0]];
+  } else if (!printCounts.length && craftLabel.includes('双面')) {
+    printCounts = ['双面印花'];
+  }
+  if (!printCounts.length || !crafts.length || !logistics.length) return [];
+
+  const combos: MatrixCombo[] = [];
+  for (const printCount of printCounts) {
+    for (const craft of crafts) {
+      for (const logistic of logistics) {
+        combos.push({ printCount, craft, logistics: logistic });
+      }
+    }
+  }
+  return combos;
+}
+
+function chartRowKey(row: ChartSizeRow): string {
+  return String(row.sizeName ?? row.sizeId ?? '');
+}
+
+/**
+ * 按优先级顺序（已排序的成员 → 各自的 chart）合并尺码行并集。
+ * 同键冲突时先到先得 —— 调用方负责把"覆盖最全的成员 / 主链接"排在前面。
+ */
+export function unionChartRows(charts: Array<ChartLike | null | undefined>): ChartSizeRow[] {
+  const out: ChartSizeRow[] = [];
+  const seen = new Set<string>();
+  for (const chart of charts) {
+    for (const row of chart?.rows ?? []) {
+      const key = chartRowKey(row);
+      if (!key || seen.has(key)) continue;
+      seen.add(key);
+      out.push(row);
+    }
+  }
+  return out;
+}
+
+function firstColumns(charts: Array<ChartLike | null | undefined>): unknown {
+  for (const chart of charts) {
+    if (chart?.columns !== undefined && chart?.columns !== null) return chart.columns;
+  }
+  return undefined;
+}
+
+/**
+ * 推导五维价格矩阵：(sizeKey, colorKey, printCount, craft, logistics) → 价格。
+ * 尺寸键 = variant.sizeId ?? variant.sizeName；颜色键 = variant.colorId ?? variant.colorName；
+ * 归因维度取成员链接标签（见 memberMatrixCombos）。
+ * 同格子多来源取最低价，sources 全保留；随后合并人工覆盖（manual=true）。
+ */
+export function derivePriceMatrix(members: Member[], overrides: OverrideRow[]): PriceMatrix {
+  const sizes = new Map<string, string | null>();
+  const colors = new Map<string, { name: string | null; hex: string | null; imageUrl: string | null }>();
+  const cellMap = new Map<string, PriceMatrixRow>();
+
+  const memberCombos = members.map((member) => ({
+    member,
+    combos: memberMatrixCombos({
+      tagNames: member.originGoodTags.map((r) => r.tag.tagName),
+      // CUSTOM 成员无同步标签，管理员显式填写的标签字段是其唯一归因来源
+      customLabels:
+        member.source === 'CUSTOM'
+          ? { craft: member.craftLabel, logistics: member.logisticsLabel }
+          : undefined,
+    }),
+  }));
+
+  const noteVariant = (variant: Member['variants'][number]) => {
+    const sizeKey = String(variant.sizeId ?? variant.sizeName ?? '');
+    const colorKey = String(variant.colorId ?? variant.colorName ?? '');
+    if (sizeKey && !sizes.has(sizeKey)) sizes.set(sizeKey, variant.sizeName);
+    if (colorKey) {
+      const prev = colors.get(colorKey);
+      colors.set(colorKey, {
+        name: prev?.name ?? variant.colorName,
+        hex: prev?.hex ?? variant.colorHex,
+        imageUrl: prev?.imageUrl ?? variant.imageUrl,
+      });
+    }
+    return { sizeKey, colorKey };
+  };
+
+  for (const { member, combos } of memberCombos) {
+    for (const combo of combos) {
+      for (const variant of member.variants) {
+        if (variant.price === null) continue;
+        const { sizeKey, colorKey } = noteVariant(variant);
+        if (!sizeKey && !colorKey) continue;
+        const key = `${sizeKey}|${colorKey}|${combo.printCount}|${combo.craft}|${combo.logistics}`;
+        const priceStr = variant.price.toString();
+        const source: PriceMatrixSource = {
+          sdsGoodId: member.sdsGoodId,
+          sdsVariantId: variant.sdsVariantId,
+          price: priceStr,
+        };
+        const existing = cellMap.get(key);
+        if (!existing) {
+          cellMap.set(key, {
+            sizeId: sizeKey,
+            sizeName: variant.sizeName,
+            colorId: colorKey,
+            colorName: variant.colorName,
+            printCount: combo.printCount,
+            craft: combo.craft,
+            logistics: combo.logistics,
+            price: priceStr,
+            manual: false,
+            sources: [source],
+          });
+        } else {
+          existing.sources.push(source);
+          if (Number(variant.price) < Number(existing.price)) existing.price = priceStr;
+        }
+      }
+    }
+  }
+
+  const printCounts = [
+    ...new Set(memberCombos.flatMap(({ combos }) => combos.map((c) => c.printCount))),
+  ];
+  const crafts = [...new Set(memberCombos.flatMap(({ combos }) => combos.map((c) => c.craft)))];
+  const logisticsOptions = [
+    ...new Set(memberCombos.flatMap(({ combos }) => combos.map((c) => c.logistics))),
+  ];
+
+  const rows = [...cellMap.values()];
+
+  // 人工覆盖：命中改价，未命中新增行（人工补组合），选项并入覆盖用到的取值
+  for (const override of overrides) {
+    if (!printCounts.includes(override.printCount)) printCounts.push(override.printCount);
+    if (!crafts.includes(override.craft)) crafts.push(override.craft);
+    if (!logisticsOptions.includes(override.logistics)) logisticsOptions.push(override.logistics);
+    if (override.sizeId && !sizes.has(override.sizeId)) sizes.set(override.sizeId, null);
+    if (override.colorId && !colors.has(override.colorId)) {
+      colors.set(override.colorId, { name: null, hex: null, imageUrl: null });
+    }
+    const key = `${override.sizeId}|${override.colorId}|${override.printCount}|${override.craft}|${override.logistics}`;
+    const row = cellMap.get(key);
+    if (row) {
+      row.price = override.price.toString();
+      row.manual = true;
+    } else {
+      const added: PriceMatrixRow = {
+        sizeId: override.sizeId,
+        sizeName: sizes.get(override.sizeId) ?? null,
+        colorId: override.colorId,
+        colorName: colors.get(override.colorId)?.name ?? null,
+        printCount: override.printCount,
+        craft: override.craft,
+        logistics: override.logistics,
+        price: override.price.toString(),
+        manual: true,
+        sources: [],
+      };
+      cellMap.set(key, added);
+      rows.push(added);
+    }
+  }
+
+  return {
+    sizes: [...sizes.entries()].map(([key, name]) => ({ key, name })),
+    colors: [...colors.entries()].map(([key, v]) => ({ key, ...v })),
+    printCounts: sortOptions(printCounts, OPTION_DISPLAY_ORDER.printCount),
+    crafts: sortOptions(crafts, OPTION_DISPLAY_ORDER.craft),
+    logistics: sortOptions(logisticsOptions, OPTION_DISPLAY_ORDER.logistics),
+    rows,
+  };
+}
+
+/** canonical detail 的文本字段（从主链接 detail 摘取，不含 JSON 物化与时间戳） */
+function pickDetailText(detail: Prisma.OriginGoodDetailGetPayload<{}>): Prisma.InputJsonValue {
+  return {
+    productCode: detail.productCode,
+    englishName: detail.englishName,
+    blankDesignUrl: detail.blankDesignUrl,
+    detailsPageVideoUrl: detail.detailsPageVideoUrl,
+    textureName: detail.textureName,
+    productionCycleHours: detail.productionCycleHours,
+    minWeightG: detail.minWeightG ? detail.minWeightG.toString() : null,
+    reminder: detail.reminder,
+    productionProcess: detail.productionProcess,
+    materialDescription: detail.materialDescription,
+    productPerformance: detail.productPerformance,
+    applicableScenarios: detail.applicableScenarios,
+    washingInstructions: detail.washingInstructions,
+    specialDescription: detail.specialDescription,
+    designExplanation: detail.designExplanation,
+    designArea: detail.designArea,
+    pictureRequest: detail.pictureRequest,
+  };
+}
+
+const json = (value: unknown): Prisma.InputJsonValue | typeof Prisma.DbNull =>
+  (value === undefined || value === null ? Prisma.DbNull : value) as Prisma.InputJsonValue;
+
+@Injectable()
+export class FamilyRecomputeService {
+  private readonly logger = new Logger(FamilyRecomputeService.name);
+  private readonly pending = new Map<string, Promise<void>>();
+
+  constructor(
+    private readonly prisma: PrismaService,
+    private readonly publicCache: PublicCacheService,
+  ) {}
+
+  /** 进程内去重的异步重算入口（同步钩子用） */
+  enqueue(familyId: bigint): void {
+    const key = familyId.toString();
+    if (this.pending.has(key)) return;
+    const run = this.recomputeFamily(familyId)
+      .catch((error) => {
+        this.logger.error(`family ${key} recompute failed: ${String(error)}`);
+      })
+      .finally(() => {
+        this.pending.delete(key);
+      });
+    this.pending.set(key, run);
+  }
+
+  async recomputeFamily(familyId: bigint): Promise<void> {
+    const family = await this.prisma.productFamily.findUnique({
+      where: { id: familyId },
+      include: {
+        originGoods: {
+          where: { delisted: false },
+          // 固定遍历序：保证"首次遇到序"（未知自由文本取值的相对顺序）确定性，重算幂等
+          orderBy: { id: 'asc' },
+          include: {
+            detail: true,
+            variants: { where: { enabled: true }, orderBy: { sortOrder: 'asc' } },
+            originGoodTags: { select: { tag: { select: { tagName: true } } } },
+          },
+        },
+        priceOverrides: true,
+      },
+    });
+    if (!family) return;
+
+    const members = family.originGoods;
+    const primary = members.find((m) => m.id === family.primaryOriginGoodId) ?? members[0] ?? null;
+
+    // 冲突裁决优先级：尺码覆盖最全 → 主链接 → id 升序（与设计 §7 一致）
+    const priority = [...members].sort((a, b) => {
+      const aRows = a.detail?.sizeChart ? ((a.detail.sizeChart as ChartLike).rows?.length ?? 0) : 0;
+      const bRows = b.detail?.sizeChart ? ((b.detail.sizeChart as ChartLike).rows?.length ?? 0) : 0;
+      if (bRows !== aRows) return bRows - aRows;
+      const aPrimary = a.id === primary?.id ? 1 : 0;
+      const bPrimary = b.id === primary?.id ? 1 : 0;
+      if (aPrimary !== bPrimary) return bPrimary - aPrimary;
+      return Number(a.id - b.id);
+    });
+
+    const sizeCharts = priority.map((m) => m.detail?.sizeChart as ChartLike | undefined);
+    const packageCharts = priority.map((m) => m.detail?.packageSpecs as ChartLike | undefined);
+    const sizeChart = unionChartRows(sizeCharts).length
+      ? { columns: firstColumns(sizeCharts), rows: unionChartRows(sizeCharts) }
+      : null;
+    const packageSpecs = unionChartRows(packageCharts).length
+      ? { columns: firstColumns(packageCharts), rows: unionChartRows(packageCharts) }
+      : null;
+    const matrix = derivePriceMatrix(members, family.priceOverrides);
+
+    if (family.autoManaged) {
+      await this.prisma.productFamily.update({
+        where: { id: family.id },
+        data: {
+          sizeChart: json(sizeChart),
+          packageSpecs: json(packageSpecs),
+          priceMatrix: json(matrix),
+          stale: false,
+          // canonical detail 仅在为空时从主链接初始化一次，人工编辑后永不被覆盖
+          ...(family.detail === null && primary?.detail
+            ? { detail: pickDetailText(primary.detail) }
+            : {}),
+        },
+      });
+    } else {
+      await this.prisma.productFamily.update({
+        where: { id: family.id },
+        data: { stale: true },
+      });
+    }
+    // 族物化 JSON（矩阵/尺码表）与成员口径变化 → public 列表价/详情族块失效。
+    // 人工接管族（autoManaged=false）虽未重写矩阵，但其成员/详情已变，goods 域同样失效。
+    this.publicCache.bump('goods', 'matrix');
+  }
+  /** 把链接的有效标签镜像到其名下商品（good 标签 = 链接标签 ∪ 非自动组既有标签） */
+  async mirrorLinkTagsToGoods(ogId: bigint): Promise<void> {
+    const rows = await this.prisma.originGoodTag.findMany({
+      where: { originGoodId: ogId },
+      select: { tagId: true },
+    });
+    const linkTagIds = rows.map((r) => r.tagId);
+    const goods = await this.prisma.good.findMany({
+      where: { originGoodId: ogId },
+      include: {
+        goodTags: { include: { tag: { select: { id: true, tagGroupId: true } } } },
+      },
+    });
+    if (!goods.length) return;
+    const groups = await this.prisma.tagGroup.findMany({
+      select: { id: true, groupName: true },
+    });
+    const autoGroupIds = new Set(
+      groups.filter((g) => isAutoTagGroupName(g.groupName)).map((g) => g.id.toString()),
+    );
+    for (const good of goods) {
+      const keep = good.goodTags
+        .filter((gt) => !autoGroupIds.has(gt.tag.tagGroupId?.toString() ?? ''))
+        .map((gt) => gt.tagId);
+      const target = [...new Set([...keep, ...linkTagIds])].sort((a, b) =>
+        Number(a - b),
+      );
+      const current = good.goodTags.map((gt) => gt.tagId).sort((a, b) => Number(a - b));
+      const same =
+        target.length === current.length && target.every((id, i) => id === current[i]);
+      if (same) continue;
+      await this.prisma.$transaction([
+        this.prisma.goodTag.deleteMany({ where: { goodId: good.id } }),
+        ...(!target.length
+          ? []
+          : [
+              this.prisma.goodTag.createMany({
+                data: target.map((tagId) => ({ goodId: good.id, tagId })),
+              }),
+            ]),
+      ]);
+    }
+  }
+
+
+}

apps/api/src/product-families/organize.service.spec.ts

@@ -0,0 +1,353 @@
+import { PublicCacheService } from '../public/public-cache.service';
+import { Test } from '@nestjs/testing';
+import { FamilyRecomputeService } from './family-recompute.service';
+import { ProductFamiliesService } from './product-families.service';
+import { OrganizeService } from './organize.service';
+import { OriginGoodsService } from '../origin-goods/origin-goods.service';
+import { PrismaService } from '../prisma/prisma.service';
+
+/**
+ * 整理服务（解析去运行时化后的唯一派生入口）：
+ * 1) 链接级：未人工接管的 SDS 链接按名称派生 origin_good_tags（manual=false）；
+ * 2) 商品级：good 标签镜像其链接的有效标签（保留非自动组人工标签）；
+ * 3) 人工接管（updateTags）后自动同步不再覆盖，恢复自动（resetTags）回到派生。
+ */
+describe('链接级标签：派生 / 人工接管 / 商品镜像', () => {
+  let recompute: FamilyRecomputeService;
+  let organize: OrganizeService;
+  let originGoods: OriginGoodsService;
+  let prisma: PrismaService;
+  const stamp = Date.now();
+  const ids = {
+    originGood: [] as bigint[],
+    family: [] as bigint[],
+    good: [] as bigint[],
+    country: [] as bigint[],
+    category: [] as bigint[],
+    group: [] as bigint[],
+    tag: [] as bigint[],
+  };
+
+  beforeAll(async () => {
+    const moduleRef = await Test.createTestingModule({
+      providers: [FamilyRecomputeService, ProductFamiliesService, OrganizeService, OriginGoodsService, PrismaService, PublicCacheService],
+    }).compile();
+    recompute = moduleRef.get(FamilyRecomputeService);
+    organize = moduleRef.get(OrganizeService);
+    originGoods = moduleRef.get(OriginGoodsService);
+    prisma = moduleRef.get(PrismaService);
+    await prisma.onModuleInit();
+
+    ids.country.push((await prisma.country.create({ data: { countryName: `标签同步国家-${stamp}` } })).id);
+    ids.category.push((await prisma.category.create({ data: { categoryName: `标签同步分类-${stamp}` } })).id);
+    // 人工分组（派生规则之外，标签应保留）
+    ids.group.push((await prisma.tagGroup.create({ data: { groupName: `风格${stamp}`, sortOrder: 9 } })).id);
+  });
+
+  afterAll(async () => {
+    await prisma.goodTag.deleteMany({ where: { goodId: { in: ids.good } } });
+    await prisma.good.deleteMany({ where: { id: { in: ids.good } } });
+    await prisma.originGoodTag.deleteMany({ where: { originGoodId: { in: ids.originGood } } });
+    await prisma.originGood.deleteMany({ where: { id: { in: ids.originGood } } });
+    await prisma.productFamily.deleteMany({ where: { id: { in: ids.family } } });
+    await prisma.tag.deleteMany({ where: { id: { in: ids.tag } } });
+    await prisma.tagGroup.deleteMany({ where: { id: { in: ids.group } } });
+    await prisma.country.deleteMany({ where: { id: { in: ids.country } } });
+    await prisma.category.deleteMany({ where: { id: { in: ids.category } } });
+    await prisma.$disconnect();
+  });
+
+  async function goodTagNames(goodId: bigint): Promise<string[]> {
+    const rows = await prisma.goodTag.findMany({ where: { goodId }, include: { tag: true } });
+    return rows.map((r) => r.tag.tagName).sort();
+  }
+
+  async function linkTagNames(ogId: bigint): Promise<string[]> {
+    const rows = await prisma.originGoodTag.findMany({ where: { originGoodId: ogId }, include: { tag: true } });
+    return rows.map((r) => r.tag.tagName).sort();
+  }
+
+  it('链接派生标签落在链接上，商品镜像链接标签；旧自动组标签剔除、人工分组保留', async () => {
+    const styleTag = await prisma.tag.create({ data: { tagName: `潮流${stamp}`, tagGroupId: ids.group[0] } });
+    ids.tag.push(styleTag.id);
+    const legacyPositionTag = await prisma.tag.findFirst({
+      where: { tagName: '单面印', tagGroup: { groupName: { contains: '印刷位置' } } },
+    });
+
+    const og1 = await prisma.originGood.create({
+      data: {
+        sdsGoodId: `tagsync-${stamp}-1`,
+        goodName: `美国（包邮）180g纯棉T恤成人款-DG${stamp}-单面印花`,
+        logisticsLabel: '包邮',
+        craftLabel: '单面印花',
+      },
+    });
+    const og2 = await prisma.originGood.create({
+      data: {
+        sdsGoodId: `tagsync-${stamp}-2`,
+        goodName: `美国（不包邮光板）180GT恤成人款-JS${stamp}-不打印·美西洛杉矶二仓`,
+        logisticsLabel: '不包邮光板',
+        craftLabel: '不打印',
+      },
+    });
+    ids.originGood.push(og1.id, og2.id);
+    const family = await prisma.productFamily.create({
+      data: { familyName: `标签同步族-${stamp}`, primaryOriginGoodId: og1.id },
+    });
+    ids.family.push(family.id);
+    await prisma.originGood.updateMany({
+      where: { id: { in: [og1.id, og2.id] } },
+      data: { familyId: family.id },
+    });
+
+    const good1 = await prisma.good.create({
+      data: {
+        originGoodId: og1.id,
+        familyId: family.id,
+        countryId: ids.country[0],
+        categoryId: ids.category[0],
+        goodName: `标签同步商品1-${stamp}`,
+      },
+    });
+    const good2 = await prisma.good.create({
+      data: {
+        originGoodId: og2.id,
+        familyId: family.id,
+        countryId: ids.country[0],
+        categoryId: ids.category[0],
+        goodName: `标签同步商品2-${stamp}`,
+      },
+    });
+    ids.good.push(good1.id, good2.id);
+    await prisma.goodTag.create({ data: { goodId: good1.id, tagId: styleTag.id } });
+    if (legacyPositionTag) {
+      await prisma.goodTag.create({ data: { goodId: good1.id, tagId: legacyPositionTag.id } });
+    }
+
+    const r1 = await organize.deriveFamilyTags(family.id);
+    expect(r1.linksUpdated).toBe(2);
+    expect(r1.goodsUpdated).toBe(2);
+
+    // 链接级：og1 → 单面印花/烫画/包邮；og2 → 不打印（光板归并为不打印）/不包邮
+    expect(await linkTagNames(og1.id)).toEqual(['包邮', '单面印花', '烫画']);
+    expect(await linkTagNames(og2.id)).toEqual(['不包邮', '不打印']);
+
+    // 商品级：镜像各自链接（+人工分组保留，旧自动组剔除）
+    const names1 = await goodTagNames(good1.id);
+    expect(names1).toEqual(expect.arrayContaining(['包邮', '烫画', '单面印花', `潮流${stamp}`]));
+    expect(names1).not.toContain('单面印');
+    const names2 = await goodTagNames(good2.id);
+    expect(names2).toEqual(['不包邮', '不打印']);
+    expect(names2).not.toContain('光板');
+    expect(names2).not.toContain('烫画');
+
+    // 幂等
+    const r2 = await organize.deriveFamilyTags(family.id);
+    expect(r2.linksUpdated).toBe(0);
+    expect(r2.goodsUpdated).toBe(0);
+  });
+
+  it('人工接管链接标签后自动同步不覆盖，商品跟随；恢复自动回到派生', async () => {
+    const og = await prisma.originGood.create({
+      data: {
+        sdsGoodId: `tagsync-manual-${stamp}`,
+        goodName: `美国（包邮）卫衣-DGM${stamp}-单面印花`,
+        logisticsLabel: '包邮',
+        craftLabel: '单面印花',
+      },
+    });
+    ids.originGood.push(og.id);
+    const family = await prisma.productFamily.create({
+      data: { familyName: `人工标签族-${stamp}`, primaryOriginGoodId: og.id },
+    });
+    ids.family.push(family.id);
+    await prisma.originGood.update({ where: { id: og.id }, data: { familyId: family.id } });
+    const good = await prisma.good.create({
+      data: {
+        originGoodId: og.id,
+        familyId: family.id,
+        countryId: ids.country[0],
+        categoryId: ids.category[0],
+        goodName: `人工标签商品-${stamp}`,
+      },
+    });
+    ids.good.push(good.id);
+
+    await organize.deriveFamilyTags(family.id);
+    expect(await linkTagNames(og.id)).toEqual(['包邮', '单面印花', '烫画']);
+
+    // 人工接管：解析错了（实际是直喷）→ 改成 直喷
+    const zhpena = await prisma.tag.findFirst({ where: { tagName: '直喷' } });
+    const baoyou = await prisma.tag.findFirst({ where: { tagName: '包邮' } });
+    const result = await originGoods.updateTags(og.id, [Number(zhpena!.id), Number(baoyou!.id)]);
+    expect(result.tagsManual).toBe(true);
+    // 人工勾了 直喷/包邮，缺印花数量维度 → 按名称自动补「单面印花」（缺啥补啥）
+    expect(result.tags.map((t) => t.tagName).sort()).toEqual(['包邮', '单面印花', '直喷']);
+    expect(result.filledDimensionTags).toEqual(['单面印花']);
+    expect(result.tags.every((t) => t.manual)).toBe(true);
+    // 商品镜像跟随人工修正（含补齐维度）
+    expect(await goodTagNames(good.id)).toEqual(['包邮', '单面印花', '直喷']);
+
+    // 再次族同步：人工行（含补齐行）不被覆盖
+    await organize.deriveFamilyTags(family.id);
+    expect(await linkTagNames(og.id)).toEqual(['包邮', '单面印花', '直喷']);
+    expect(await goodTagNames(good.id)).toEqual(['包邮', '单面印花', '直喷']);
+
+    // 恢复自动 → 回到名称派生结果
+    const reset = await originGoods.resetTags(og.id);
+    expect(reset.tagsManual).toBe(false);
+    expect(reset.tags.map((t) => t.tagName)).toEqual(['包邮', '单面印花', '烫画']);
+    expect(await goodTagNames(good.id)).toEqual(['包邮', '单面印花', '烫画']);
+  });
+
+  it('自定义来源链接不派生标签，仅镜像人工配置', async () => {
+    const ogCustom = await prisma.originGood.create({
+      data: {
+        source: 'CUSTOM',
+        sdsGoodId: `tagsync-custom-${stamp}`,
+        goodName: `自定义包邮T恤${stamp}`,
+      },
+    });
+    ids.originGood.push(ogCustom.id);
+    const family = await prisma.productFamily.create({
+      data: { familyName: `自定义标签族-${stamp}`, primaryOriginGoodId: ogCustom.id },
+    });
+    ids.family.push(family.id);
+    await prisma.originGood.update({ where: { id: ogCustom.id }, data: { familyId: family.id } });
+    const good = await prisma.good.create({
+      data: {
+        originGoodId: ogCustom.id,
+        familyId: family.id,
+        countryId: ids.country[0],
+        categoryId: ids.category[0],
+        goodName: `自定义标签商品-${stamp}`,
+      },
+    });
+    ids.good.push(good.id);
+
+    const r = await organize.deriveFamilyTags(family.id);
+    expect(r.linksUpdated).toBe(0);
+    expect(await goodTagNames(good.id)).toEqual([]);
+
+    // 自定义链接同样可人工配置标签
+    const baoyou = await prisma.tag.findFirst({ where: { tagName: '包邮' } });
+    await originGoods.updateTags(ogCustom.id, [Number(baoyou!.id)]);
+    expect(await goodTagNames(good.id)).toEqual(['包邮']);
+  });
+
+  it('族重算不解析不触碰标签：上游改名后重算，标签/矩阵维度保持不变（防倒灌）', async () => {
+    const og = await prisma.originGood.create({
+      data: {
+        sdsGoodId: `tagsync-nodrift-${stamp}`,
+        goodName: `美国（包邮）防倒灌T恤-ND${stamp}-单面印花`,
+      },
+    });
+    ids.originGood.push(og.id);
+    await prisma.originGoodVariant.create({
+      data: {
+        originGoodId: og.id,
+        sdsVariantId: `nd-v-${stamp}`,
+        sku: `ND${stamp}`,
+        sizeName: 'S',
+        price: 21,
+      },
+    });
+    const family = await prisma.productFamily.create({
+      data: { familyName: `防倒灌族-${stamp}`, primaryOriginGoodId: og.id },
+    });
+    ids.family.push(family.id);
+    await prisma.originGood.update({ where: { id: og.id }, data: { familyId: family.id } });
+
+    // 整理派生一次 → 标签就位，矩阵有格子
+    await organize.deriveFamilyTags(family.id);
+    await recompute.recomputeFamily(family.id);
+    const tagsBefore = await linkTagNames(og.id);
+    expect(tagsBefore).toEqual(['包邮', '单面印花', '烫画']);
+    let fam = await prisma.productFamily.findUniqueOrThrow({ where: { id: family.id } });
+    expect((fam.priceMatrix as any).rows).toHaveLength(1);
+
+    // 模拟上游改名（同步镜像只更新 goodName）→ 仅重算、不整理
+    await prisma.originGood.update({
+      where: { id: og.id },
+      data: { goodName: '美国（包邮）防倒灌T恤-ND0000-直喷双面' },
+    });
+    await recompute.recomputeFamily(family.id);
+
+    // 标签与矩阵维度保持派生时的快照，不随名称漂移
+    expect(await linkTagNames(og.id)).toEqual(tagsBefore);
+    fam = await prisma.productFamily.findUniqueOrThrow({ where: { id: family.id } });
+    const row = (fam.priceMatrix as any).rows[0];
+    expect(row.printCount).toBe('单面印花');
+    expect(row.craft).toBe('烫画');
+
+    // 显式整理后才按新名称刷新
+    await organize.deriveFamilyTags(family.id);
+    const refreshed = await linkTagNames(og.id);
+    expect(refreshed).toHaveLength(3);
+    expect(refreshed).toEqual(expect.arrayContaining(['包邮', '双面印花', '直喷']));
+  });
+
+  it('整理碎片合并：纯碎片族并入带商品族（保公开 goodId 稳定）并删除；多族带商品进人工复审', async () => {
+    const cat = `cat-frag-${stamp}`;
+    const mkFrag = async (suffix: string) => {
+      const og = await prisma.originGood.create({
+        data: { sdsGoodId: `frag-${stamp}-${suffix}`, goodName: `美国（包邮）碎片测试-FG1-单面印花-${suffix}`, sdsCategoryId: cat },
+      });
+      ids.originGood.push(og.id);
+      const f = await prisma.productFamily.create({
+        data: { familyName: `碎片族${stamp}-${suffix}`, primaryOriginGoodId: og.id },
+      });
+      ids.family.push(f.id);
+      await prisma.originGood.update({ where: { id: og.id }, data: { familyId: f.id } });
+      return { og, f };
+    };
+    const loose = await mkFrag('a'); // 纯碎片（无商品/无覆盖价）
+    const curated = await mkFrag('b'); // 带商品 → keeper（公开 goodId=族ID）
+    const good = await prisma.good.create({
+      data: {
+        goodName: `碎片商品${stamp}`,
+        originGoodId: curated.og.id,
+        familyId: curated.f.id,
+        countryId: ids.country[0],
+        categoryId: ids.category[0],
+      },
+    });
+    ids.good.push(good.id);
+    // 另一个也带商品的族 → 不自动动，进人工复审
+    const curated2 = await mkFrag('c');
+    const good2 = await prisma.good.create({
+      data: {
+        goodName: `碎片商品2${stamp}`,
+        originGoodId: curated2.og.id,
+        familyId: curated2.f.id,
+        countryId: ids.country[0],
+        categoryId: ids.category[0],
+      },
+    });
+    ids.good.push(good2.id);
+
+    try {
+      const result = await organize.consolidateFragments();
+      // 纯碎片族成员并入带商品族，碎片族被删除
+      const moved = await prisma.originGood.findUniqueOrThrow({ where: { id: loose.og.id } });
+      expect(moved.familyId).toBe(curated.f.id);
+      const gone = await prisma.productFamily.findUnique({ where: { id: loose.f.id } });
+      expect(gone).toBeNull();
+      // 带商品的族保留；两个带商品族互为碎片 → 较新的进人工复审
+      const kept = await prisma.productFamily.findUniqueOrThrow({ where: { id: curated.f.id } });
+      expect(kept).toBeTruthy();
+      const review = (result.manualReview ?? []).find((r: any) => r.fragmentFamilyId === String(curated2.f.id));
+      expect(review).toBeTruthy();
+      expect(review?.keeperFamilyId).toBe(String(curated.f.id));
+      expect(review?.reason).toContain('has-goods');
+    } finally {
+      await prisma.goodTag.deleteMany({ where: { goodId: { in: ids.good } } }).catch(() => undefined);
+      await prisma.good.deleteMany({ where: { id: { in: ids.good } } }).catch(() => undefined);
+      ids.good = [];
+      await prisma.productFamily.deleteMany({ where: { id: { in: ids.family } } }).catch(() => undefined);
+      ids.family = [];
+      await prisma.originGood.deleteMany({ where: { id: { in: ids.originGood } } }).catch(() => undefined);
+      ids.originGood = [];
+    }
+  });
+});

apps/api/src/product-families/organize.service.ts

@@ -0,0 +1,493 @@
+import { Injectable, Logger } from '@nestjs/common';
+import { PrismaService } from '../prisma/prisma.service';
+import { FamilyRecomputeService } from './family-recompute.service';
+import { ProductFamiliesService } from './product-families.service';
+import { PublicCacheService } from '../public/public-cache.service';
+import { parseOriginName } from './origin-name.parser';
+import {
+  DERIVED_TAG_GROUP_SPECS,
+  deriveLinkTagNames,
+  isAutoTagGroupName,
+  normalizeCraftTag,
+} from './auto-tag-rules';
+
+/**
+ * 整理服务（解析去运行时化的唯一解析入口）：
+ * 所有"按上游链接名解析/派生"的逻辑集中于此，由显式人工动作触发——
+ * CLI（pnpm --filter @inkreach/api organize）或后台「整理」按钮（POST /product-families/organize）。
+ *
+ * 运行时（同步/重算/公开读）永不解析名称：
+ * - 同步 = 纯镜像；族重算 = 结构化聚合（成员变体 + 链接标签 + 覆盖价）。
+ *
+ * 人工接管（tagsManual=true）的链接派生永不触碰；幂等可重跑。
+ */
+@Injectable()
+export class OrganizeService {
+  private readonly logger = new Logger(OrganizeService.name);
+
+  constructor(
+    private readonly prisma: PrismaService,
+    private readonly recompute: FamilyRecomputeService,
+    private readonly families: ProductFamiliesService,
+    private readonly publicCache: PublicCacheService,
+  ) {}
+
+  async organize() {
+    const labels = await this.backfillLabels();
+    const tags = await this.deriveAllTags();
+    const grouped = await this.families.autoGroup(true);
+    const fragments = await this.consolidateFragments();
+    const families = await this.prisma.productFamily.findMany({ select: { id: true } });
+    for (const f of families) {
+      await this.recompute.recomputeFamily(f.id);
+    }
+    const result = {
+      labelsParsed: labels.parsed,
+      labelsUnparsable: labels.unparsable,
+      linksUpdated: tags.linksUpdated,
+      goodsUpdated: tags.goodsUpdated,
+      familiesCreated: grouped.applied,
+      familiesMerged: grouped.merged,
+      familiesSkipped: grouped.skipped?.length ?? 0,
+      fragmentsConsolidated: fragments.consolidated,
+      fragmentsManualReview: fragments.manualReview.length,
+      familiesRecomputed: families.length,
+    };
+    this.logger.log(`organize done: ${JSON.stringify(result)}`);
+    // 整理是全量标签/归族/矩阵重写动作，三域全失效（末尾逐族重算只覆盖 goods+matrix，
+    // 标签镜像与标签组创建落在 meta 域）
+    this.publicCache.bump('meta', 'goods', 'matrix');
+    return result;
+  }
+
+  /**
+   * 碎片族合并：同一 SDS 分类出现多个族时（历史 autoGroup 只建不并所致），
+   * 把「纯碎片族」（autoManaged、无商品、无覆盖价）的成员并入最老族并删除空族；
+   * 带商品/覆盖价或人工锁定的碎片族保留，写进人工复审报告（由后台手动移动成员）。
+   * keeper 选择：同簇中最早带商品的族，否则最老的 autoManaged 族。
+   */
+  async consolidateFragments(): Promise<{
+    consolidated: number;
+    manualReview: Array<{ keeperFamilyId: string; fragmentFamilyId: string; reason: string }>;
+  }> {
+    const families = await this.prisma.productFamily.findMany({
+      select: { id: true, autoManaged: true },
+      orderBy: { id: 'asc' },
+    });
+    const members = await this.prisma.originGood.findMany({
+      where: { familyId: { not: null }, delisted: false },
+      select: { familyId: true, sdsCategoryId: true },
+    });
+    const goodCounts = await this.prisma.good.groupBy({
+      by: ['familyId'],
+      _count: { _all: true },
+      where: { familyId: { not: null } },
+    });
+    const goodsByFamily = new Map(goodCounts.map((g) => [g.familyId!.toString(), g._count._all]));
+    const overrideCounts = await this.prisma.familyPriceOverride.groupBy({
+      by: ['familyId'],
+      _count: { _all: true },
+    });
+    const overridesByFamily = new Map(
+      overrideCounts.map((o) => [o.familyId.toString(), o._count._all]),
+    );
+    const autoManagedById = new Map(families.map((f) => [f.id.toString(), f.autoManaged]));
+    const familyCatIds = new Map<string, Set<string>>();
+    for (const m of members) {
+      if (!m.sdsCategoryId) continue;
+      const key = m.familyId!.toString();
+      familyCatIds.set(key, (familyCatIds.get(key) ?? new Set()).add(m.sdsCategoryId));
+    }
+
+    // 按 SDS 分类聚簇：同分类的多个族互为碎片
+    const clusterByFamily = new Map<string, Set<string>>();
+    const catOwners = new Map<string, string[]>();
+    for (const f of families) {
+      const cats = familyCatIds.get(f.id.toString()) ?? new Set();
+      for (const cat of cats) {
+        const owners = catOwners.get(cat) ?? [];
+        owners.push(f.id.toString());
+        catOwners.set(cat, owners);
+      }
+    }
+    for (const owners of catOwners.values()) {
+      if (owners.length < 2) continue;
+      for (const id of owners) {
+        const cluster = clusterByFamily.get(id) ?? new Set();
+        owners.forEach((o) => cluster.add(o));
+        clusterByFamily.set(id, cluster);
+      }
+    }
+
+    let consolidated = 0;
+    const manualReview: Array<{ keeperFamilyId: string; fragmentFamilyId: string; reason: string }> = [];
+    const processedClusters = new Set<string>();
+    for (const [familyIdStr, cluster] of clusterByFamily) {
+      const sorted = [...cluster].sort((a, b) => Number(BigInt(a) - BigInt(b)));
+      const clusterKey = sorted.join(',');
+      if (processedClusters.has(clusterKey)) continue;
+      processedClusters.add(clusterKey);
+      // keeper：最早带商品的族，否则最老的 autoManaged 族
+      const withGoods = sorted.find((id) => (goodsByFamily.get(id) ?? 0) > 0);
+      const keeper =
+        withGoods ??
+        sorted.find((id) => autoManagedById.get(id) === true) ??
+        sorted[0];
+      for (const id of sorted) {
+        if (id === keeper) continue;
+        const reasons: string[] = [];
+        if ((goodsByFamily.get(id) ?? 0) > 0) reasons.push('has-goods');
+        if ((overridesByFamily.get(id) ?? 0) > 0) reasons.push('has-overrides');
+        if (autoManagedById.get(id) !== true) reasons.push('manual-locked');
+        if (reasons.length) {
+          manualReview.push({
+            keeperFamilyId: keeper,
+            fragmentFamilyId: id,
+            reason: reasons.join(','),
+          });
+          continue;
+        }
+        // 纯碎片：成员并入 keeper，删除空族
+        const keeperId = BigInt(keeper);
+        await this.prisma.originGood.updateMany({
+          where: { familyId: BigInt(id) },
+          data: { familyId: keeperId },
+        });
+        await this.prisma.good.updateMany({
+          where: { familyId: BigInt(id) },
+          data: { familyId: keeperId },
+        });
+        await this.prisma.productFamily.delete({ where: { id: BigInt(id) } });
+        consolidated += 1;
+      }
+      await this.recompute.recomputeFamily(BigInt(keeper));
+    }
+    return { consolidated, manualReview };
+  }
+
+  /**
+   * 回填结构化解析列（skuCode/logisticsLabel/craftLabel/warehouseLabel）。
+   * 只补 NULL 列——存量正确数据不覆盖（同步已不再写入这些列）。
+   */
+  async backfillLabels(): Promise<{ parsed: number; unparsable: number }> {
+    const ogs = await this.prisma.originGood.findMany({
+      where: {
+        OR: [
+          { skuCode: null },
+          { logisticsLabel: null },
+          { craftLabel: null },
+          { warehouseLabel: null },
+        ],
+      },
+      select: { id: true, goodName: true, skuCode: true, logisticsLabel: true, craftLabel: true, warehouseLabel: true },
+    });
+    let parsed = 0;
+    let unparsable = 0;
+    for (const og of ogs) {
+      const p = parseOriginName(og.goodName);
+      const next = {
+        skuCode: og.skuCode ?? p.skuCode,
+        logisticsLabel: og.logisticsLabel ?? p.logisticsLabel,
+        craftLabel: og.craftLabel ?? p.craftLabel,
+        warehouseLabel: og.warehouseLabel ?? p.warehouseLabel,
+      };
+      if (!p.skuCode && !p.craftLabel) unparsable += 1;
+      await this.prisma.originGood.update({ where: { id: og.id }, data: next });
+      parsed += 1;
+    }
+    // 结构化标签列是 CUSTOM 成员的矩阵归因来源（下次重算生效），保守失效 matrix+goods
+    this.publicCache.bump('goods', 'matrix');
+    return { parsed, unparsable };
+  }
+
+  /** 全量派生：未人工接管的 SDS 链接按名称刷新自动标签，人工接管不动；随后镜像商品并重算受影响族 */
+  async deriveAllTags(): Promise<{ linksUpdated: number; goodsUpdated: number; familiesRecomputed: number }> {
+    const families = await this.prisma.productFamily.findMany({
+      select: { id: true },
+      orderBy: { id: 'asc' },
+    });
+    let linksUpdated = 0;
+    let goodsUpdated = 0;
+    const touchedFamilies: bigint[] = [];
+    for (const f of families) {
+      const r = await this.deriveFamilyTags(f.id);
+      linksUpdated += r.linksUpdated;
+      goodsUpdated += r.goodsUpdated;
+      if (r.linksUpdated > 0 || r.goodsUpdated > 0) touchedFamilies.push(f.id);
+    }
+    // 散链接（无族）也派生并镜像，保证族化之前标签已就绪
+    const loose = await this.prisma.originGood.findMany({
+      where: { familyId: null, delisted: false, source: 'SDS', tagsManual: false },
+      select: { id: true },
+    });
+    for (const og of loose) {
+      const r = await this.deriveTagsForOg(og.id);
+      linksUpdated += r.linksUpdated;
+    }
+    for (const fid of touchedFamilies) {
+      await this.recompute.recomputeFamily(fid);
+    }
+    // 标签镜像（good_tags）落 meta 域；散链接无族不会被重算覆盖，入口统一失效
+    this.publicCache.bump('meta', 'goods', 'matrix');
+    return { linksUpdated, goodsUpdated, familiesRecomputed: touchedFamilies.length };
+  }
+
+  /**
+   * 族 → 标签派生（标签与「产品链接」一一对应）：
+   * 1) 链接级：未人工接管（tagsManual=false）的 SDS 链接，按链接名称刷新
+   *    origin_good_tags 的派生行（manual=false）；人工行（manual=true）永远保留；
+   * 2) 商品级镜像：good 标签 = 自身链接的有效标签 ∪ 非自动组的既有标签。
+   * 仅更新发生变化的行，幂等。
+   */
+  async deriveFamilyTags(
+    familyId: bigint,
+  ): Promise<{ goodsUpdated: number; linksUpdated: number }> {
+    const tagMap = await this.ensureDerivedTagMap();
+    const family = await this.prisma.productFamily.findUnique({
+      where: { id: familyId },
+      include: {
+        originGoods: {
+          where: { delisted: false },
+          include: { originGoodTags: true },
+        },
+      },
+    });
+    if (!family) return { goodsUpdated: 0, linksUpdated: 0 };
+
+    let linksUpdated = 0;
+    for (const og of family.originGoods) {
+      if (og.tagsManual || og.source !== 'SDS') continue;
+      const derivedIds = this.resolveDerivedIds(og.goodName, tagMap);
+      const autoRows = og.originGoodTags.filter((r) => !r.manual);
+      const currentIds = autoRows.map((r) => r.tagId).sort((a, b) => Number(a - b));
+      const same =
+        derivedIds.length === currentIds.length &&
+        derivedIds.every((id, i) => id === currentIds[i]);
+      if (same) continue;
+      await this.prisma.$transaction([
+        this.prisma.originGoodTag.deleteMany({
+          where: { originGoodId: og.id, manual: false },
+        }),
+        ...(!derivedIds.length
+          ? []
+          : [
+              this.prisma.originGoodTag.createMany({
+                data: derivedIds.map((tagId) => ({
+                  originGoodId: og.id,
+                  tagId,
+                  manual: false,
+                })),
+              }),
+            ]),
+      ]);
+      linksUpdated += 1;
+    }
+
+    // 商品级镜像：派生写入后重新读取链接标签（上面的 include 是派生前快照）
+    const familyOgIds = family.originGoods.map((o) => o.id);
+    const freshRows = familyOgIds.length
+      ? await this.prisma.originGoodTag.findMany({
+          where: { originGoodId: { in: familyOgIds } },
+        })
+      : [];
+    const tagsByOg = new Map<string, bigint[]>();
+    for (const r of freshRows) {
+      const key = r.originGoodId.toString();
+      tagsByOg.set(key, [...(tagsByOg.get(key) ?? []), r.tagId]);
+    }
+
+    const goods = await this.prisma.good.findMany({
+      where: { familyId },
+      include: {
+        goodTags: { include: { tag: { select: { id: true, tagGroupId: true } } } },
+        originGood: { select: { id: true } },
+      },
+    });
+    const strayOgIds = [
+      ...new Set(
+        goods
+          .map((g) => g.originGood?.id.toString())
+          .filter((id): id is string => !!id && !tagsByOg.has(id)),
+      ),
+    ];
+    if (strayOgIds.length) {
+      const rows = await this.prisma.originGoodTag.findMany({
+        where: { originGoodId: { in: strayOgIds.map((v) => BigInt(v)) } },
+      });
+      for (const r of rows) {
+        const key = r.originGoodId.toString();
+        tagsByOg.set(key, [...(tagsByOg.get(key) ?? []), r.tagId]);
+      }
+    }
+
+    const { autoGroupIds } = await this.autoGroupIds();
+    let goodsUpdated = 0;
+    for (const good of goods) {
+      const linkTagIds = good.originGood
+        ? (tagsByOg.get(good.originGood.id.toString()) ?? [])
+        : [];
+      const keep = good.goodTags
+        .filter((gt) => !autoGroupIds.has(gt.tag.tagGroupId?.toString() ?? ''))
+        .map((gt) => gt.tagId);
+      const target = [...new Set([...keep, ...linkTagIds])].sort((a, b) =>
+        Number(a - b),
+      );
+      const current = good.goodTags.map((gt) => gt.tagId).sort((a, b) => Number(a - b));
+      const same =
+        target.length === current.length && target.every((id, i) => id === current[i]);
+      if (same) continue;
+      await this.prisma.$transaction([
+        this.prisma.goodTag.deleteMany({ where: { goodId: good.id } }),
+        ...(!target.length
+          ? []
+          : [
+              this.prisma.goodTag.createMany({
+                data: target.map((tagId) => ({ goodId: good.id, tagId })),
+              }),
+            ]),
+      ]);
+      goodsUpdated += 1;
+    }
+    this.publicCache.bump('meta', 'goods');
+    return { goodsUpdated, linksUpdated };
+  }
+
+  /**
+   * 单链接派生（供「恢复自动」等显式人工动作复用）：
+   * 未人工接管时按名称刷新派生标签，并把有效标签镜像到其名下商品。
+   */
+  async deriveTagsForOg(ogId: bigint): Promise<{ linksUpdated: number }> {
+    const og = await this.prisma.originGood.findUnique({
+      where: { id: ogId },
+      include: { originGoodTags: true },
+    });
+    if (!og) return { linksUpdated: 0 };
+    let linksUpdated = 0;
+    if (!og.tagsManual && og.source === 'SDS') {
+      const tagMap = await this.ensureDerivedTagMap();
+      const derivedIds = this.resolveDerivedIds(og.goodName, tagMap);
+      await this.prisma.$transaction([
+        this.prisma.originGoodTag.deleteMany({
+          where: { originGoodId: og.id, manual: false },
+        }),
+        ...(!derivedIds.length
+          ? []
+          : [
+              this.prisma.originGoodTag.createMany({
+                data: derivedIds.map((tagId) => ({
+                  originGoodId: og.id,
+                  tagId,
+                  manual: false,
+                })),
+              }),
+            ]),
+      ]);
+      linksUpdated = 1;
+    }
+    await this.recompute.mirrorLinkTagsToGoods(og.id);
+    this.publicCache.bump('meta', 'goods');
+    return { linksUpdated };
+  }
+
+  /**
+   * 人工标签缺维补齐：三个定价维度组（印花数量/工艺/物流）任一组在当前标签里
+   * 没有封闭词表取值时，按链接名称派生补上；工艺维度经别名归一后判断（热转印≈烫画）。
+   * 人工已勾的维度永不覆盖；名称派生不出该维度时不补（由调用方提示）。
+   */
+  async fillMissingDimTags(
+    goodName: string | null,
+    currentTagIds: bigint[],
+  ): Promise<{ tagIds: bigint[]; names: string[] }> {
+    const tagMap = await this.ensureDerivedTagMap();
+    const current = currentTagIds.length
+      ? await this.prisma.tag.findMany({
+          where: { id: { in: currentTagIds } },
+          select: { tagName: true },
+        })
+      : [];
+    const currentNames = new Set(current.map((t) => normalizeCraftTag(t.tagName)));
+    const derivedNames = deriveLinkTagNames(goodName);
+    const missingNames: string[] = [];
+    for (const spec of DERIVED_TAG_GROUP_SPECS) {
+      if (spec.tags.some((name) => currentNames.has(name))) continue;
+      const fromName = spec.tags.find((name) => derivedNames.includes(name));
+      if (fromName) missingNames.push(fromName);
+    }
+    const tagIds = missingNames
+      .map((name) => tagMap.get(name))
+      .filter((id): id is bigint => id !== undefined);
+    return { tagIds, names: missingNames };
+  }
+
+  private async autoGroupIds(): Promise<{ autoGroupIds: Set<string> }> {
+    const groups = await this.prisma.tagGroup.findMany({
+      select: { id: true, groupName: true },
+    });
+    return {
+      autoGroupIds: new Set(
+        groups
+          .filter((g) => isAutoTagGroupName(g.groupName))
+          .map((g) => g.id.toString()),
+      ),
+    };
+  }
+
+  private resolveDerivedIds(
+    name: string | null | undefined,
+    tagMap: Map<string, bigint>,
+  ): bigint[] {
+    return [
+      ...new Set(
+        deriveLinkTagNames(name)
+          .map((n) => tagMap.get(n))
+          .filter((id): id is bigint => id !== undefined),
+      ),
+    ].sort((a, b) => Number(a - b));
+  }
+
+  /** 确保派生标签组与标签存在，返回「标签名 → 标签 id」映射（并发下取最小 id，天然去重） */
+  private async ensureDerivedTagMap(): Promise<Map<string, bigint>> {
+    const map = new Map<string, bigint>();
+    for (const spec of DERIVED_TAG_GROUP_SPECS) {
+      const findGroups = () =>
+        this.prisma.tagGroup.findMany({
+          where: { groupName: { contains: spec.group } },
+          orderBy: { id: 'asc' },
+        });
+      let group = (await findGroups())[0] ?? null;
+      if (!group) {
+        try {
+          group = await this.prisma.tagGroup.create({ data: { groupName: spec.group } });
+        } catch {
+          group = (await findGroups())[0] ?? null;
+        }
+      }
+      if (!group) continue;
+
+      const tags = await this.prisma.tag.findMany({
+        where: { tagGroupId: group.id, tagName: { in: spec.tags } },
+        orderBy: { id: 'asc' },
+      });
+      for (const tagName of spec.tags) {
+        const existing = tags.find((t) => t.tagName === tagName);
+        if (existing) {
+          map.set(tagName, existing.id);
+          continue;
+        }
+        try {
+          const created = await this.prisma.tag.create({
+            data: { tagGroupId: group.id, tagName },
+          });
+          map.set(tagName, created.id);
+        } catch {
+          const fallback = await this.prisma.tag.findFirst({
+            where: { tagGroupId: group.id, tagName },
+            orderBy: { id: 'asc' },
+          });
+          if (fallback) map.set(tagName, fallback.id);
+        }
+      }
+    }
+    return map;
+  }
+}

apps/api/src/product-families/origin-name.parser.spec.ts

@@ -0,0 +1,142 @@
+import { parseOriginName, originGroupKey, familyNameKey } from './origin-name.parser';
+
+describe('parseOriginName', () => {
+  it('解析完整四段名（含仓库）', () => {
+    expect(
+      parseOriginName('美国（不包邮）240g涤纶休闲短裤-DG206-单面印花-美西洛杉矶一仓'),
+    ).toEqual({
+      country: '美国',
+      logisticsLabel: '不包邮',
+      productName: '240g涤纶休闲短裤',
+      skuCode: 'DG206',
+      craftLabel: '单面印花',
+      warehouseLabel: '美西洛杉矶一仓',
+    });
+  });
+
+  it('解析三段名（无仓库）', () => {
+    expect(
+      parseOriginName('墨西哥（不包邮）180g纯棉女装修身T恤-METP001-单面印花'),
+    ).toEqual({
+      country: '墨西哥',
+      logisticsLabel: '不包邮',
+      productName: '180g纯棉女装修身T恤',
+      skuCode: 'METP001',
+      craftLabel: '单面印花',
+      warehouseLabel: null,
+    });
+  });
+
+  it('物流备注含星号等符号原样保留', () => {
+    const r = parseOriginName(
+      '波兰（包邮*运费订单结算时支付）250g男女同款抓毛圆领卫衣-PLHM002-双面印花',
+    );
+    expect(r.logisticsLabel).toBe('包邮*运费订单结算时支付');
+    expect(r.skuCode).toBe('PLHM002');
+  });
+
+  it('半角括号也能解析', () => {
+    const r = parseOriginName('美国(包邮)T恤-DG001-单面印花');
+    expect(r.country).toBe('美国');
+    expect(r.logisticsLabel).toBe('包邮');
+    expect(r.productName).toBe('T恤');
+  });
+
+  it('段1无括号时 country=整段、物流为空', () => {
+    const r = parseOriginName('美国T恤-DG001-单面印花');
+    expect(r.country).toBe('美国T恤');
+    expect(r.logisticsLabel).toBeNull();
+    expect(r.productName).toBeNull();
+  });
+
+  it('两段名：只解析国家/物流/品名/SKU', () => {
+    const r = parseOriginName('美国（包邮）T恤-DG001');
+    expect(r.skuCode).toBe('DG001');
+    expect(r.craftLabel).toBeNull();
+    expect(r.warehouseLabel).toBeNull();
+  });
+
+  it('半角/全角括号混用（美国(不包邮）…）按混合对解析', () => {
+    const r = parseOriginName('美国(不包邮）女士高弹中长款瑜伽运动裤-JSD004-单面印花-美西洛杉矶一仓');
+    expect(r.country).toBe('美国');
+    expect(r.logisticsLabel).toBe('不包邮');
+    expect(r.productName).toBe('女士高弹中长款瑜伽运动裤');
+    expect(r.skuCode).toBe('JSD004');
+  });
+
+  it('一段名/空值/null 安全', () => {
+    expect(parseOriginName('随便一个名字').skuCode).toBeNull();
+    expect(parseOriginName('随便一个名字').country).toBe('随便一个名字');
+    expect(parseOriginName(null).country).toBeNull();
+    expect(parseOriginName('').country).toBeNull();
+  });
+
+  it('段前后空格被 trim', () => {
+    const r = parseOriginName('美国（包邮） T恤 - DG001 - 单面印花');
+    expect(r.skuCode).toBe('DG001');
+    expect(r.craftLabel).toBe('单面印花');
+    expect(r.productName).toBe('T恤');
+  });
+
+  it('仓库段含连字符时整体保留', () => {
+    const r = parseOriginName('美国（包邮）T恤-DG001-单面印花-某仓-二期');
+    expect(r.warehouseLabel).toBe('某仓-二期');
+  });
+});
+
+describe('originGroupKey', () => {
+  it('与 admin truncateToProcess 语义一致：前3段', () => {
+    expect(originGroupKey('美国（包邮）T恤-DG001-单面印花-美西一仓')).toBe(
+      '美国（包邮）T恤-DG001-单面印花',
+    );
+  });
+
+  it('物流差异导致不同组', () => {
+    expect(originGroupKey('美国（不包邮）T恤-DG001-单面印花')).not.toBe(
+      originGroupKey('美国（包邮）T恤-DG001-单面印花'),
+    );
+  });
+
+  it('空名返回空串', () => {
+    expect(originGroupKey(null)).toBe('');
+    expect(originGroupKey('')).toBe('');
+  });
+});
+
+describe('familyNameKey（族语义分组键）', () => {
+  it('物流差异同键：包邮/不包邮归一族', () => {
+    expect(familyNameKey('英国（不包邮）鼠标垫-GBIU017-单面印花')).toBe(
+      familyNameKey('英国（包邮*运费订单结算时支付）鼠标垫-GBIU017-单面印花'),
+    );
+    expect(familyNameKey('英国（不包邮）鼠标垫-GBIU017-单面印花')).toBe('英国鼠标垫-GBIU017');
+  });
+
+  it('工艺/仓库段不参与：跨工艺归一族', () => {
+    expect(familyNameKey('美国（包邮）T恤-DG001-单面印花-美西一仓')).toBe(
+      familyNameKey('美国（不包邮）T恤-DG001-双面印花'),
+    );
+  });
+
+  it('不同 SKU / 不同国家不同键', () => {
+    expect(familyNameKey('美国（包邮）T恤-DG001-单面印花')).not.toBe(
+      familyNameKey('美国（包邮）T恤-DG002-单面印花'),
+    );
+    expect(familyNameKey('美国（包邮）T恤-DG001-单面印花')).not.toBe(
+      familyNameKey('英国（包邮）T恤-DG001-单面印花'),
+    );
+  });
+
+  it('半角/全角括号混用与无括号都能出键', () => {
+    expect(familyNameKey('美国(不包邮）T恤-DG001-单面印花')).toBe('美国T恤-DG001');
+    expect(familyNameKey('美国T恤-DG001-单面印花')).toBe('美国T恤-DG001');
+  });
+
+  it('无 SKU 段时仅用品名段', () => {
+    expect(familyNameKey('美国（包邮）T恤')).toBe('美国T恤');
+  });
+
+  it('空名返回空串', () => {
+    expect(familyNameKey(null)).toBe('');
+    expect(familyNameKey('')).toBe('');
+  });
+});

apps/api/src/product-families/origin-name.parser.ts

@@ -0,0 +1,91 @@
+/**
+ * 原产品链接名结构化解析。
+ *
+ * 名称格式（与 admin 端 utils/origin-name.ts 的调查结论一致）：
+ * `国家（物流备注）品名-SKU-工艺位置[-仓库名]`
+ *
+ * 仓库段为可选；段与段之间以 `-` 分隔，段 1 内国家与物流备注以全角（或半角）括号分隔。
+ * 解析失败的字段置 null，不抛异常 —— 上游名称是自由文本，解析器必须容错。
+ */
+export interface ParsedOriginName {
+  country: string | null;
+  logisticsLabel: string | null;
+  productName: string | null;
+  skuCode: string | null;
+  craftLabel: string | null;
+  warehouseLabel: string | null;
+}
+
+const EMPTY: ParsedOriginName = {
+  country: null,
+  logisticsLabel: null,
+  productName: null,
+  skuCode: null,
+  craftLabel: null,
+  warehouseLabel: null,
+};
+
+function splitSegment1(seg: string): Pick<ParsedOriginName, 'country' | 'logisticsLabel' | 'productName'> {
+  // SDS 上游名称存在半角/全角括号混用（如 `美国(不包邮）…`），先归一成全角再配对
+  const normalized = seg.replace(/\(/g, '（').replace(/\)/g, '）');
+  const openAt = normalized.indexOf('（');
+  if (openAt >= 0) {
+    const closeAt = normalized.indexOf('）', openAt);
+    if (closeAt > openAt) {
+      return {
+        country: normalized.slice(0, openAt).trim() || null,
+        logisticsLabel: normalized.slice(openAt + 1, closeAt).trim() || null,
+        productName: normalized.slice(closeAt + 1).trim() || null,
+      };
+    }
+  }
+  return { country: normalized.trim() || null, logisticsLabel: null, productName: null };
+}
+
+export function parseOriginName(name: string | null | undefined): ParsedOriginName {
+  if (!name) return EMPTY;
+  const segs = name.split('-').map((s) => s.trim());
+  if (segs.length === 0 || segs[0] === '') return EMPTY;
+  return {
+    ...splitSegment1(segs[0]),
+    skuCode: segs[1] || null,
+    craftLabel: segs[2] || null,
+    // 仓库名本身可能含连字符，第 4 段起整体保留
+    warehouseLabel: segs.length > 3 ? segs.slice(3).join('-') : null,
+  };
+}
+
+/**
+ * 分组键：与 admin 端 truncateToProcess（KEEP_SEGMENTS = 3）语义一致，
+ * 保留按 `-` 分段的前 3 段，丢弃可选的仓库名段。
+ */
+export function originGroupKey(name: string | null | undefined): string {
+  if (!name) return '';
+  return name.split('-').slice(0, 3).join('-');
+}
+
+/**
+ * 族语义分组键（自动建族/归族的回退键）：第 1 段剥离（物流备注）括号内容，
+ * 保留 国家+品名，拼接 SKU 段，丢弃工艺/仓库段 —— 物流、工艺、印花是价格矩阵
+ * 维度而非分族维度，同款链接（同国家+品名+SKU）必须归一族。
+ */
+export function familyNameKey(name: string | null | undefined): string {
+  if (!name) return '';
+  const segs = name.split('-').map((s) => s.trim());
+  const head = segs[0] ?? '';
+  if (!head) return '';
+  // 半角/全角括号混用先归一（与 splitSegment1 一致）
+  const normalized = head.replace(/\(/g, '（').replace(/\)/g, '）');
+  const openAt = normalized.indexOf('（');
+  let stripped = normalized;
+  if (openAt >= 0) {
+    const closeAt = normalized.indexOf('）', openAt);
+    if (closeAt > openAt) {
+      stripped = normalized.slice(0, openAt) + normalized.slice(closeAt + 1);
+    }
+  }
+  stripped = stripped.trim();
+  const sku = segs[1] ?? '';
+  if (!stripped) return sku || '';
+  return sku ? `${stripped}-${sku}` : stripped;
+}