From 562e81df8136c6574f82e33f5ce7b85219a45796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Mon, 16 Nov 2026 01:54:25 +0800 Subject: [PATCH] =?UTF-8?q?fix(jd):=20=E4=B8=89=E6=8A=8A=E5=B0=BA=E5=AD=90?= =?UTF-8?q?=E5=AF=B9=E7=B1=BB=E7=9B=AE=E5=A4=9A=E9=80=89=E7=AC=94=E7=9A=84?= =?UTF-8?q?=E6=94=B6=E5=8F=A3=E2=80=94=E2=80=94=E2=91=A0=20JdCollectTab=20?= =?UTF-8?q?loadCategoryOptions=20=E5=A4=B1=E8=B4=A5=E5=88=86=E6=94=AF?= =?UTF-8?q?=E8=A1=A5=20ElMessage.warning=EF=BC=88=E5=8E=9F=E5=8F=AA=20cons?= =?UTF-8?q?ole=EF=BC=9D=E9=9D=99=E9=BB=98=20catch=20=E6=A3=98=E8=BD=AE?= =?UTF-8?q?=E9=80=90=E6=96=87=E4=BB=B6=E5=8F=B0=E8=B4=A6=E7=BA=A2=EF=BC=9B?= =?UTF-8?q?=E5=8F=A3=E5=BE=84=20console+=E7=94=A8=E6=88=B7=E5=8F=AF?= =?UTF-8?q?=E8=A7=81=E5=87=BA=E5=8F=A3=EF=BC=89=EF=BC=8Ccatch-silence=20?= =?UTF-8?q?=E5=9F=BA=E7=BA=BF=20blocks=20317=E2=86=92318=20=E9=80=90?= =?UTF-8?q?=E6=9D=A1=E7=82=B9=E5=90=8D=E7=99=BB=E8=AE=B0=EF=BC=88=E9=9D=9E?= =?UTF-8?q?=E9=9D=99=E9=BB=98=E5=8F=AA=E8=BF=9B=20blocks=EF=BC=8Csilent=20?= =?UTF-8?q?82=20=E4=B8=8D=E5=8A=A8=EF=BC=89=EF=BC=9B=E2=91=A1=20endpoints?= =?UTF-8?q?=20=E5=86=BB=E7=BB=93=E5=BF=AB=E7=85=A7=E6=98=BE=E5=BC=8F?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=20jdCollect.categories=EF=BC=88=E5=BF=AB?= =?UTF-8?q?=E7=85=A7=E6=B5=8B=E8=AF=95=E5=9C=A8=20node=20--test=20?= =?UTF-8?q?=E5=85=A8=E9=87=8F=E6=A1=A3=E7=BA=A2=EF=BC=89=EF=BC=9B=E2=91=A2?= =?UTF-8?q?=20jd-collect-progress=20=E6=8C=82=E8=BD=BD=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E5=A4=B9=E5=85=B7=E5=90=8C=E6=AD=A5=204=20=E5=8F=82=E5=BB=BA?= =?UTF-8?q?=E5=8D=95=E4=B8=8E=E5=B8=A6=20categoryPaths=20=E7=9A=84?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=BD=BD=E8=8D=B7=EF=BC=8C=E5=B9=B6=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E3=80=8C=E5=8B=BE=E9=80=89=E7=B1=BB=E7=9B=AE=E2=86=92?= =?UTF-8?q?=E5=BB=BA=E5=8D=95/=E6=8E=A8=E9=98=9F=E5=88=97=E5=90=8C?= =?UTF-8?q?=E9=93=BE=E4=B8=8B=E5=8F=91=E3=80=8D=E7=94=A8=E4=BE=8B=EF=BC=88?= =?UTF-8?q?=E7=BA=A7=E8=81=94=E9=9D=A2=E6=9D=BF=E7=82=B9=E9=80=89=E2=86=92?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E4=BD=93=20['=E5=A5=B3=E8=A3=85']=E2=86=92pa?= =?UTF-8?q?yload.data.categoryPaths=20['=E5=A5=B3=E8=A3=85']=EF=BC=89?= =?UTF-8?q?=E3=80=82=E5=88=A4=E6=8D=AE=EF=BC=9Anode=20--test=201061/1061?= =?UTF-8?q?=E3=80=81vitest=2085/85=E3=80=81vue-tsc=20=E9=9B=B6=E9=94=99?= =?UTF-8?q?=E3=80=81catch-silence=204/4=E3=80=82=E5=8F=AF=E8=AF=BB?= =?UTF-8?q?=E6=A3=98=E8=BD=AE=E7=9A=84=20JdProductEditDrawer.vue(857?= =?UTF-8?q?=E8=A1=8C)=20=E7=BA=A2=E6=98=AF=E4=BB=96=E4=BA=BA=E5=9C=A8?= =?UTF-8?q?=E9=A3=9E=E4=BB=B6=EF=BC=88=E5=90=8E=E7=AE=A1=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=8A=BD=E5=B1=89=EF=BC=8C=E6=9C=AA=E6=8F=90=E4=BA=A4=EF=BC=89?= =?UTF-8?q?=EF=BC=8C=E5=BD=92=E5=B1=9E=E4=B8=8D=E5=9C=A8=E6=9C=AC=E7=AC=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend-vue/src/pages/jd/JdCollectTab.vue | 4 +- .../tests/catch-silence-ratchet.test.ts | 6 ++- frontend-vue/tests/endpoints.test.ts | 3 ++ .../mount/jd-collect-progress.mount.test.ts | 39 ++++++++++++++++++- 4 files changed, 48 insertions(+), 4 deletions(-) diff --git a/frontend-vue/src/pages/jd/JdCollectTab.vue b/frontend-vue/src/pages/jd/JdCollectTab.vue index 0f58616d9..1fcd3afe7 100644 --- a/frontend-vue/src/pages/jd/JdCollectTab.vue +++ b/frontend-vue/src/pages/jd/JdCollectTab.vue @@ -64,7 +64,9 @@ async function loadCategoryOptions() { categoryOptions.value = await fetchJdCollectCategories() } catch (err) { // 选项是锦上添花:拉不到就保持空态文案,不把「全店采集」这条主路堵死。 - console.error('[jd-collect] 类目选项拉取失败(不选类目仍可全店采集)', err) + // 静默 catch 棘轮口径:console + ElMessage(界面上看得见),不算静默。 + console.error('[jd-collect] 类目选项拉取失败', err) + ElMessage.warning('类目选项加载失败,本次可先不选类目(全店采集)') } finally { categoryOptionsLoaded.value = true } diff --git a/frontend-vue/tests/catch-silence-ratchet.test.ts b/frontend-vue/tests/catch-silence-ratchet.test.ts index a47ae7749..1f39ea254 100644 --- a/frontend-vue/tests/catch-silence-ratchet.test.ts +++ b/frontend-vue/tests/catch-silence-ratchet.test.ts @@ -83,7 +83,11 @@ const BASELINE = { // catch 随单任务进度条移除(-1),新增 retryTaskRecord / interruptTaskRecord 两支 // catch(+2)——重试失败/中断失败都走 ElMessage.error 把服务端文案报给用户, // 原文只进 console;净 +1,silent 一格没涨(两支都不是静默形状)。 - blocks: 317, + // 318 = 317 + 1(2026-11-16 京东建单页类目多选):JdCollectTab.vue 的 + // loadCategoryOptions catch——类目选项拉取失败不阻塞建单(不选类目=全店采集的 + // 主路照常),失败 ElMessage.warning 当场说给用户、原文只进 console;非静默, + // silent 一格没涨,只进 blocks。 + blocks: 318, // 2026-10-30(ops Phase 6/可读棘轮):ApiSecretSettingsPanel.vue 1113→775 行,面板里那处 // 静默 catch(余额查询失败只 console.warn、界面留空)随 loadBalance 整块搬进 // useProxyPlan.ts。不是新增静默:面板 1→0、新文件记 1,silent 总数与 blocks 都一格没动, diff --git a/frontend-vue/tests/endpoints.test.ts b/frontend-vue/tests/endpoints.test.ts index 3585e39f3..d4d0ac643 100644 --- a/frontend-vue/tests/endpoints.test.ts +++ b/frontend-vue/tests/endpoints.test.ts @@ -319,8 +319,11 @@ test('test_endpoints_frozen_snapshot', () => { // 2026-11-15 任务面板改版:dashboard/history/progressBatch(面板三件,鉴权照外观专利 // ——dashboard/history/delete 走 resolve,progressBatch 走 filterOwnedTaskIds+require)+ // deleteTask(连带清理京东数据库该任务的行与断点游标,铁律 32 数据面)。 + // 2026-11-16 类目多选:categories(公共库已落库 category_path 全集,建单页多选面板选项源, + // 鉴权照建单 requireOwnershipUserId fail-closed;后端 8b4f7a3a 同轮落)。 "jdCollect": { "create": "/api/jd-collect/tasks", + "categories": "/api/jd-collect/categories", // activate 补录(存量漂移):8d8c88a5「补激活这一步」只改了常量表,快照没跟上, // 本次任务面板改版全量跑才暴露(快照测试此前没在全量档里红过)。 "activate": "/api/jd-collect/tasks/{taskId}/activate", diff --git a/frontend-vue/tests/mount/jd-collect-progress.mount.test.ts b/frontend-vue/tests/mount/jd-collect-progress.mount.test.ts index 40170775c..a40bb7b6c 100644 --- a/frontend-vue/tests/mount/jd-collect-progress.mount.test.ts +++ b/frontend-vue/tests/mount/jd-collect-progress.mount.test.ts @@ -22,6 +22,7 @@ const api = vi.hoisted(() => ({ // 8d8c88a5 起建单后先 PENDING→RUNNING 再推队列;mock 里缺这一个键会让组件拿到 // undefined 调用、enqueue 永远不被调用(本文件当时没跟上,红在这里)。 activateJdCollectTask: vi.fn(), + fetchJdCollectCategories: vi.fn(), fetchJdCollectDashboard: vi.fn(), fetchJdCollectHistory: vi.fn(), fetchJdCollectTaskProgressBatch: vi.fn(), @@ -34,6 +35,7 @@ const api = vi.hoisted(() => ({ vi.mock('@/shared/api/types/modules/jd-collect', () => ({ createJdCollectTask: api.createJdCollectTask, activateJdCollectTask: api.activateJdCollectTask, + fetchJdCollectCategories: api.fetchJdCollectCategories, fetchJdCollectProgress: vi.fn(), fetchJdCollectDashboard: api.fetchJdCollectDashboard, fetchJdCollectHistory: api.fetchJdCollectHistory, @@ -122,6 +124,7 @@ beforeEach(() => { for (const mock of Object.values(api)) mock.mockReset() api.createJdCollectTask.mockResolvedValue({ taskId: 88, taskNo: 'JD-1', collectChannel: 'LOCAL' }) api.activateJdCollectTask.mockResolvedValue(null) + api.fetchJdCollectCategories.mockResolvedValue([]) api.enqueue.mockResolvedValue({ success: true }) api.fetchJdCollectDashboard.mockResolvedValue(EMPTY_DASHBOARD) api.fetchJdCollectHistory.mockResolvedValue({ items: [] }) @@ -144,8 +147,9 @@ describe('获取店铺数据:一键采集 + 任务面板', () => { await startCollect(w) expect(api.createJdCollectTask).toHaveBeenCalledTimes(1) - // 店铺名留空 → 按「京麦后台」占位(客户端从京麦后台现读真实店铺名落库) - expect(api.createJdCollectTask).toHaveBeenCalledWith('京麦后台', ['ONSALE', 'OFFSALE'], 0) + // 店铺名留空 → 按「京麦后台」占位(客户端从京麦后台现读真实店铺名落库); + // 不选类目=空数组(全店采集,后端归一化为 null 进 request_json) + expect(api.createJdCollectTask).toHaveBeenCalledWith('京麦后台', ['ONSALE', 'OFFSALE'], 0, []) expect(api.activateJdCollectTask).toHaveBeenCalledWith(88) expect(api.enqueue).toHaveBeenCalledTimes(1) const payload = api.enqueue.mock.calls[0][0] @@ -155,6 +159,7 @@ describe('获取店铺数据:一键采集 + 任务面板', () => { shopName: '京麦后台', listTabs: ['ONSALE', 'OFFSALE'], maxProducts: 0, + categoryPaths: [], }) // 轮询已启动:批量进度端点拿到任务 88 expect(api.fetchJdCollectTaskProgressBatch).toHaveBeenCalled() @@ -274,4 +279,34 @@ describe('获取店铺数据:一键采集 + 任务面板', () => { expect(api.enqueue).toHaveBeenCalledTimes(1) expect(w.find('.feedback.error').exists()).toBe(false) }) + + it('勾选类目后建单:categoryPaths 随建单请求体与推送载荷同链下发', async () => { + // 2026-11-16 用户口径「客户端前端也要同步加上京东类目」:多选面板勾「女装」后 + // 建单请求体与推送载荷都要带 ['女装']——客户端按行 categoryPath 等值过滤的源头。 + api.fetchJdCollectCategories.mockResolvedValue([ + { name: '女装', productCount: 5 }, + { name: '男装', productCount: 3 }, + ]) + const w = await mountPage() + + await w.find('.cat-trigger').trigger('click') + const leafRow = w.findAll('.cat-row').find((row) => row.text().includes('女装')) + expect(leafRow, '面板第三栏必须渲染出已落库类目选项').toBeTruthy() + await leafRow!.trigger('click') + await flushPromises() + + expect(w.find('.cat-trigger-text').text()).toBe('女装', '单选勾选后触发框显示类目名') + await w.find('.cat-mask').trigger('click') + await startCollect(w) + + expect(api.createJdCollectTask).toHaveBeenCalledWith('京麦后台', ['ONSALE', 'OFFSALE'], 0, ['女装']) + const payload = api.enqueue.mock.calls[0][0] + expect(payload.data).toEqual({ + taskId: 88, + shopName: '京麦后台', + listTabs: ['ONSALE', 'OFFSALE'], + maxProducts: 0, + categoryPaths: ['女装'], + }) + }) })