diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/model/dto/ProductRiskShopPayloadDto.java b/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/model/dto/ProductRiskShopPayloadDto.java index ee8a28651..873598355 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/model/dto/ProductRiskShopPayloadDto.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/model/dto/ProductRiskShopPayloadDto.java @@ -31,5 +31,25 @@ public class ProductRiskShopPayloadDto { + "值为该国 sheet 的行列表;省略的键表示该国无数据行。") private Map> countries = new LinkedHashMap<>(); + /** + * 本次实跑用的「商品列表筛选」值(SearchSuppressed / ApprovalRequired / Active / + * DetailPageRemoved,或 Volus 页别名映射后的真值)。 + * + *

它只随本地队列下发、不建单落库,出过「选成在售白跑 7 小时、事后无从审计」的单 + * (2026-10-17 陈先锋·德国站)。客户端回传带上后,随合并载荷整份存进 + * biz_task_scope_state.parsed_payload_json,不需要新列。 + */ + @JsonProperty("listingFilter") + @Schema(description = "本次实际使用的商品列表筛选值,供事后审计;老客户端不传,可为空") + private String listingFilter; + + /** + * 不改判终态的线索(如「394 行中 219 行没有处理入口,请确认筛选状态」)。 + * 与 {@link #error} 严格分开:error 会让店铺判失败,warning 不会。 + */ + @JsonProperty("warning") + @Schema(description = "跑完但可疑的线索,不影响任务状态;老客户端不传,可为空") + private String warning; + private Boolean shopDone; } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskTaskService.java index eaf680886..f4459696e 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskTaskService.java @@ -640,14 +640,16 @@ public class ProductRiskTaskService { boolean incomingShopDone = hasShopDoneSignal(payload); int mergedRows = countPayloadRows(mergedPayload); boolean shopDone = isShopPayloadCompleted(mergedPayload); - log.info("[product-risk] shop merged taskId={} shop={} incomingShopDone={} mergedDone={} mergedRows={} payloadCountries={} mergedShopDoneFlag={}", + log.info("[product-risk] shop merged taskId={} shop={} incomingShopDone={} mergedDone={} mergedRows={} payloadCountries={} mergedShopDoneFlag={} listingFilter={} warning={}", taskId, shopKey, incomingShopDone, shopDone, mergedRows, mergedPayload.getCountries() == null ? 0 : mergedPayload.getCountries().size(), - mergedPayload.getShopDone()); + mergedPayload.getShopDone(), + mergedPayload.getListingFilter(), + mergedPayload.getWarning()); if (incomingShopDone && mergedRows <= 0) { markResultNoData(fr, "没有数据"); productRiskTaskCacheService.removeShopMergedPayload(taskId, shopKey); @@ -1258,6 +1260,14 @@ public class ProductRiskTaskService { if (incoming.getError() != null && !incoming.getError().isBlank()) { merged.setError(incoming.getError()); } + // 审计留痕两字段按「后到的非空值覆盖」:客户端只在店铺收尾那一次带全量值, + // 中途增量回传不带它们(见 app_client/amazon/approve.py 的 _shop_payload) + if (incoming.getListingFilter() != null && !incoming.getListingFilter().isBlank()) { + merged.setListingFilter(incoming.getListingFilter().trim()); + } + if (incoming.getWarning() != null && !incoming.getWarning().isBlank()) { + merged.setWarning(incoming.getWarning()); + } if (Boolean.TRUE.equals(merged.getShopDone()) || incomingShopDone || Boolean.TRUE.equals(incoming.getShopDone())) { merged.setShopDone(Boolean.TRUE); } diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskExcelAssemblyServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskExcelAssemblyServiceTest.java index 763d9e52b..468376730 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskExcelAssemblyServiceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskExcelAssemblyServiceTest.java @@ -161,6 +161,38 @@ class ProductRiskExcelAssemblyServiceTest { assertTrue(row.getViolationDetails().isEmpty()); } + /** + * 表头九列的**顺序与文案**逐字钉住:用户是拿这张表按列位对账的(第 5 列「移除ASIN」 + * 只有「请求批准 / 添加缺失的商品详情」两类结果才填,2026-10-17 那次"这列怎么空了" + * 就是靠列位定位的)。加列、换序、改文案都会让存量对表脚本静默错位。 + * 要动这九列,先改这条断言,并说清存量文件怎么迁。 + */ + @Test + void headerKeepsTheNineColumnsUsersReconcileByPosition() throws Exception { + Path xlsx = Files.createTempFile("product-risk-header-", ".xlsx"); + try { + service.writeWorkbook( + xlsx.toFile(), "店铺A", + Map.of(ProductRiskCountryCode.DE.getSheetName(), + List.of(row("B0HEAD0001", "处理完成", Boolean.TRUE)))); + + try (InputStream in = Files.newInputStream(xlsx); + Workbook workbook = new XSSFWorkbook(in)) { + Sheet sheet = workbook.getSheet(ProductRiskCountryCode.DE.getSheetName()); + List header = new java.util.ArrayList<>(); + for (int col = 0; col <= 8; col++) { + header.add(sheet.getRow(0).getCell(col).getStringCellValue()); + } + assertEquals(List.of("店铺名", "商品ASIN/SKU", "状态", "完成", + "移除ASIN", "移除状态", "ASIN", "原因", "状态"), + header, "九列的次序与文案就是对外契约"); + assertEquals(9, sheet.getRow(0).getLastCellNum(), "第 9 列之后不得再多出列"); + } + } finally { + Files.deleteIfExists(xlsx); + } + } + private static ProductRiskRowDto row(String productAsinSku, String status, Boolean done) { ProductRiskRowDto row = new ProductRiskRowDto(); row.setShopName("店铺A"); diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskTaskServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskTaskServiceTest.java index f0a89dd16..508574f81 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskTaskServiceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskTaskServiceTest.java @@ -23,6 +23,7 @@ import com.nanri.aiimage.modules.task.service.TaskResultPayloadService; import com.nanri.aiimage.modules.ziniao.service.ZiniaoShopSwitchService; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.ArgumentCaptor; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; @@ -246,6 +247,82 @@ class ProductRiskTaskServiceTest { verify(lock).close(); } + /** + * 审计留痕(2026-10-19 取证):「商品列表筛选」只走本地队列、不建单落库,出过 + * 选成在售白跑 7 小时、事后无从查证的任务。客户端收尾回传带上 listingFilter/warning 后, + * 必须随合并载荷整份存下(saveShopMergedPayload → biz_task_scope_state.parsed_payload_json), + * 且 warning 不得污染 error(error 会让店铺判失败)。 + */ + @Test + void mergedPayloadPersistsListingFilterAndWarning() { + long taskId = 29601L; + FileTaskEntity task = runningTask(taskId); + FileResultEntity fr = shopResult(94001L, taskId, SHOP_KEY, null, null); + + TaskDistributedLockService.LockHandle lock = mock(TaskDistributedLockService.LockHandle.class); + when(taskDistributedLockService.acquire(MODULE_TYPE, taskId)).thenReturn(lock); + when(productRiskTaskCacheService.getTaskCacheBatch(List.of(taskId))).thenReturn(Map.of(taskId, task)); + when(fileResultMapper.selectList(any())).thenReturn(List.of(fr)); + when(ziniaoShopSwitchService.normalizeShopName(SHOP_KEY)).thenReturn(SHOP_KEY); + when(productRiskTaskCacheService.getShopMergedPayload(taskId, SHOP_KEY)).thenReturn(null); + + service.submitResult(taskId, requestWithAuditFields()); + + ArgumentCaptor saved = + ArgumentCaptor.forClass(ProductRiskShopPayloadDto.class); + verify(productRiskTaskCacheService).saveShopMergedPayload(eq(taskId), eq(SHOP_KEY), saved.capture()); + assertEquals("DetailPageRemoved", saved.getValue().getListingFilter()); + assertTrue(saved.getValue().getWarning().contains("没有处理入口")); + assertNull(saved.getValue().getError(), "线索不是失败,不得写进 error"); + verify(lock).close(); + } + + /** 增量回传不带这两个字段时,必须保留先前存下的值(否则最后一条空载荷会把审计线索抹掉)。 */ + @Test + void blankAuditFieldsDoNotErasePersistedValues() { + long taskId = 29602L; + FileTaskEntity task = runningTask(taskId); + FileResultEntity fr = shopResult(94002L, taskId, SHOP_KEY, null, null); + + ProductRiskShopPayloadDto existing = new ProductRiskShopPayloadDto(); + existing.setShopName(SHOP_KEY); + existing.setListingFilter("Active"); + existing.setWarning("德国: 394 行中 219 行没有处理入口"); + + TaskDistributedLockService.LockHandle lock = mock(TaskDistributedLockService.LockHandle.class); + when(taskDistributedLockService.acquire(MODULE_TYPE, taskId)).thenReturn(lock); + when(productRiskTaskCacheService.getTaskCacheBatch(List.of(taskId))).thenReturn(Map.of(taskId, task)); + when(fileResultMapper.selectList(any())).thenReturn(List.of(fr)); + when(ziniaoShopSwitchService.normalizeShopName(SHOP_KEY)).thenReturn(SHOP_KEY); + when(productRiskTaskCacheService.getShopMergedPayload(taskId, SHOP_KEY)).thenReturn(existing); + + ProductRiskShopPayloadDto incoming = new ProductRiskShopPayloadDto(); + incoming.setShopName(SHOP_KEY); + incoming.setCountries(Map.of(ProductRiskCountryCode.DE, List.of(businessRow()))); + ProductRiskSubmitResultRequest request = new ProductRiskSubmitResultRequest(); + request.setShops(List.of(incoming)); + + service.submitResult(taskId, request); + + ArgumentCaptor saved = + ArgumentCaptor.forClass(ProductRiskShopPayloadDto.class); + verify(productRiskTaskCacheService).saveShopMergedPayload(eq(taskId), eq(SHOP_KEY), saved.capture()); + assertEquals("Active", saved.getValue().getListingFilter()); + assertTrue(saved.getValue().getWarning().contains("219")); + verify(lock).close(); + } + + private ProductRiskSubmitResultRequest requestWithAuditFields() { + ProductRiskShopPayloadDto payload = new ProductRiskShopPayloadDto(); + payload.setShopName(SHOP_KEY); + payload.setCountries(Map.of(ProductRiskCountryCode.DE, List.of(businessRow()))); + payload.setListingFilter("DetailPageRemoved"); + payload.setWarning("德国: 394 行中 219 行没有处理入口——若这不是预期范围,请确认任务的「商品列表筛选」"); + ProductRiskSubmitResultRequest request = new ProductRiskSubmitResultRequest(); + request.setShops(List.of(payload)); + return request; + } + private FileTaskEntity runningTask(long taskId) { FileTaskEntity task = new FileTaskEntity(); task.setId(taskId);