From 79b6f76654aab46b25ced6b6392e0480aea645f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Sun, 22 Nov 2026 16:19:43 +0800 Subject: [PATCH] =?UTF-8?q?fix(jd-database):=20=E4=BA=9A=E9=A9=AC=E9=80=8A?= =?UTF-8?q?=E4=BE=A7=E5=88=86=E7=BB=84=E4=B8=8B=E6=8B=89=E6=8C=89=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E5=BD=92=E5=B1=9E=E8=BF=87=E6=BB=A4=E2=80=94=E2=80=94?= =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E6=A1=A3=E7=BB=84=E4=B8=8D=E5=86=8D=E6=BC=8F?= =?UTF-8?q?=E8=BF=9B=E4=BA=9A=E9=A9=AC=E9=80=8A=E4=BE=A7=EF=BC=882026-11-2?= =?UTF-8?q?2=20=E7=94=A8=E6=88=B7=E5=8F=A3=E5=BE=84=E3=80=8C=E4=BA=AC?= =?UTF-8?q?=E4=B8=9C=E5=88=9B=E5=BB=BA=E7=9A=84=E5=88=86=E7=BB=84=E5=B0=B1?= =?UTF-8?q?=E5=BD=92=E5=B1=9E=E4=BA=AC=E4=B8=9C=20=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E5=B0=B1=E5=8F=AA=E8=83=BD=E6=98=BE=E7=A4=BA=E4=BA=AC=E4=B8=9C?= =?UTF-8?q?=E5=88=86=E7=BB=84=E7=AE=A1=E7=90=86=E7=9A=84=20=E4=BA=9A?= =?UTF-8?q?=E9=A9=AC=E9=80=8A=E7=9A=84=E4=B9=9F=E6=98=AF=E5=90=8C=E7=90=86?= =?UTF-8?q?=E3=80=8D=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - shop-manage-api.ts::fetchShopManageGroups / dedupe-total-api.ts::fetchDedupeTotalGroups 恒带 platform=amazon(company_id 条件透传不变,后端 listGroups 本就支持该参数,零后端改动)——查询ASIN/跟价/去重/外观专利清理 4 个亚马逊域页面的分组下拉此前会把京东-团队/测试1111 等 jd 档组漏进来 - 京东侧无需改动:三条建组路径(分组管理页按平台 tab、京东分类弹窗直建恒 jd、后端缺省 amazon)打档正确,JdCategoryScopeService.retainJdPlatformGroups 平台闸已在线上(本轮云助手只读探针实证:测试1111=公司4阿华66 11-18 京东档建的合法工作组;admin 平台超管看所有、公司超管看公司下所有=现行口径,用户拍板维持) - 测试:新增 tests/group-dropdown-platform-scope.test.ts(恒 amazon+company_id 透传不丢+分组管理页仍跟平台 tab 反向钉);company-tab-wiring.test.ts 精确行钉同步;source-pin-ledger.json 重生成(+1 文件/+2 例/+2 钉,delta 仅本窗) - 验证:vue-tsc rc=0;后管全量 node --test 1959/1959 绿;fast 闸后管面 9 格全绿(分 8.8,账本 2026-11-22T16:1x);客户端/用户端红格为另窗在飞件非本笔 --- .../src/pages/asin/dedupe-total-api.ts | 4 +- .../src/pages/shop/shop-manage-api.ts | 4 +- .../tests/baselines/source-pin-ledger.json | 13 ++++-- .../tests/company-tab-wiring.test.ts | 2 +- .../group-dropdown-platform-scope.test.ts | 41 +++++++++++++++++++ 5 files changed, 57 insertions(+), 7 deletions(-) create mode 100644 admin-frontend-vue/tests/group-dropdown-platform-scope.test.ts diff --git a/admin-frontend-vue/src/pages/asin/dedupe-total-api.ts b/admin-frontend-vue/src/pages/asin/dedupe-total-api.ts index de3df3ee5..a8756c91c 100644 --- a/admin-frontend-vue/src/pages/asin/dedupe-total-api.ts +++ b/admin-frontend-vue/src/pages/asin/dedupe-total-api.ts @@ -38,6 +38,8 @@ export async function deleteDedupeTotal(id: number): Promise { /** 加载数据权限分组选项:GET /shop-manages/groups → {id,name,leaderUserId}[]。 */ export async function fetchDedupeTotalGroups(companyId?: number | null): Promise { // null 由发送口自己丢掉(不依赖 axios 丢 null):非超管/未选 tab 时不发 company_id,后端按会话裁剪。 - const { data } = await http.get(DEDUPE_GROUPS_ENDPOINT, { params: companyId != null ? { company_id: companyId } : {} }) + // platform 恒 'amazon'(2026-11-22 用户口径「亚马逊的也是同理」):去重/ASIN 面是亚马逊域, + // 京东档分组(platform='jd')不得混进本下拉——与分组管理页按平台 tab 过滤同口径。 + const { data } = await http.get(DEDUPE_GROUPS_ENDPOINT, { params: { platform: 'amazon', ...(companyId != null ? { company_id: companyId } : {}) } }) return parseDedupeGroupOptionList(data) } diff --git a/admin-frontend-vue/src/pages/shop/shop-manage-api.ts b/admin-frontend-vue/src/pages/shop/shop-manage-api.ts index 7c59fc2d7..6c49a4875 100644 --- a/admin-frontend-vue/src/pages/shop/shop-manage-api.ts +++ b/admin-frontend-vue/src/pages/shop/shop-manage-api.ts @@ -38,7 +38,9 @@ export const SHOP_MANAGE_GROUPS_ENDPOINT = '/api/admin/shop-manages/groups' /** 分组下拉:打的是与分组管理页同一个 GET /groups,所以它也必须跟着公司 tab 收窄, * 否则店铺列表窄了、下拉里还选得到别家的组。 */ export async function fetchShopManageGroups(companyId?: number | null): Promise { - const { data } = await http.get(SHOP_MANAGE_GROUPS_ENDPOINT, { params: companyId != null ? { company_id: companyId } : {} }) + // platform 恒 'amazon'(2026-11-22 用户口径「亚马逊的也是同理」):店铺/查询ASIN/跟价页是 + // 亚马逊域,京东档分组(platform='jd')不得混进本下拉——与分组管理页按平台 tab 过滤同口径。 + const { data } = await http.get(SHOP_MANAGE_GROUPS_ENDPOINT, { params: { platform: 'amazon', ...(companyId != null ? { company_id: companyId } : {}) } }) return parseShopManageGroups(data) } diff --git a/admin-frontend-vue/tests/baselines/source-pin-ledger.json b/admin-frontend-vue/tests/baselines/source-pin-ledger.json index 9d8b19c75..270c6fbce 100644 --- a/admin-frontend-vue/tests/baselines/source-pin-ledger.json +++ b/admin-frontend-vue/tests/baselines/source-pin-ledger.json @@ -1,10 +1,10 @@ { "note": "readSource 钉子逐文件基线。两把尺子:pins=落在用例体内的读盘,reads=全文读点总数(含模块级夹具与 helper)。都只许减;pins 下降而 reads 没同步下降=把读盘挪出体内,不算改进。由 tests/source-pin-ratchet.test.ts 生成。", "totals": { - "files": 263, - "cases": 1855, - "pins": 460, - "reads": 658 + "files": 264, + "cases": 1857, + "pins": 462, + "reads": 663 }, "files": { "admin-scaffold.test.ts": { @@ -307,6 +307,11 @@ "pins": 1, "reads": 1 }, + "group-dropdown-platform-scope.test.ts": { + "cases": 2, + "pins": 2, + "reads": 5 + }, "jd-category-tree.test.ts": { "cases": 14, "pins": 0, diff --git a/admin-frontend-vue/tests/company-tab-wiring.test.ts b/admin-frontend-vue/tests/company-tab-wiring.test.ts index e117aafda..d1a9d0ec2 100644 --- a/admin-frontend-vue/tests/company-tab-wiring.test.ts +++ b/admin-frontend-vue/tests/company-tab-wiring.test.ts @@ -98,7 +98,7 @@ const SEND_POINTS: ReadonlyArray = [ { menuKey: 'admin_task_center', file: 'src/pages/task-center/task-center-model.ts', fn: 'buildTaskQuery', line: TASK_CENTER_SEND_LINE, window: TASK_CENTER_WINDOW, title: '任务列表 query 构造器' }, { menuKey: 'admin_task_center', file: 'src/pages/task-center/task-center-model.ts', fn: 'buildVariantQuery', line: TASK_CENTER_SEND_LINE, window: TASK_CENTER_WINDOW, title: '变体采集 query 构造器' }, { menuKey: 'admin_dedupe_total_data', file: 'src/pages/asin/dedupe-total-api.ts', fn: 'fetchDedupeTotalList', line: 'if (params.companyId != null) query.company_id = params.companyId', window: 400, title: 'GET /dedupe-total-data 列表' }, - { menuKey: 'admin_dedupe_total_data', file: 'src/pages/asin/dedupe-total-api.ts', fn: 'fetchDedupeTotalGroups', line: 'http.get(DEDUPE_GROUPS_ENDPOINT, { params: companyId != null ? { company_id: companyId } : {} })', window: 400, title: 'GET /shop-manages/groups 分组候选(与店铺管理同源,两页口径要对得上)' }, + { menuKey: 'admin_dedupe_total_data', file: 'src/pages/asin/dedupe-total-api.ts', fn: 'fetchDedupeTotalGroups', line: 'http.get(DEDUPE_GROUPS_ENDPOINT, { params: { platform: \'amazon\', ...(companyId != null ? { company_id: companyId } : {}) } })', window: 400, title: 'GET /shop-manages/groups 分组候选(与店铺管理同源,两页口径要对得上;2026-11-22 用户口径「亚马逊的也是同理」——platform 恒 amazon,京东档组不进本下拉)' }, { menuKey: 'admin_dedupe_total_data', file: 'src/pages/asin/dedupe-total-export.ts', fn: 'buildDedupeExportParams', line: 'if (companyId != null) params.company_id = String(companyId)', window: 800, title: 'GET /dedupe-total-data/export 导出' }, { menuKey: 'admin_dedupe_total_data', file: 'src/pages/asin/dedupe-import-api.ts', fn: 'startDedupeImport', line: "if (companyId != null) form.append('company_id', String(companyId))", window: 400, title: 'POST /dedupe-total-data/import 新增导入(写侧归属,不发就落进操作者自己那一家)' }, { menuKey: 'admin_dedupe_total_data', file: 'src/pages/asin/dedupe-import-api.ts', fn: 'startDedupeDeleteImport', line: "if (companyId != null) form.append('company_id', String(companyId))", window: 900, title: 'POST /dedupe-total-data/delete-import 删除导入(不发就会按别家的值删错行)' }, diff --git a/admin-frontend-vue/tests/group-dropdown-platform-scope.test.ts b/admin-frontend-vue/tests/group-dropdown-platform-scope.test.ts new file mode 100644 index 000000000..e55e032ee --- /dev/null +++ b/admin-frontend-vue/tests/group-dropdown-platform-scope.test.ts @@ -0,0 +1,41 @@ +import test from 'node:test' +import assert from 'node:assert/strict' +import { readSource } from './helpers.ts' + +/** + * 分组下拉按平台归属过滤(2026-11-22 用户口径「京东创建的分组就归属京东, + * 下拉就只能显示京东分组管理的,亚马逊的也是同理」)。 + * + * 背景:biz_shop_manage_group 一张表服务两侧(platform 列 V206 起 amazon|jd), + * 京东侧(JdCategoryScopeService + /api/jd-collect/groups)已有 platform='jd' 闸; + * 亚马逊侧四个页面(查询ASIN/跟价/去重/外观专利清理)共用的两个取数口原本不传 + * platform ⇒ 京东档分组(如「京东-团队」「测试1111」)漏进亚马逊侧下拉。 + * 两支源码钉守住发送口形状:platform 恒 'amazon' 且 company_id 条件透传不丢。 + */ + +test('amazon_group_dropdowns_send_platform_amazon_and_keep_company_id_passthrough', () => { + const dedupe = readSource('src/pages/asin/dedupe-total-api.ts') + assert.match(dedupe, /DEDUPE_GROUPS_ENDPOINT, \{ params: \{ platform: 'amazon', \.\.\.\(companyId != null \? \{ company_id: companyId \} : \{\}\) \} \}/, + '去重/外观专利清理页的分组候选必须恒带 platform=amazon(京东档组不进亚马逊侧下拉)') + assert.match(dedupe, /export async function fetchDedupeTotalGroups\(companyId\?: number \| null\)/, + '签名不变:company_id 仍由调用方(公司 tab)传入') + + const shopManage = readSource('src/pages/shop/shop-manage-api.ts') + assert.match(shopManage, /SHOP_MANAGE_GROUPS_ENDPOINT, \{ params: \{ platform: 'amazon', \.\.\.\(companyId != null \? \{ company_id: companyId \} : \{\}\) \} \}/, + '店铺/查询ASIN/跟价页的分组下拉必须恒带 platform=amazon') + assert.match(shopManage, /export async function fetchShopManageGroups\(companyId\?: number \| null\)/, + '签名不变:company_id 仍由调用方(公司 tab)传入') +}) + +test('group_manage_page_keeps_following_platform_tab_not_hardcoded', () => { + // 分组管理页本身是双侧页面,继续跟当前平台 tab 走——不许被这批「亚马逊域恒 amazon」 + // 顺手改死,否则京东 tab 的分组列表会被清空(2026-11-17 平台闸既有口径)。 + const groupsPage = readSource('src/pages/account/GroupsPage.vue') + assert.match(groupsPage, /fetchShopGroups\(companyTab\.requestCompanyId, platformTab\.active\)/, + '分组管理页取数仍按当前平台 tab 过滤') + // 反向钉:两个亚马逊域取数口里不许出现 platformTab(它们不该感知平台 tab)。 + const dedupe = readSource('src/pages/asin/dedupe-total-api.ts') + const shopManage = readSource('src/pages/shop/shop-manage-api.ts') + assert.equal(/platformTab/.test(dedupe), false, '去重取数口不感知平台 tab(恒 amazon)') + assert.equal(/platformTab/.test(shopManage), false, '店铺取数口不感知平台 tab(恒 amazon)') +})