diff --git a/frontend-vue/src/pages/brand/components/BrandProductRiskTab.vue b/frontend-vue/src/pages/brand/components/BrandProductRiskTab.vue index d755d1f67..3138b7111 100644 --- a/frontend-vue/src/pages/brand/components/BrandProductRiskTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandProductRiskTab.vue @@ -155,7 +155,7 @@ import { ElMessage } from 'element-plus' import AmazonToolPageShell from '@/pages/amazon/components/AmazonToolPageShell.vue'; import TaskCenterPanel from '@/shared/components/tasks/TaskCenterPanel.vue' import type { TaskItemView, TaskStatCard } from '@/shared/components/tasks/types' -import { LISTING_FILTER_OPTIONS, type ListingFilterValue } from '@/pages/brand/components/listingFilters' +import { LISTING_FILTER_OPTIONS, RISK_LISTING_FILTER_KEY, productRiskFilterIssues, type ListingFilterValue } from '@/pages/brand/components/listingFilters' import { addProductRiskCandidate, createProductRiskTask, @@ -1109,6 +1109,8 @@ function productRiskPayloadGuard(payload: unknown) { expectedType: 'product-risk-resolve-run', requiredDataKeys: ['taskId'], nonEmptyArrayKeys: ['items', 'country_codes'], + // 结构对得上不代表选对了:筛选状态选到「在售」会整单白跑,缺键会让 Python 端假成功 + extraIssues: (data) => productRiskFilterIssues(data[RISK_LISTING_FILTER_KEY]), }) } diff --git a/frontend-vue/src/pages/brand/components/listingFilters.ts b/frontend-vue/src/pages/brand/components/listingFilters.ts index 3d77f954b..a1a03c943 100644 --- a/frontend-vue/src/pages/brand/components/listingFilters.ts +++ b/frontend-vue/src/pages/brand/components/listingFilters.ts @@ -1,3 +1,5 @@ +import type { GuardIssue } from '@/shared/dispatch-guard' + export const LISTING_FILTER_OPTIONS = [ { value: 'SearchSuppressed', label: '在搜索结果中禁止显示' }, { value: 'ApprovalRequired', label: '需要批准' }, @@ -7,6 +9,52 @@ export const LISTING_FILTER_OPTIONS = [ export type ListingFilterValue = (typeof LISTING_FILTER_OPTIONS)[number]['value'] +/** + * 「在售」不是风险状态:这一档下的商品大多没有解决入口,跑完的结果表里「移除ASIN」列会是空的。 + * 2026-10-17 陈先锋·德国站实测:选到在售 ⇒ 394 行里 219 行「没有处理入口」,跑了 7 小时, + * 而任务参数里看不出选错了什么(该键只走本地队列、不落库)。 + * 不禁止选它——确实有人只想看在售商品的面板——但必须让用户签字,且缺键直接拦下。 + */ +export const NON_RISK_LISTING_FILTERS: readonly ListingFilterValue[] = ['Active'] + +/** 载荷里「商品列表筛选」的键名,与 app_client/amazon/approve.py 读取的字段逐字一致 */ +export const RISK_LISTING_FILTER_KEY = 'risk_listing_filter' + +function listingFilterLabel(value: string): string { + return LISTING_FILTER_OPTIONS.find((opt) => opt.value === value)?.label || value +} + +/** + * 产品风险审批的筛选值判据:缺键/空串 = block(Python 端会拿它去页面上找一个 value="" 的 + * 选项,必然落空并以「没有需要审批的商品」假成功收尾);非风险状态 = confirm。 + * 返回的是 dispatch-guard 的 GuardIssue 形状,由 checkQueuePayload 的 extraIssues 承接, + * ok/needsConfirm 与「有 block 就不展示 confirm」那条规则不在这里重复解释。 + */ +export function productRiskFilterIssues(filter: unknown): GuardIssue[] { + const value = typeof filter === 'string' ? filter.trim() : '' + if (!value) { + return [{ + code: 'product-risk.filter-missing', + severity: 'block', + message: + `任务数据缺少「商品列表筛选」(${RISK_LISTING_FILTER_KEY}),已阻止启动。\n` + + 'Python 端拿到空值会去页面上找一个不存在的筛选选项,整国以「没有需要审批的商品」空跑收尾。\n' + + '请先在「商品列表筛选」里选择状态,再点启动任务。', + }] + } + if ((NON_RISK_LISTING_FILTERS as readonly string[]).includes(value)) { + return [{ + code: 'product-risk.filter-not-risk', + severity: 'confirm', + message: + `你选的「${listingFilterLabel(value)}」不是风险状态:这一档下的商品大多没有处理入口,` + + '结果表的「移除ASIN」列通常为空。\n' + + '要处理被禁止显示/已删除的商品,请改选对应状态。确定仍按这个筛选执行吗?', + }] + } + return [] +} + /** * 跟价「按商品状态(全量)」可勾选的状态(2026-10-16 多状态立项)。 * diff --git a/frontend-vue/src/shared/dispatch-guard.ts b/frontend-vue/src/shared/dispatch-guard.ts index 41dab3e43..57b322a18 100644 --- a/frontend-vue/src/shared/dispatch-guard.ts +++ b/frontend-vue/src/shared/dispatch-guard.ts @@ -437,6 +437,13 @@ export interface QueuePayloadOptions { positiveNumberKeys?: readonly string[] /** 期望的 type 值;不匹配时 block */ expectedType?: string + /** + * 业务侧自己那条「数据对不对得上功能」的判据,在通用结构校验之后跑。 + * 收 data(已通过 isPlainObject 的那一层),返回若干 GuardIssue;block 拦下、confirm 让用户签字。 + * 为什么要留这个口子而不是让各 Tab 自己拼结果:结果的 ok/needsConfirm/标题与 + * 「有 block 就不展示 confirm」这条规则只在这里解释一遍,抄第二份就会漂。 + */ + extraIssues?: (data: Record) => GuardIssue[] title?: string } @@ -576,6 +583,10 @@ export function checkQueuePayload( }) } + if (options.extraIssues) { + issues.push(...options.extraIssues(data)) + } + return buildResult(title, title, issues) } diff --git a/frontend-vue/tests/product-risk-listing-filter.test.ts b/frontend-vue/tests/product-risk-listing-filter.test.ts new file mode 100644 index 000000000..aaed10340 --- /dev/null +++ b/frontend-vue/tests/product-risk-listing-filter.test.ts @@ -0,0 +1,90 @@ +import { test } from 'node:test' +import assert from 'node:assert/strict' +import { + NON_RISK_LISTING_FILTERS, + RISK_LISTING_FILTER_KEY, + productRiskFilterIssues, +} from '../src/pages/brand/components/listingFilters.ts' +import { checkQueuePayload, type GuardResult } from '../src/shared/dispatch-guard.ts' + +function codes(result: GuardResult) { + return result.issues.map((issue) => issue.code) +} + +function runPayload(data: Record) { + return { + type: 'product-risk-resolve-run', + ts: 1, + data: { taskId: 31261, items: [{ shopName: '陈先锋' }], country_codes: ['DE'], ...data }, + } +} + +function guard(payload: unknown) { + return checkQueuePayload(payload, { + expectedType: 'product-risk-resolve-run', + requiredDataKeys: ['taskId'], + nonEmptyArrayKeys: ['items', 'country_codes'], + extraIssues: (d) => productRiskFilterIssues(d[RISK_LISTING_FILTER_KEY]), + }) +} + +// 2026-10-17 陈先锋·德国站:任务把「商品列表筛选」选成在售,394 行里 219 行没有处理入口、 +// 「移除ASIN」列整片空,跑完 7 小时且事后从参数里看不出错处。这两条是那次取证留下的判据。 + +test('test_产品风险_缺筛选键必须拦住', () => { + const missing = productRiskFilterIssues(undefined) + assert.equal(missing.length, 1) + assert.equal(missing[0].severity, 'block', '缺键时 Python 端会去页面上找 value="" 的选项并假成功') + assert.match(missing[0].message, /risk_listing_filter/) + + for (const bad of ['', ' ', null, 7]) { + assert.equal(productRiskFilterIssues(bad)[0].severity, 'block', `空值 ${String(bad)} 同样要拦`) + } +}) + +test('test_产品风险_非风险状态要用户签字', () => { + assert.deepEqual([...NON_RISK_LISTING_FILTERS], ['Active']) + const issues = productRiskFilterIssues('Active') + assert.equal(issues.length, 1) + assert.equal(issues[0].severity, 'confirm', '在售不是不能选,是要让人知道自己选了它') + assert.match(issues[0].message, /在售/, '文案要带选项中文名,不能只甩英文标识') + assert.match(issues[0].message, /移除ASIN/) +}) + +test('test_产品风险_风险状态照常放行', () => { + for (const ok of ['SearchSuppressed', 'ApprovalRequired', 'DetailPageRemoved']) { + assert.deepEqual(productRiskFilterIssues(ok), [], `${ok} 不该被拦`) + } + // 目录外的值(脏数据/老版本存的键)交给页面自己判,UI 不臆断 + assert.deepEqual(productRiskFilterIssues('WhateverAmazonAdded'), []) +}) + +test('test_产品风险_整条载荷缺键时结构校验也救不回来', () => { + const result = guard(runPayload({})) + assert.equal(result.ok, false, '只查 taskId/items 的结构校验拦不住缺筛选值,必须靠 extraIssues') + assert.ok(codes(result).includes('product-risk.filter-missing')) +}) + +test('test_产品风险_选到在售时整单待确认但不算失败', () => { + const result = guard(runPayload({ [RISK_LISTING_FILTER_KEY]: 'Active' })) + assert.equal(result.ok, true, 'confirm 级不改判失败') + assert.equal(result.needsConfirm, true) + assert.match(result.message, /在售/) +}) + +test('test_产品风险_有阻断问题时不混展示确认项', () => { + // items 为空是 block;同时筛选值又是在售(confirm):弹窗只该出现 block 那条 + const payload = { type: 'product-risk-resolve-run', data: { taskId: 1, items: [], country_codes: ['DE'], + [RISK_LISTING_FILTER_KEY]: 'Active' } } + const result = guard(payload) + assert.equal(result.ok, false) + assert.equal(result.needsConfirm, false, '有 block 时不该再问"确定继续吗"') + assert.doesNotMatch(result.message, /在售/) +}) + +test('test_产品风险_正常筛选值一路放行', () => { + const result = guard(runPayload({ [RISK_LISTING_FILTER_KEY]: 'DetailPageRemoved' })) + assert.equal(result.ok, true) + assert.equal(result.needsConfirm, false) + assert.deepEqual(result.issues, []) +})