feat(产品风险): 回传带上实跑筛选值与线索,随合并载荷落进范围态
客户端把本次实跑用的「商品列表筛选」和一条不改判终态的线索发上来后, mergeShopPayload 按「后到的非空值覆盖」合并(增量回传不带这两字段, 不能让最后一条空载荷把审计线索冲掉),随合并载荷整份存进 biz_task_scope_state.parsed_payload_json —— 不需要新列:result_json 每次由 buildSnapshotFromDb 从库里重建,不落列的东西写进去也会被冲掉。 submitResult 的 merged 日志同步带上两值,现网可直接 grep。 warning 与 error 严格分开:error 会让店铺判失败,线索不会(用例逐条钉住)。 另把结果表九列的次序与文案逐字钉住——用户是按列位对账的,加列/换序/改文案 都会让存量对表脚本静默错位。
This commit is contained in:
+32
@@ -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<String> 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");
|
||||
|
||||
+77
@@ -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<ProductRiskShopPayloadDto> 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<ProductRiskShopPayloadDto> 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);
|
||||
|
||||
Reference in New Issue
Block a user