fix(b82-01): 第三批——七面实体式终态写点接上 ledger(风险/店铺匹配/查ASIN/提现/巡删/店铺采集/巡删品牌)
现网读数(2026-11-05 只读探针)把缺口指得很实:9 条「文案命中 markers 而 failure_category 为空」
的 FAILED 单里,除了已接的跟价(CREDENTIAL)与外观专利(DELIVERY)两族,其余写面全部落在
名单外——B82-01 的②「抽样窗口里那些文案本来就不在值域」有一半就是"这些面根本没接线"。
本笔把 `TaskFailureCategoryGuardrailTest.ENTITY_FACE_FILES` 从四面扩到十一面(+32 处写点,
15→47),逐处 `task.setErrorMessage(...)` 紧邻下一行配对
`task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()))`:
· 风险 8/店铺匹配 5/查ASIN 3/提现 3/巡删 3 —— 这五面都是「汇总行状态 → 任务终态」那一族,
任务级文案是店铺级原因**拼出来的**(`"李四: 会话失效且重新登录失败"` 这种),
所以列值多数时候仍是 null,免疫力恰好在"店铺级原因命中六组 markers"那一刻买到;
· 店铺采集 4(含 `handleResultFileJobFailure` 那处把「结果文件生成失败」写进任务行的 DELIVERY 族)
/巡删品牌 6(含「N 个结果文件生成失败」「部分结果文件生成失败」两支 DELIVERY)。
**清错误同时清列**:`setErrorMessage(null)` 那半边一并配对,否则一行"成功/RUNNING"任务上
会挂着一个不属于它的旧判决——这正是护栏第五格场景④点名的背离。
`updateById` 一边不动(十一面用的都是全实体血统,ALWAYS 会把列真落库),
`.updateById(` 总量棘轮 160 一字未改;本笔没有新增任何 catch。
DeleteBrand 那处跨三行的三元表达式改成局部变量再 set:配对判据钉的是「下一行」,
把 set 拆成多行会让那一格看不见配对——**不放宽判据,改书写形状**。
行为半边(`ProductRiskTaskServiceTest` +1 改 1):护栏源码格只钉"下一行有配对语句",
这两格钉"值真的落在交给 mapper 的那个实体上"——`verify(fileTaskMapper).updateById(captor)`
拿到 CREDENTIAL/成功路径把陈旧 DELIVERY 清成 null。**两格都做过反向验证**:
摘掉对应配对分别报 `expected CREDENTIAL but was null` 与 `expected null but was DELIVERY`。
门禁:`mvn -o test` 整量 **5,353 例/0 失败/19 skipped(10:47,skipped 与在册基线逐字同)**。
部署口径:本笔未随任何 jar 发版 ⇒ 「写点已修」≠「线上已修」,随下一窗后端发版生效;
线上正样本至今 n=1(33418/DELIVERY),这七面接线后仍需各自的第一个 FAILED 单才算被生产验证。
This commit is contained in:
+11
-2
@@ -296,6 +296,7 @@ public class DeleteBrandRunService extends AbstractFileTaskPipeline<DeleteBrandP
|
||||
if (processableFileCount <= 0) {
|
||||
task.setStatus("FAILED");
|
||||
task.setErrorMessage(parsedFailedCount > 0 ? "全部文件解析或匹配失败" : null);
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
task.setFinishedAt(LocalDateTime.now());
|
||||
persist.set(FileTaskEntity::getStatus, task.getStatus())
|
||||
.set(FileTaskEntity::getErrorMessage, task.getErrorMessage())
|
||||
@@ -1174,6 +1175,7 @@ public class DeleteBrandRunService extends AbstractFileTaskPipeline<DeleteBrandP
|
||||
if (matchedCount > 0 && "FAILED".equals(task.getStatus())) {
|
||||
task.setStatus("RUNNING");
|
||||
task.setErrorMessage(null);
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
task.setFinishedAt(null);
|
||||
}
|
||||
fileTaskMapper.updateById(task);
|
||||
@@ -1408,6 +1410,7 @@ public class DeleteBrandRunService extends AbstractFileTaskPipeline<DeleteBrandP
|
||||
inNewTransactionVoid(() -> {
|
||||
task.setStatus("RUNNING");
|
||||
task.setErrorMessage(null);
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
task.setUpdatedAt(LocalDateTime.now());
|
||||
task.setFinishedAt(null);
|
||||
fileTaskMapper.updateById(task);
|
||||
@@ -1655,9 +1658,13 @@ public class DeleteBrandRunService extends AbstractFileTaskPipeline<DeleteBrandP
|
||||
task.setStatus(failedCount > 0 ? "FAILED" : "SUCCESS");
|
||||
task.setSuccessFileCount(successCount);
|
||||
task.setFailedFileCount(failedCount);
|
||||
task.setErrorMessage(failedCount > 0
|
||||
// 文案先落进局部变量:配对判据是「setErrorMessage 的下一行」(护栏第五格的书写形状),
|
||||
// 把三元表达式拆成跨三行的 set 会让那一格看不见配对(第三批实测踩点,不放宽判据)。
|
||||
String autoFinalizeMessage = failedCount > 0
|
||||
? (successCount > 0 ? "部分结果文件生成失败,已按结果行状态自动收尾" : "任务中间数据缺失,已按结果行状态自动收尾")
|
||||
: null);
|
||||
: null;
|
||||
task.setErrorMessage(autoFinalizeMessage);
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
task.setUpdatedAt(LocalDateTime.now());
|
||||
task.setFinishedAt(LocalDateTime.now());
|
||||
fileTaskMapper.updateById(task);
|
||||
@@ -1837,6 +1844,7 @@ public class DeleteBrandRunService extends AbstractFileTaskPipeline<DeleteBrandP
|
||||
task.setSuccessFileCount(successCount);
|
||||
task.setFailedFileCount(failedCount);
|
||||
task.setErrorMessage(failedCount > 0 ? failedCount + " 个结果文件生成失败" : null);
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
task.setResultJson(toCompactTaskResultJsonForDb(finalItems));
|
||||
task.setUpdatedAt(LocalDateTime.now());
|
||||
task.setFinishedAt(waitingForAssemble ? null : LocalDateTime.now());
|
||||
@@ -1854,6 +1862,7 @@ public class DeleteBrandRunService extends AbstractFileTaskPipeline<DeleteBrandP
|
||||
} catch (Exception ex) {
|
||||
task.setStatus("FAILED");
|
||||
task.setErrorMessage(UserMessages.orFallback(ex.getMessage(), "删除ASIN任务执行失败"));
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
task.setUpdatedAt(LocalDateTime.now());
|
||||
task.setFinishedAt(LocalDateTime.now());
|
||||
fileTaskMapper.updateById(task);
|
||||
|
||||
+4
@@ -32,6 +32,7 @@ import com.nanri.aiimage.modules.task.service.TaskFileJobService;
|
||||
import com.nanri.aiimage.modules.task.service.TaskFinalizeSupport;
|
||||
import com.nanri.aiimage.modules.task.service.TaskProgressSnapshotService;
|
||||
import com.nanri.aiimage.modules.task.service.TaskResultItemService;
|
||||
import com.nanri.aiimage.modules.task.service.support.TaskFailureLedger;
|
||||
import com.nanri.aiimage.modules.task.service.TaskScopePayloadStorageService;
|
||||
import com.nanri.aiimage.modules.ziniao.service.ZiniaoShopSwitchService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -799,6 +800,7 @@ public class PatrolDeleteTaskService {
|
||||
task.setStatus("RUNNING");
|
||||
task.setFinishedAt(null);
|
||||
task.setErrorMessage(null);
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
return;
|
||||
}
|
||||
task.setStatus(failedCount > 0 ? "FAILED" : "SUCCESS");
|
||||
@@ -811,8 +813,10 @@ public class PatrolDeleteTaskService {
|
||||
}
|
||||
}
|
||||
task.setErrorMessage(String.join("; ", errors));
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
} else {
|
||||
task.setErrorMessage(null);
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+9
@@ -33,6 +33,7 @@ import com.nanri.aiimage.modules.task.service.TaskFinalizeSupport;
|
||||
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.task.service.support.TaskFailureLedger;
|
||||
import com.nanri.aiimage.modules.ziniao.service.ZiniaoShopSwitchService;
|
||||
import cn.hutool.core.io.FileUtil;
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
@@ -401,10 +402,12 @@ public class ProductRiskTaskService {
|
||||
if (!allDone) {
|
||||
task.setStatus("RUNNING");
|
||||
task.setErrorMessage(null);
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
task.setFinishedAt(null);
|
||||
} else if (ok > 0 && fail == 0) {
|
||||
task.setStatus("SUCCESS");
|
||||
task.setErrorMessage(null);
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
task.setFinishedAt(LocalDateTime.now());
|
||||
} else if (ok > 0) {
|
||||
// 与 updateTaskStatusFromLatestRows 同一口径:部分店铺失败 = 结果不完整,
|
||||
@@ -412,10 +415,12 @@ public class ProductRiskTaskService {
|
||||
// 删一条无关键结果行就会把已判 FAILED 的部分失败任务翻回「成功」
|
||||
task.setStatus("FAILED");
|
||||
task.setErrorMessage(String.join("; ", allErrors));
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
task.setFinishedAt(LocalDateTime.now());
|
||||
} else {
|
||||
task.setStatus("FAILED");
|
||||
task.setErrorMessage(allErrors.isEmpty() ? "全部店铺处理失败" : String.join("; ", allErrors));
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
task.setFinishedAt(LocalDateTime.now());
|
||||
}
|
||||
try {
|
||||
@@ -1000,10 +1005,12 @@ public class ProductRiskTaskService {
|
||||
if (!allDone) {
|
||||
task.setStatus("RUNNING");
|
||||
task.setErrorMessage(null);
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
task.setFinishedAt(null);
|
||||
} else if (ok > 0 && fail == 0) {
|
||||
task.setStatus("SUCCESS");
|
||||
task.setErrorMessage(null);
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
task.setFinishedAt(LocalDateTime.now());
|
||||
} else if (ok > 0) {
|
||||
// 部分店铺失败 = 结果不完整,如实标 FAILED 并写明原因(失败店铺已跑出来的行
|
||||
@@ -1012,10 +1019,12 @@ public class ProductRiskTaskService {
|
||||
// 即此类;语义与跟价 4.0.26「任务没跑完如实报失败」一致
|
||||
task.setStatus("FAILED");
|
||||
task.setErrorMessage(String.join("; ", allErrors.isEmpty() ? batchErrors : allErrors));
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
task.setFinishedAt(LocalDateTime.now());
|
||||
} else {
|
||||
task.setStatus("FAILED");
|
||||
task.setErrorMessage(allErrors.isEmpty() ? "all shops failed" : String.join("; ", allErrors));
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
task.setFinishedAt(LocalDateTime.now());
|
||||
}
|
||||
try {
|
||||
|
||||
+4
@@ -32,6 +32,7 @@ import com.nanri.aiimage.modules.task.service.TaskFileJobService;
|
||||
import com.nanri.aiimage.modules.task.service.TaskFinalizeSupport;
|
||||
import com.nanri.aiimage.modules.task.service.TaskProgressSnapshotService;
|
||||
import com.nanri.aiimage.modules.task.service.TaskResultItemService;
|
||||
import com.nanri.aiimage.modules.task.service.support.TaskFailureLedger;
|
||||
import com.nanri.aiimage.modules.ziniao.service.ZiniaoShopSwitchService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -779,6 +780,7 @@ public class QueryAsinTaskService {
|
||||
task.setStatus("RUNNING");
|
||||
task.setFinishedAt(null);
|
||||
task.setErrorMessage(null);
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
return;
|
||||
}
|
||||
task.setStatus(failedCount > 0 ? "FAILED" : "SUCCESS");
|
||||
@@ -791,8 +793,10 @@ public class QueryAsinTaskService {
|
||||
}
|
||||
}
|
||||
task.setErrorMessage(String.join("; ", errors));
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
} else {
|
||||
task.setErrorMessage(null);
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+4
@@ -1430,6 +1430,7 @@ public class ShopDataCrawlTaskService extends AbstractFileTaskPipeline<ShopDataC
|
||||
task.setStatus("RUNNING");
|
||||
task.setFinishedAt(null);
|
||||
task.setErrorMessage(null);
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
return;
|
||||
}
|
||||
task.setStatus(failedCount > 0 ? "FAILED" : "SUCCESS");
|
||||
@@ -1442,8 +1443,10 @@ public class ShopDataCrawlTaskService extends AbstractFileTaskPipeline<ShopDataC
|
||||
}
|
||||
}
|
||||
task.setErrorMessage(String.join("; ", errors));
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
} else {
|
||||
task.setErrorMessage(null);
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3058,6 +3061,7 @@ public class ShopDataCrawlTaskService extends AbstractFileTaskPipeline<ShopDataC
|
||||
updateTaskStatusFromRows(task, rows);
|
||||
task.setStatus("FAILED");
|
||||
task.setErrorMessage(firstNonBlank(message, "结果文件生成失败"));
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
task.setFinishedAt(LocalDateTime.now());
|
||||
persistSnapshotJson(task, snapshots);
|
||||
fileTaskMapper.updateById(task);
|
||||
|
||||
+6
@@ -41,6 +41,7 @@ import com.nanri.aiimage.modules.task.service.TaskDistributedLockService;
|
||||
import com.nanri.aiimage.modules.task.service.TaskFileJobService;
|
||||
import com.nanri.aiimage.modules.task.service.TaskFinalizeSupport;
|
||||
import com.nanri.aiimage.modules.task.service.TaskResultPayloadService;
|
||||
import com.nanri.aiimage.modules.task.service.support.TaskFailureLedger;
|
||||
import com.nanri.aiimage.modules.task.service.pipeline.AbstractShopPayloadTaskPipeline;
|
||||
import com.nanri.aiimage.modules.ziniao.service.ZiniaoShopSwitchService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -977,14 +978,17 @@ public class ShopMatchTaskService extends AbstractShopPayloadTaskPipeline<ShopMa
|
||||
if (shouldRemainRunningUntilNextStage(task)) {
|
||||
task.setStatus("RUNNING");
|
||||
task.setErrorMessage(null);
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
task.setFinishedAt(null);
|
||||
} else if (!allDone) {
|
||||
task.setStatus("RUNNING");
|
||||
task.setErrorMessage(null);
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
task.setFinishedAt(null);
|
||||
} else if (ok > 0 && fail == 0) {
|
||||
task.setStatus("SUCCESS");
|
||||
task.setErrorMessage(null);
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
task.setFinishedAt(now());
|
||||
} else if (ok > 0) {
|
||||
// 部分店铺失败也必须是 FAILED(2026-09-30 修:此前标 SUCCESS 只把原因挂在
|
||||
@@ -992,10 +996,12 @@ public class ShopMatchTaskService extends AbstractShopPayloadTaskPipeline<ShopMa
|
||||
// 确保已落地,标失败不影响下载)
|
||||
task.setStatus("FAILED");
|
||||
task.setErrorMessage(String.join(";", errors.isEmpty() ? batchErrors : errors));
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
task.setFinishedAt(now());
|
||||
} else {
|
||||
task.setStatus("FAILED");
|
||||
task.setErrorMessage(errors.isEmpty() ? "全部店铺处理失败" : String.join(";", errors));
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
task.setFinishedAt(now());
|
||||
}
|
||||
try {
|
||||
|
||||
+4
@@ -21,6 +21,7 @@ import com.nanri.aiimage.modules.task.service.TaskFileJobService;
|
||||
import com.nanri.aiimage.modules.task.service.TaskFinalizeSupport;
|
||||
import com.nanri.aiimage.modules.task.service.TaskProgressSnapshotService;
|
||||
import com.nanri.aiimage.modules.task.service.TaskResultItemService;
|
||||
import com.nanri.aiimage.modules.task.service.support.TaskFailureLedger;
|
||||
import com.nanri.aiimage.modules.withdraw.model.dto.WithdrawCreateTaskRequest;
|
||||
import com.nanri.aiimage.modules.withdraw.model.dto.WithdrawRowDto;
|
||||
import com.nanri.aiimage.modules.withdraw.model.dto.WithdrawShopPayloadDto;
|
||||
@@ -799,6 +800,7 @@ public class WithdrawTaskService {
|
||||
task.setStatus("RUNNING");
|
||||
task.setFinishedAt(null);
|
||||
task.setErrorMessage(null);
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
return;
|
||||
}
|
||||
task.setStatus(failedCount > 0 ? "FAILED" : "SUCCESS");
|
||||
@@ -811,8 +813,10 @@ public class WithdrawTaskService {
|
||||
}
|
||||
}
|
||||
task.setErrorMessage(String.join("; ", errors));
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
} else {
|
||||
task.setErrorMessage(null);
|
||||
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user