diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java index 521c33d3b..9b770891e 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java @@ -1634,16 +1634,19 @@ public class DeleteBrandRunService { return; } - task.setStatus(successCount > 0 ? "SUCCESS" : "FAILED"); + // 有失败文件 → FAILED(2026-09-30 修:此前「有成功就算成功」,文件生成失败被洗白) + task.setStatus(failedCount > 0 ? "FAILED" : "SUCCESS"); task.setSuccessFileCount(successCount); task.setFailedFileCount(failedCount); - task.setErrorMessage(successCount > 0 ? null : "任务中间数据缺失,已按结果行状态自动收尾"); + task.setErrorMessage(failedCount > 0 + ? (successCount > 0 ? "部分结果文件生成失败,已按结果行状态自动收尾" : "任务中间数据缺失,已按结果行状态自动收尾") + : null); task.setUpdatedAt(LocalDateTime.now()); task.setFinishedAt(LocalDateTime.now()); fileTaskMapper.updateById(task); deleteBrandTaskCacheService.saveTaskCache(task); deleteBrandTaskCacheService.saveProgress(task.getId(), Map.of( - "phase", successCount > 0 ? "success" : DeleteBrandTaskCacheService.PHASE_FAILED, + "phase", failedCount > 0 ? DeleteBrandTaskCacheService.PHASE_FAILED : "success", "finished_files", String.valueOf(successCount), "updated_at", String.valueOf(System.currentTimeMillis()) ), true); @@ -1735,6 +1738,7 @@ public class DeleteBrandRunService { } int successCount = 0; + int failedCount = 0; boolean waitingForAssemble = false; List finalItems = new ArrayList<>(); for (Map.Entry entry : parsedPayload.entrySet()) { @@ -1806,28 +1810,37 @@ public class DeleteBrandRunService { item.setPlatform(parsedFile.getPlatform()); item.setOpenStoreUrl(parsedFile.getOpenStoreUrl()); item.setMatched(parsedFile.getShopId() != null && !parsedFile.getShopId().isBlank()); - item.setSuccess(true); - item.setError(null); + // 预览行与计数必须反映本文件组装终态:此前无条件按成功计, + // 「结果文件生成失败」既进不了 failedFileCount 也显示为成功(2026-09-30 修) + item.setSuccess(!assembleTerminallyFailed); + item.setError(assembleTerminallyFailed ? "结果文件生成失败" : null); item.setMatchStatus(item.isMatched() ? ZiniaoShopIndexService.MATCH_STATUS_MATCHED : ZiniaoShopIndexService.MATCH_STATUS_PENDING); item.setMatchMessage(item.isMatched() ? null : "店铺索引信息缺失,请重新匹配索引"); finalItems.add(item); - successCount++; + if (assembleTerminallyFailed) { + failedCount++; + } else { + successCount++; + } } if (!waitingForAssemble) { waitingForAssemble = taskFileJobService.countUnfinishedAssembleJobs(task.getId(), MODULE_TYPE) > 0L; } - task.setStatus(waitingForAssemble ? "RUNNING" : "SUCCESS"); + // 有组装终态失败的文件 → 任务必须 FAILED(2026-09-30 修:此前无条件 SUCCESS + // 且 successCount 无条件自增,failedFileCount 恒为 0,文件生成失败被吞) + task.setStatus(waitingForAssemble ? "RUNNING" : (failedCount > 0 ? "FAILED" : "SUCCESS")); task.setSuccessFileCount(successCount); - task.setFailedFileCount(Math.max(0, parsedPayload.size() - successCount)); - task.setErrorMessage(null); + task.setFailedFileCount(failedCount); + task.setErrorMessage(failedCount > 0 ? failedCount + " 个结果文件生成失败" : null); task.setResultJson(toCompactTaskResultJsonForDb(finalItems)); task.setUpdatedAt(LocalDateTime.now()); task.setFinishedAt(waitingForAssemble ? null : LocalDateTime.now()); fileTaskMapper.updateById(task); deleteBrandTaskCacheService.saveTaskCache(task); deleteBrandTaskCacheService.saveProgress(task.getId(), Map.of( - "phase", waitingForAssemble ? DeleteBrandTaskCacheService.PHASE_UPLOADING : "success", + "phase", waitingForAssemble ? DeleteBrandTaskCacheService.PHASE_UPLOADING + : (failedCount > 0 ? DeleteBrandTaskCacheService.PHASE_FAILED : "success"), "file_index", String.valueOf(parsedPayload.size()), "file_total", String.valueOf(parsedPayload.size()), "finished_files", String.valueOf(successCount), diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackTaskService.java index 7f5ab88ea..cd33b67e7 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackTaskService.java @@ -2249,7 +2249,10 @@ public class PriceTrackTaskService { task.setErrorMessage(null); task.setFinishedAt(LocalDateTime.now()); } else if (ok > 0) { - task.setStatus("SUCCESS"); + // 部分店铺失败也必须是 FAILED(2026-09-30 修:此前标 SUCCESS 只把原因挂在 + // errorMessage,前端按成功展示、用户以为全跑完了;失败行的"部分结果"文件 + // 由上面的组装守卫确保已落地,标失败不影响下载) + task.setStatus("FAILED"); task.setErrorMessage(String.join("; ", allErrors)); task.setFinishedAt(LocalDateTime.now()); } else { 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 953ca28e3..44878b951 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 @@ -404,12 +404,28 @@ public class ProductRiskTaskService { int fail = 0; List allErrors = new ArrayList<>(); boolean allDone = true; + Map jobMap = taskFileJobService.findAssembleJobsByResultIds( + MODULE_TYPE, + latest.stream() + .map(FileResultEntity::getId) + .filter(id -> id != null && id > 0) + .toList()); for (FileResultEntity fr : latest) { boolean success = fr.getSuccess() != null && fr.getSuccess() == 1; boolean failed = fr.getErrorMessage() != null && !fr.getErrorMessage().isBlank(); if (success) { + // 与 updateTaskStatusFromLatestRows 同一口径:结果文件尚在组装的行不算已完成, + // 否则删一条行触发重算时会把任务提前终态,前端停轮询、下载按钮不出现 + if (isResultAwaitingFileAssembly(fr, jobMap.get(fr.getId()))) { + allDone = false; + continue; + } ok++; } else if (failed) { + if (isResultAwaitingFileAssembly(fr, jobMap.get(fr.getId()))) { + allDone = false; + continue; + } fail++; allErrors.add(fr.getSourceFilename() + ": " + fr.getErrorMessage()); } else { @@ -432,7 +448,10 @@ public class ProductRiskTaskService { task.setErrorMessage(null); task.setFinishedAt(LocalDateTime.now()); } else if (ok > 0) { - task.setStatus("SUCCESS"); + // 与 updateTaskStatusFromLatestRows 同一口径:部分店铺失败 = 结果不完整, + // 如实标 FAILED(失败店铺的部分结果文件仍可下载)。若这里保持 SUCCESS, + // 删一条无关键结果行就会把已判 FAILED 的部分失败任务翻回「成功」 + task.setStatus("FAILED"); task.setErrorMessage(String.join("; ", allErrors)); task.setFinishedAt(LocalDateTime.now()); } else { @@ -1003,6 +1022,13 @@ public class ProductRiskTaskService { } ok++; } else if (failed) { + // 失败店铺的「部分结果」文件可能仍在组装:文件落地前不能让任务提前终态, + // 否则前端停止轮询、下载按钮永远不出现(失败任务的部分结果同样要能下载; + // 对齐 PriceTrackTaskService 的同一守卫) + if (isResultAwaitingFileAssembly(fr, jobMap.get(fr.getId()))) { + allDone = false; + continue; + } fail++; allErrors.add(fr.getSourceFilename() + ": " + fr.getErrorMessage()); } else { @@ -1023,7 +1049,11 @@ public class ProductRiskTaskService { task.setErrorMessage(null); task.setFinishedAt(LocalDateTime.now()); } else if (ok > 0) { - task.setStatus("SUCCESS"); + // 部分店铺失败 = 结果不完整,如实标 FAILED 并写明原因(失败店铺已跑出来的行 + // 会组装成「部分结果」文件,仍可下载)。原实现标 SUCCESS,让「审批里国家 + // 搜索失败被跳过」这类事故在任务列表里全绿:2026-09-30 生产 25 条全 SUCCESS + // 即此类;语义与跟价 4.0.26「任务没跑完如实报失败」一致 + task.setStatus("FAILED"); task.setErrorMessage(String.join("; ", allErrors.isEmpty() ? batchErrors : allErrors)); task.setFinishedAt(LocalDateTime.now()); } else { diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/service/ShopMatchTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/service/ShopMatchTaskService.java index b3bf22413..38e0858d0 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/service/ShopMatchTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/service/ShopMatchTaskService.java @@ -976,6 +976,12 @@ public class ShopMatchTaskService { } ok++; } else if (failed) { + // 失败行也可能正在组装"部分结果"文件:文件没落地前不能让任务提前终态, + // 否则前端一停轮询,下载按钮永远不出现(失败任务的结果文件同样要能下载) + if (isResultAwaitingFileAssembly(row, jobMap.get(row.getId()))) { + allDone = false; + continue; + } fail++; errors.add(row.getSourceFilename() + ": " + row.getErrorMessage()); } else { @@ -998,7 +1004,10 @@ public class ShopMatchTaskService { task.setErrorMessage(null); task.setFinishedAt(now()); } else if (ok > 0) { - task.setStatus("SUCCESS"); + // 部分店铺失败也必须是 FAILED(2026-09-30 修:此前标 SUCCESS 只把原因挂在 + // errorMessage,前端按成功展示;失败行的"部分结果"文件由上面的组装守卫 + // 确保已落地,标失败不影响下载) + task.setStatus("FAILED"); task.setErrorMessage(String.join(";", errors.isEmpty() ? batchErrors : errors)); task.setFinishedAt(now()); } else { 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 new file mode 100644 index 000000000..f0a89dd16 --- /dev/null +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskTaskServiceTest.java @@ -0,0 +1,286 @@ +package com.nanri.aiimage.modules.productrisk.service; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.nanri.aiimage.common.service.ResultDownloadResolver; +import com.nanri.aiimage.config.TaskPressureProperties; +import com.nanri.aiimage.modules.file.service.oss.OssStorageService; +import com.nanri.aiimage.modules.productrisk.mapper.ProductRiskShopCandidateMapper; +import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskRowDto; +import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskShopPayloadDto; +import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskSubmitResultRequest; +import com.nanri.aiimage.modules.productrisk.model.enums.ProductRiskCountryCode; +import com.nanri.aiimage.modules.task.mapper.FileResultMapper; +import com.nanri.aiimage.modules.task.mapper.FileTaskMapper; +import com.nanri.aiimage.modules.task.model.entity.FileResultEntity; +import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity; +import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity; +import com.nanri.aiimage.modules.task.service.TaskDistributedLockService; +import com.nanri.aiimage.modules.task.service.TaskFileJobService; +import com.nanri.aiimage.modules.task.service.TaskProgressLightAssembler; +import com.nanri.aiimage.modules.task.service.TaskProgressSnapshotService; +import com.nanri.aiimage.modules.task.service.TaskResultItemService; +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.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.support.SimpleTransactionStatus; + +import java.util.List; +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +/** + * 审批(PRODUCT_RISK_RESOLVE)任务终态语义回归: + * 2026-09-30 生产事故——客户端在某个国家的搜索/切换失败后「跳过该国家」只打本机日志、 + * 服务端收不到任何失败信号,任务最后仍判 SUCCESS(25 条全绿)。本测试锁定: + * 1) 店铺带 error 上报(有已跑出的行)→ 部分结果文件组装完成后任务判 FAILED,不再是 SUCCESS; + * 2) 部分结果文件仍在组装期间不得提前终态(否则前端停轮询、下载按钮永不出现); + * 3) 店铺带 error 且一行可用数据都没有 → 纯失败(不排队组装); + * 4) 全部店铺成功 → 依旧 SUCCESS(不误伤); + * 5) 删行重算(reconcile)与主判定同一口径:部分失败不会被翻回 SUCCESS。 + */ +@ExtendWith(MockitoExtension.class) +class ProductRiskTaskServiceTest { + + private static final String MODULE_TYPE = "PRODUCT_RISK_RESOLVE"; + private static final String SHOP_KEY = "蔡建芳"; + private static final String SKIP_REASON = "切换到国家(False)/库存页面(True)/搜索筛选到指定选项(False) 德国 失败,已重试 5 次,跳过该国家"; + + @Mock private FileTaskMapper fileTaskMapper; + @Mock private FileResultMapper fileResultMapper; + @Mock private ProductRiskShopCandidateMapper candidateMapper; + @Mock private ZiniaoShopSwitchService ziniaoShopSwitchService; + @Mock private ProductRiskExcelAssemblyService excelAssemblyService; + @Mock private OssStorageService ossStorageService; + @Mock private ResultDownloadResolver resultDownloadResolver; + @Mock private ObjectMapper objectMapper; + @Mock private ProductRiskTaskCacheService productRiskTaskCacheService; + @Mock private TaskPressureProperties taskPressureProperties; + @Mock private TaskResultPayloadService taskResultPayloadService; + @Mock private TaskFileJobService taskFileJobService; + @Mock private TaskResultItemService taskResultItemService; + @Mock private TaskProgressSnapshotService taskProgressSnapshotService; + @Mock private TaskDistributedLockService taskDistributedLockService; + @Mock private TaskProgressLightAssembler taskProgressLightAssembler; + @Mock private PlatformTransactionManager transactionManager; + + @InjectMocks private ProductRiskTaskService service; + + /** + * 核心回归(原 bug):一个店铺成功 + 一个店铺失败(带原因、部分结果文件已就绪) + * → 任务必须 FAILED 并写明原因,不再假绿成 SUCCESS。 + */ + @Test + void partialFailureMarksTaskFailedNotSuccess() { + long taskId = 29593L; + FileTaskEntity task = runningTask(taskId); + + FileResultEntity okResult = shopResult(92001L, taskId, "张三", 1, null); + okResult.setResultFilename("张三.zip"); + okResult.setResultFileUrl("oss/product-risk/zhang.zip"); + + FileResultEntity failedResult = shopResult(92002L, 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(okResult, failedResult)); + when(ziniaoShopSwitchService.normalizeShopName(SHOP_KEY)).thenReturn(SHOP_KEY); + when(excelAssemblyService.normalizeCountriesMap(any())).thenReturn(Map.of("德国", List.of(businessRow()))); + when(excelAssemblyService.countRows(any())).thenReturn(1); + // 模拟失败店铺的部分结果文件已组装完成(真实流程由 processResultFileJob 写回并重算状态) + TaskFileJobEntity doneJob = new TaskFileJobEntity(); + doneJob.setStatus("SUCCESS"); + when(taskFileJobService.findAssembleJobsByResultIds(eq(MODULE_TYPE), anyList())) + .thenReturn(Map.of(failedResult.getId(), doneJob)); + + service.submitResult(taskId, requestWithFailedShop()); + + assertEquals("FAILED", task.getStatus(), "部分店铺失败必须如实判 FAILED,不能再标 SUCCESS"); + assertNotNull(task.getFinishedAt()); + assertNotNull(task.getErrorMessage()); + assertTrue(task.getErrorMessage().contains("跳过该国家"), + "失败原因要回显给用户,实际=" + task.getErrorMessage()); + assertEquals(0, failedResult.getSuccess(), "失败店铺保留失败态(部分结果可下载)"); + assertEquals("蔡建芳.zip", failedResult.getResultFilename()); + verify(lock).close(); + } + + /** + * 守卫回归:失败店铺的部分结果文件尚在组装(job 未 SUCCESS)→ 任务保持 RUNNING, + * 不得提前终态;文件就绪后再由组装回调判 FAILED。 + */ + @Test + void failedShopAwaitingPartialFileKeepsTaskRunning() { + long taskId = 29594L; + FileTaskEntity task = runningTask(taskId); + FileResultEntity failedResult = shopResult(92011L, 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(failedResult)); + when(ziniaoShopSwitchService.normalizeShopName(SHOP_KEY)).thenReturn(SHOP_KEY); + when(excelAssemblyService.normalizeCountriesMap(any())).thenReturn(Map.of("德国", List.of(businessRow()))); + when(excelAssemblyService.countRows(any())).thenReturn(1); + TaskFileJobEntity pendingJob = new TaskFileJobEntity(); + pendingJob.setStatus("ENQUEUED"); + when(taskFileJobService.findAssembleJobsByResultIds(eq(MODULE_TYPE), anyList())) + .thenReturn(Map.of(failedResult.getId(), pendingJob)); + + service.submitResult(taskId, requestWithFailedShop()); + + assertEquals("RUNNING", task.getStatus(), "部分结果文件没落地前任务不得终态"); + assertNull(task.getFinishedAt()); + assertNull(task.getErrorMessage()); + assertEquals("蔡建芳.zip", failedResult.getResultFilename()); + assertNull(failedResult.getResultFileUrl(), "文件未组装完成时不能有下载直链"); + assertEquals(SKIP_REASON, failedResult.getErrorMessage()); + verify(taskFileJobService).enqueueAssembleResult(taskId, MODULE_TYPE, failedResult.getId(), SHOP_KEY); + } + + /** + * 失败店铺一行可用数据都没有 → 纯失败:不排队组装,任务 FAILED 且带原因。 + */ + @Test + void failedShopWithoutAnyRowsFailsWithoutResultFile() { + long taskId = 29595L; + FileTaskEntity task = runningTask(taskId); + FileResultEntity failedResult = shopResult(92021L, 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(failedResult)); + when(ziniaoShopSwitchService.normalizeShopName(SHOP_KEY)).thenReturn(SHOP_KEY); + + ProductRiskSubmitResultRequest request = requestWithFailedShop(); + request.getShops().get(0).setCountries(new java.util.LinkedHashMap<>()); + service.submitResult(taskId, request); + + assertEquals("FAILED", task.getStatus()); + assertTrue(task.getErrorMessage().contains("跳过该国家")); + assertNull(failedResult.getResultFilename(), "零行可用时不应产出结果文件"); + verify(taskFileJobService, never()).enqueueAssembleResult(any(), any(), any(), any()); + } + + /** 全部店铺成功 → 依旧 SUCCESS(本次改动不误伤全绿任务)。 */ + @Test + void allShopsSucceededStaysSuccess() { + long taskId = 29596L; + FileTaskEntity task = runningTask(taskId); + FileResultEntity okResult = shopResult(92031L, taskId, "张三", 1, null); + okResult.setResultFilename("张三.zip"); + okResult.setResultFileUrl("oss/product-risk/zhang.zip"); + + 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(okResult)); + when(ziniaoShopSwitchService.normalizeShopName("张三")).thenReturn("张三"); + + ProductRiskShopPayloadDto payload = new ProductRiskShopPayloadDto(); + payload.setShopName("张三"); + payload.setCountries(Map.of(ProductRiskCountryCode.DE, List.of(businessRow()))); + ProductRiskSubmitResultRequest request = new ProductRiskSubmitResultRequest(); + request.setShops(List.of(payload)); + + service.submitResult(taskId, request); + + assertEquals("SUCCESS", task.getStatus()); + assertNull(task.getErrorMessage()); + assertNotNull(task.getFinishedAt()); + } + + /** + * 删行重算(reconcile)同一口径:删一条行后剩下的结果为一成功一失败 + * → 任务保持/判为 FAILED,不会被翻回 SUCCESS。 + */ + @Test + void reconcileAfterRemovalKeepsPartialFailureFailed() { + long taskId = 29600L; + long userId = 671L; + FileResultEntity candidate = shopResult(93001L, taskId, SHOP_KEY, null, null); + candidate.setUserId(userId); + + FileTaskEntity task = runningTask(taskId); + task.setUserId(userId); + + FileResultEntity okResult = shopResult(93002L, taskId, "张三", 1, null); + okResult.setResultFilename("张三.zip"); + okResult.setResultFileUrl("oss/product-risk/zhang.zip"); + FileResultEntity failedResult = shopResult(93003L, taskId, "李四", 0, "德国: 跳过该国家"); + failedResult.setResultFilename("李四.zip"); + failedResult.setResultFileUrl("oss/product-risk/li.zip"); + + TaskDistributedLockService.LockHandle lock = mock(TaskDistributedLockService.LockHandle.class); + when(ziniaoShopSwitchService.normalizeShopName(SHOP_KEY)).thenReturn(SHOP_KEY); + when(fileResultMapper.selectList(any())).thenReturn(List.of(candidate), List.of(okResult, failedResult)); + when(productRiskTaskCacheService.getTaskCacheBatch(List.of(taskId))).thenReturn(Map.of(taskId, task)); + when(taskDistributedLockService.acquire(MODULE_TYPE, taskId)).thenReturn(lock); + when(fileResultMapper.selectById(93001L)).thenReturn(candidate); + when(transactionManager.getTransaction(any())).thenReturn(new SimpleTransactionStatus()); + + service.deletePendingShopResult(userId, SHOP_KEY); + + assertEquals("FAILED", task.getStatus(), "部分失败任务被删行重算后不能翻回 SUCCESS"); + assertTrue(task.getErrorMessage().contains("跳过该国家")); + assertEquals(1, task.getSuccessFileCount()); + assertEquals(1, task.getFailedFileCount()); + verify(fileResultMapper).deleteById(93001L); + verify(lock).close(); + } + + private FileTaskEntity runningTask(long taskId) { + FileTaskEntity task = new FileTaskEntity(); + task.setId(taskId); + task.setUserId(671L); + task.setModuleType(MODULE_TYPE); + task.setStatus("RUNNING"); + return task; + } + + private FileResultEntity shopResult(Long id, long taskId, String shopKey, Integer success, String errorMessage) { + FileResultEntity result = new FileResultEntity(); + result.setId(id); + result.setTaskId(taskId); + result.setModuleType(MODULE_TYPE); + result.setSourceFilename(shopKey); + result.setSuccess(success); + result.setErrorMessage(errorMessage); + return result; + } + + /** 一行真实业务数据(productAsinSku 非空即算业务行)。 */ + private ProductRiskRowDto businessRow() { + ProductRiskRowDto row = new ProductRiskRowDto(); + row.setProductAsinSku("B0TEST123"); + row.setStatus("处理完成"); + return row; + } + + private ProductRiskSubmitResultRequest requestWithFailedShop() { + ProductRiskShopPayloadDto payload = new ProductRiskShopPayloadDto(); + payload.setShopName(SHOP_KEY); + payload.setError(SKIP_REASON); + payload.setCountries(Map.of(ProductRiskCountryCode.DE, List.of(businessRow()))); + ProductRiskSubmitResultRequest request = new ProductRiskSubmitResultRequest(); + request.setShops(List.of(payload)); + return request; + } +}