From 9b23b4934d3d9fda9f69acfb3ce145674a96a88e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Fri, 20 Nov 2026 21:48:59 +0800 Subject: [PATCH] =?UTF-8?q?feat(jd-publish):=20=E7=9B=AE=E6=A0=87=E5=93=81?= =?UTF-8?q?=E7=89=8C=E5=BB=BA=E5=8D=95=EF=BC=8B=E6=A0=A1=E9=AA=8C=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E6=95=B4=E5=8D=95=E5=88=A4=E6=AD=BB=EF=BC=8B=E6=94=B9?= =?UTF-8?q?=E5=93=81=E7=89=8C=E5=8E=9F=E4=BD=8D=E9=87=8D=E8=AF=95=EF=BC=88?= =?UTF-8?q?=E6=A1=8C=E9=9D=A2=E5=8D=8F=E8=AE=AE=20v3=20=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=AB=AF=E5=8D=8A=E8=BE=B9=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 建单必填目标品牌(1–120 字符单行),走 /tasks/target-brand 独占路径,旧后端不会静默丢参数 - 激活与明细下发带 jdPublishProtocol,协议 <3 直接 409 要求升级客户端;明细 VO 下发 targetBrandName - 预检失败回执(SOURCE/BRAND)必须带一条失败明细,整单判 FAILED 并落分类前缀;通用重试/继续对品牌失败任务拒绝 - 新增 /tasks/{taskId}/retry-brand:只允许无成功、无待确认记录的品牌失败任务改品牌后原位重试(世代+1、明细复位、回执直推本机队列) - 兜底拉取按协议过滤带 targetBrandName 的 JD 上架任务,认领 CAS 带 resumeAttempt 防跨代误领 - 用户端:目标品牌必填输入、协议探测挡旧客户端、品牌失败弹窗与「修改品牌并重试」按钮 --- .../common/task/JdPublishProtocol.java | 20 ++ .../jd/controller/JdPublishController.java | 19 +- .../jd/model/dto/JdPublishChunkRequest.java | 5 + .../model/dto/JdPublishTaskCreateRequest.java | 3 + .../jd/model/vo/JdPublishItemsPageVo.java | 3 + .../jd/service/JdPublishIngestService.java | 31 +++ .../jd/service/JdPublishTaskService.java | 97 ++++++++- .../controller/TaskClientPullController.java | 5 +- .../modules/task/mapper/FileTaskMapper.java | 3 +- .../task/service/TaskClientPullService.java | 18 +- .../task/service/TaskInPlaceRetryService.java | 11 + .../resources/mapper/task/FileTaskMapper.xml | 6 +- .../jd/JdPublishContractPendingTest.java | 4 +- .../service/JdPublishIngestServiceTest.java | 30 +++ .../jd/service/JdPublishTaskServiceTest.java | 80 ++++++- .../mapper/FileTaskMapperChannelSqlTest.java | 16 +- .../service/TaskClientPullServiceTest.java | 14 +- .../service/TaskInPlaceRetryServiceTest.java | 11 + frontend-vue/src/pages/jd/JdPublishTab.vue | 206 +++++++++++++++--- frontend-vue/src/shared/api/endpoints.ts | 5 +- .../shared/api/types/modules/jd-publish.ts | 11 +- frontend-vue/src/shared/bridges/pywebview.ts | 2 + frontend-vue/tests/endpoints.test.ts | 2 + .../mount/jd-publish-dispatch.mount.test.ts | 133 ++++++++++- 24 files changed, 653 insertions(+), 82 deletions(-) create mode 100644 backend-java/src/main/java/com/nanri/aiimage/common/task/JdPublishProtocol.java diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/task/JdPublishProtocol.java b/backend-java/src/main/java/com/nanri/aiimage/common/task/JdPublishProtocol.java new file mode 100644 index 000000000..0517b8046 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/common/task/JdPublishProtocol.java @@ -0,0 +1,20 @@ +package com.nanri.aiimage.common.task; + +/** Desktop contract shared by the JD publisher and the generic pull/retry routes. */ +public final class JdPublishProtocol { + public static final int LEGACY = 2; + public static final int TARGET_BRAND = 3; + public static final String BRAND_FAILURE = "目标品牌校验失败:"; + public static final String SOURCE_FAILURE = "本店源商品校验失败:"; + + private JdPublishProtocol() { + } + + public static boolean supportsTargetBrand(Integer protocol) { + return Integer.valueOf(TARGET_BRAND).equals(protocol); + } + + public static boolean needsBrandCorrection(String message) { + return message != null && message.startsWith(BRAND_FAILURE); + } +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/controller/JdPublishController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/controller/JdPublishController.java index 870392313..81da66d31 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/controller/JdPublishController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/controller/JdPublishController.java @@ -60,7 +60,7 @@ public class JdPublishController { private final TaskProgressOwnershipSupport progressOwnershipSupport; private final AdminAuthSupport adminAuthSupport; - @PostMapping("/tasks") + @PostMapping({"/tasks", "/tasks/target-brand"}) @Operation(summary = "创建京东商品上架任务", description = "勾选京东数据库商品(归属校验)+可选统一改价规则建单;" + "任务落 PENDING、执行通道显式 LOCAL(本机已登录京麦的 Chrome 执行)、明细快照行随建单落库。" + "响应体带 queuePayload(type=jd-product-publish-run),页面原样投 api.enqueue_json。") @@ -72,13 +72,25 @@ public class JdPublishController { adminAuthSupport.currentDeviceId(httpRequest))); } + @PostMapping("/tasks/{taskId}/retry-brand") + public ApiResponse retryBrand(@PathVariable Long taskId, + @Valid @RequestBody BrandRetryRequest request, HttpServletRequest httpRequest) { + return ApiResponse.success(publishTaskService.retryWithBrand(taskId, + adminAuthSupport.requireSessionOwnerUserId(httpRequest, null), + request.resumeAttempt(), request.targetBrandName())); + } + + public record BrandRetryRequest(@jakarta.validation.constraints.NotNull Integer resumeAttempt, String targetBrandName) {} + @PostMapping("/tasks/{taskId}/activate") @Operation(summary = "认领当前代次的京东上架任务") public ApiResponse activate(@PathVariable Long taskId, @RequestParam("resumeAttempt") int resumeAttempt, + @RequestParam(value = "jdPublishProtocol", required = false) Integer protocol, @RequestParam(value = "user_id", required = false) Long userId, HttpServletRequest httpRequest) { - publishTaskService.activateTask(taskId, adminAuthSupport.requireSessionOwnerUserId(httpRequest, userId), resumeAttempt); + publishTaskService.activateTask(taskId, adminAuthSupport.requireSessionOwnerUserId(httpRequest, userId), + resumeAttempt, protocol); return ApiResponse.success(null); } @@ -96,9 +108,10 @@ public class JdPublishController { @Parameter(description = "任务所属用户 ID;省略时取当前登录身份", required = false, example = "1") @RequestParam(value = "user_id", required = false) Long userId, @RequestParam("resumeAttempt") int resumeAttempt, + @RequestParam(value = "jdPublishProtocol", required = false) Integer protocol, HttpServletRequest httpRequest) { return ApiResponse.success(publishTaskService.pullItems(taskId, - adminAuthSupport.requireSessionOwnerUserId(httpRequest, userId), resumeAttempt, cursor, limit)); + adminAuthSupport.requireSessionOwnerUserId(httpRequest, userId), resumeAttempt, cursor, limit, protocol)); } @GetMapping("/tasks/{taskId}/progress") diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/dto/JdPublishChunkRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/dto/JdPublishChunkRequest.java index 6d046e98f..304984532 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/dto/JdPublishChunkRequest.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/dto/JdPublishChunkRequest.java @@ -35,6 +35,11 @@ public class JdPublishChunkRequest { */ private String error; + /** 提交前明确阻断:SOURCE(源商品/店铺)或 BRAND(目标品牌)。 */ + private PreflightFailure preflightFailure; + + public enum PreflightFailure { SOURCE, BRAND } + /** 单行回传结果。 */ @Data @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/dto/JdPublishTaskCreateRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/dto/JdPublishTaskCreateRequest.java index 31e5a7025..5adc30b66 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/dto/JdPublishTaskCreateRequest.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/dto/JdPublishTaskCreateRequest.java @@ -27,6 +27,9 @@ public class JdPublishTaskCreateRequest { /** 统一改价规则(可选;null=按原价,mode=none)。 */ private PriceRule priceRule; + /** 本次任务统一使用的目标品牌名,不回写商品库。 */ + private String targetBrandName; + /** 统一改价规则:none 原价 / percent 加价百分比(value=百分数) / fixed 固定加价(value=金额)。 */ @Data public static class PriceRule { diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishItemsPageVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishItemsPageVo.java index 5b46997a1..12541d9fa 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishItemsPageVo.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishItemsPageVo.java @@ -15,6 +15,9 @@ import java.util.List; public class JdPublishItemsPageVo { private Long taskId; + + /** 旧任务为空,沿用京麦预填。 */ + private String targetBrandName; private int resumeAttempt; /** 本页明细行。 */ diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishIngestService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishIngestService.java index 4dec27048..f8307d235 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishIngestService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishIngestService.java @@ -3,10 +3,12 @@ package com.nanri.aiimage.modules.jd.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.nanri.aiimage.common.exception.BusinessException; +import com.nanri.aiimage.common.task.JdPublishProtocol; import com.nanri.aiimage.common.task.TaskStatuses; import com.nanri.aiimage.modules.jd.mapper.JdPublishItemMapper; import com.nanri.aiimage.modules.jd.model.dto.JdPublishChunkRequest; import com.nanri.aiimage.modules.jd.model.dto.JdPublishChunkRequest.ItemResult; +import com.nanri.aiimage.modules.jd.model.dto.JdPublishChunkRequest.PreflightFailure; import com.nanri.aiimage.modules.jd.model.entity.JdPublishItemEntity; import com.nanri.aiimage.modules.jd.model.vo.JdPublishChunkVo; import com.nanri.aiimage.modules.task.mapper.FileTaskMapper; @@ -66,6 +68,7 @@ public class JdPublishIngestService { throw new BusinessException(409, "任务不在运行中,请先激活任务再回传"); } + String preflightMessage = preflightMessage(request, items); int accepted = 0; String newlyFailedReason = null; Set seen = new HashSet<>(); @@ -91,6 +94,8 @@ public class JdPublishIngestService { vo.setNeedsReview(Boolean.TRUE.equals(request.getIsEnd()) && vo.getPublishingCount() > 0); if (terminal) { vo.setTaskStatus(task.getStatus()); + } else if (preflightMessage != null && accepted == 1) { + vo.setTaskStatus(finish(task, counts, TaskStatuses.FileTask.FAILED, preflightMessage)); } else if (newlyFailedReason != null && staleTaskService.terminalizeOnJdLoginFatal(task, newlyFailedReason)) { vo.setTaskStatus(TaskStatuses.FileTask.FAILED); } else if (Boolean.TRUE.equals(request.getIsEnd())) { @@ -149,6 +154,12 @@ public class JdPublishIngestService { } String status = failed > 0 ? TaskStatuses.FileTask.FAILED : TaskStatuses.FileTask.SUCCESS; String message = failed > 0 ? "发布完成:成功 " + success + " 行,失败 " + failed + " 行" : null; + return finish(task, counts, status, message); + } + + private String finish(FileTaskEntity task, Map counts, String status, String message) { + long success = counts.getOrDefault(ITEM_SUCCESS, 0L); + long failed = counts.getOrDefault(ITEM_FAILED, 0L); LocalDateTime now = LocalDateTime.now(); int updated = fileTaskMapper.update(null, new LambdaUpdateWrapper() .eq(FileTaskEntity::getId, task.getId()) @@ -169,6 +180,26 @@ public class JdPublishIngestService { return RUNNING; } + private static String preflightMessage(JdPublishChunkRequest request, List items) { + if (request.getPreflightFailure() == null) { + return null; + } + if (items.size() != 1 || items.getFirst() == null + || !ITEM_FAILED.equals(normalizeStatus(items.getFirst().getPublishStatus()))) { + throw new BusinessException(400, "上架校验阻断须同时回传一条失败明细"); + } + String error = truncate(items.getFirst().getPublishError()); + if (error == null || error.isEmpty()) { + throw new BusinessException(400, "上架校验阻断须同时回传失败原因"); + } + String prefix = request.getPreflightFailure() == PreflightFailure.BRAND + ? JdPublishProtocol.BRAND_FAILURE : JdPublishProtocol.SOURCE_FAILURE; + String message = prefix + error; + // biz_file_task.error_message 比发布明细的 publish_error 短。 + int end = message.offsetByCodePoints(0, Math.min(1000, message.codePointCount(0, message.length()))); + return message.substring(0, end); + } + private Map statusCounts(Long taskId) { Map counts = new HashMap<>(); for (Map row : jdPublishItemMapper.countByPublishStatus(taskId)) { diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskService.java index 6b813b938..16f1dcc64 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskService.java @@ -8,7 +8,9 @@ import com.nanri.aiimage.common.exception.BusinessException; import com.nanri.aiimage.common.mapper.AdminUserMapper; import com.nanri.aiimage.common.model.entity.AdminUserEntity; import com.nanri.aiimage.common.security.AdminAuthSupport; +import com.nanri.aiimage.common.task.JdPublishProtocol; import com.nanri.aiimage.common.task.TaskStatuses; +import com.fasterxml.jackson.core.JsonProcessingException; import com.nanri.aiimage.config.CollectRoutingProperties; import com.nanri.aiimage.modules.file.service.oss.OssStorageService; import com.nanri.aiimage.modules.jd.mapper.JdProductImageMapper; @@ -106,6 +108,7 @@ public class JdPublishTaskService { private final ObjectMapper objectMapper; private final TaskHeartbeatService taskHeartbeatService; private final TaskHeartbeatPositionService taskHeartbeatPositionService; + private final JdPublishTaskItemsResetSpiImpl itemsReset; /** 下发批大小出厂值(aiimage.jd.publish.items-batch-size,服务侧钳制上限 100)。 */ @Value("${aiimage.jd.publish.items-batch-size:20}") @@ -150,12 +153,8 @@ public class JdPublishTaskService { task.setDeviceId(AdminAuthSupport.normalizeDeviceId(deviceId)); task.setCreatedAt(now); task.setUpdatedAt(now); - try { - task.setRequestJson(objectMapper.writeValueAsString(request)); - task.setResultJson("{}"); - } catch (Exception ex) { - throw new BusinessException("序列化建单载荷失败", ex); - } + task.setRequestJson(writeCreateRequest(request)); + task.setResultJson("{}"); fileTaskMapper.insert(task); // 建单即落明细快照行(蓝图 §3):标题/类目/价格折算/库存/店铺/编码随行固化, @@ -178,9 +177,10 @@ public class JdPublishTaskService { } /** 仅当前代次的 PENDING 任务能被页面队列中的桌面执行器认领。 */ - public void activateTask(Long taskId, Long userId, int attempt) { + public void activateTask(Long taskId, Long userId, int attempt, Integer protocol) { FileTaskEntity task = requireOwnedTask(taskId, userId); requireAttempt(task, attempt); + targetBrandForClient(task, protocol); int updated = fileTaskMapper.update(null, new LambdaUpdateWrapper() .eq(FileTaskEntity::getId, taskId) .eq(FileTaskEntity::getUserId, userId) @@ -198,9 +198,11 @@ public class JdPublishTaskService { * 重连 cursor 归零也不会重发已发布商品,AC-4 服务端半边);SKU 价按改价规则折算; * 图片发 jd-products 桶预签名 GET URL(蓝图 §3)。 */ - public JdPublishItemsPageVo pullItems(Long taskId, Long userId, int attempt, Long cursor, Integer limit) { + public JdPublishItemsPageVo pullItems(Long taskId, Long userId, int attempt, Long cursor, Integer limit, + Integer protocol) { FileTaskEntity task = requireOwnedTask(taskId, userId); requireAttempt(task, attempt); + String targetBrand = targetBrandForClient(task, protocol); if (!STATUS_RUNNING.equals(task.getStatus())) { throw new BusinessException(409, "任务未在运行,不能下发发布明细"); } @@ -216,6 +218,7 @@ public class JdPublishTaskService { JdPublishItemsPageVo vo = new JdPublishItemsPageVo(); vo.setTaskId(taskId); vo.setResumeAttempt(attempt); + vo.setTargetBrandName(targetBrand); vo.setItems(rows.isEmpty() ? List.of() : rows.stream() .map(row -> buildItemPayload(row, productsByPid.get(row.getProductId()))) .toList()); @@ -265,6 +268,9 @@ public class JdPublishTaskService { Map data = new LinkedHashMap<>(); data.put("taskId", task.getId()); data.put("resumeAttempt", resumeAttempt(task)); + if (create.getTargetBrandName() != null) { + data.put("targetBrandRequired", true); + } data.put("priceRule", create.getPriceRule() == null ? Map.of("mode", "none") : create.getPriceRule()); return Map.of("type", JdPublishTaskPullSpiImpl.QUEUE_TYPE, "data", data); } @@ -337,9 +343,84 @@ public class JdPublishTaskService { throw new BusinessException("单次上架最多选 " + MAX_PRODUCT_IDS + " 个商品,当前 " + request.getProductIds().size() + " 个"); } + request.setTargetBrandName(requireTargetBrand(request.getTargetBrandName())); normalizePriceRule(request); } + private static String requireTargetBrand(String value) { + String brand = value == null ? "" : value.strip(); + if (brand.isEmpty()) { + throw new BusinessException(400, "请填写目标品牌"); + } + if (brand.length() > 120 || brand.codePoints().anyMatch(Character::isISOControl)) { + throw new BusinessException(400, "目标品牌须为不超过 120 个字符的单行名称"); + } + return brand; + } + + private String writeCreateRequest(JdPublishTaskCreateRequest request) { + try { + return objectMapper.writeValueAsString(request); + } catch (JsonProcessingException ex) { + throw new BusinessException("序列化建单载荷失败", ex); + } + } + + private String targetBrandForClient(FileTaskEntity task, Integer protocol) { + String brand = readCreateRequest(task).getTargetBrandName(); + if (brand != null && !JdPublishProtocol.supportsTargetBrand(protocol)) { + throw new BusinessException(409, "请升级数富客户端后再执行目标品牌上架任务"); + } + return brand; + } + + /** 与发布回执锁同一条父任务,品牌修正和换代必须一起提交。 */ + @Transactional + public JdPublishTaskVo retryWithBrand(Long taskId, Long userId, int attempt, String rawBrand) { + String brand = requireTargetBrand(rawBrand); + FileTaskEntity task = assertOwnedTask(fileTaskMapper.selectByIdForUpdate(taskId), userId); + requireAttempt(task, attempt); + if (!TaskStatuses.FileTask.FAILED.equals(task.getStatus()) + || !JdPublishProtocol.needsBrandCorrection(task.getErrorMessage())) { + throw new BusinessException(409, "只有目标品牌校验失败的任务才能修改品牌后重试"); + } + Map counts = aggregateStatusCounts(taskId); + if (counts.getOrDefault(ITEM_SUCCESS, 0L) > 0 || counts.getOrDefault(ITEM_PUBLISHING, 0L) > 0) { + throw new BusinessException(409, "已有发布成功或待确认记录,不能修改本任务品牌;请先在京麦核对"); + } + JdPublishTaskCreateRequest create = readCreateRequest(task); + if (Objects.equals(brand, create.getTargetBrandName())) { + throw new BusinessException(400, "请输入正确的目标品牌,不能原样重试"); + } + create.setTargetBrandName(brand); + String requestJson = writeCreateRequest(create); + int updated = fileTaskMapper.update(null, new LambdaUpdateWrapper() + .eq(FileTaskEntity::getId, taskId) + .eq(FileTaskEntity::getStatus, TaskStatuses.FileTask.FAILED) + .eq(FileTaskEntity::getResumeAttempt, attempt) + .set(FileTaskEntity::getRequestJson, requestJson) + .set(FileTaskEntity::getResumeAttempt, attempt + 1) + .set(FileTaskEntity::getStatus, STATUS_PENDING) + .set(FileTaskEntity::getSuccessFileCount, 0) + .set(FileTaskEntity::getFailedFileCount, 0) + .set(FileTaskEntity::getErrorMessage, null) + .set(FileTaskEntity::getFailureCategory, null) + .set(FileTaskEntity::getFinishedAt, null) + .set(FileTaskEntity::getUpdatedAt, LocalDateTime.now())); + if (updated != 1) { + throw new BusinessException(409, "任务状态已变化,请刷新后再试"); + } + itemsReset.resetForRetry(taskId); + task.setRequestJson(requestJson); + task.setResumeAttempt(attempt + 1); + JdPublishTaskVo vo = new JdPublishTaskVo(); + vo.setTaskId(taskId); + vo.setTaskNo(task.getTaskNo()); + vo.setCollectChannel(task.getCollectChannel()); + vo.setQueuePayload(buildQueuePayload(task)); + return vo; + } + /** 改价规则归一化写回请求体:request_json 里的值必须就是闸门认可的值(铁律 27a 同源)。 */ private void normalizePriceRule(JdPublishTaskCreateRequest request) { PriceRule rule = request.getPriceRule(); diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/controller/TaskClientPullController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/controller/TaskClientPullController.java index 20d1531bf..21e91a7e3 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/controller/TaskClientPullController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/controller/TaskClientPullController.java @@ -28,8 +28,6 @@ import java.util.List; @Tag(name = "任务兜底拉取", description = "供桌面客户端领取页面未推送成功的待执行任务") public class TaskClientPullController { - private static final Integer JD_PUBLISH_PROTOCOL = 2; - private final TaskClientPullService taskClientPullService; private final AdminAuthSupport adminAuthSupport; @@ -41,7 +39,6 @@ public class TaskClientPullController { public ApiResponse> pullPending(HttpServletRequest request, @RequestParam(name = "jdPublishProtocol", required = false) Integer jdPublishProtocol) { AdminUserEntity me = adminAuthSupport.requireUser(request); - return ApiResponse.success(taskClientPullService.pullPendingTasks(me.getId(), - JD_PUBLISH_PROTOCOL.equals(jdPublishProtocol))); + return ApiResponse.success(taskClientPullService.pullPendingTasks(me.getId(), jdPublishProtocol)); } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/mapper/FileTaskMapper.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/mapper/FileTaskMapper.java index 04dda5657..97a0aec51 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/mapper/FileTaskMapper.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/mapper/FileTaskMapper.java @@ -44,7 +44,8 @@ public interface FileTaskMapper extends BaseMapper { @Param("moduleTypes") List moduleTypes, @Param("localDefaultModules") List localDefaultModules, @Param("cutoff") LocalDateTime cutoff, - @Param("limit") int limit); + @Param("limit") int limit, + @Param("supportsTargetBrand") boolean supportsTargetBrand); /** * 服务端内部认领候选(Linux 后台 worker):指定状态 + 白名单模块 + 创建早于 cutoff, diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskClientPullService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskClientPullService.java index b78745042..12d7f7092 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskClientPullService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskClientPullService.java @@ -1,6 +1,7 @@ package com.nanri.aiimage.modules.task.service; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.nanri.aiimage.common.task.JdPublishProtocol; import com.nanri.aiimage.config.CollectRoutingProperties; import com.nanri.aiimage.config.InstanceMetadata; import com.nanri.aiimage.modules.task.mapper.FileTaskMapper; @@ -128,10 +129,10 @@ public class TaskClientPullService { /** 拉取并认领该用户"长期未被领取"的任务,按创建时间升序返回,最多 limit 条。 */ public List pullPendingTasks(Long userId) { - return pullPendingTasks(userId, false); + return pullPendingTasks(userId, null); } - public List pullPendingTasks(Long userId, boolean jdPublishV2) { + public List pullPendingTasks(Long userId, Integer jdPublishProtocol) { if (!enabled) { return List.of(); } @@ -139,7 +140,8 @@ public class TaskClientPullService { return List.of(); } List types = resolveModuleTypes(); - if (!jdPublishV2) { + boolean supportsTargetBrand = JdPublishProtocol.supportsTargetBrand(jdPublishProtocol); + if (!supportsTargetBrand && !Integer.valueOf(JdPublishProtocol.LEGACY).equals(jdPublishProtocol)) { types = withoutJdPublish(types); } if (types.isEmpty()) { @@ -153,7 +155,7 @@ public class TaskClientPullService { LocalDateTime cutoff = LocalDateTime.now(DB_ZONE).minusMinutes(Math.max(1L, minPendingMinutes)); int safeLimit = Math.max(1, Math.min(limit, MAX_LIMIT)); List candidates = fileTaskMapper.selectLocalChannelPendingTasks( - userId, STATUS_PENDING, types, CollectChannel.localDefaultModuleTypes(), cutoff, safeLimit); + userId, STATUS_PENDING, types, CollectChannel.localDefaultModuleTypes(), cutoff, safeLimit, supportsTargetBrand); if (candidates.isEmpty() && !types.isEmpty()) { log.info("[client-task-pull] 白名单内没有本机通道的排队任务,本次不拉取 userId={} moduleTypes={}", userId, moduleTypes); @@ -218,7 +220,7 @@ public class TaskClientPullService { candidate.getId(), candidate.getModuleType()); continue; } - if (!claim(candidate.getId())) { + if (!claim(candidate)) { log.info("[client-task-pull] 任务已被页面领取或状态已变化,跳过 taskId={}", candidate.getId()); continue; } @@ -279,10 +281,12 @@ public class TaskClientPullService { * (ensureTaskOwnedByCurrentInstance)会拒绝(2026-09-30 内部认领上线实测: * 任务 parse 落 server-110、认领在 server-121,组装载荷被拒并误标失败)。 */ - private boolean claim(Long taskId) { + private boolean claim(FileTaskEntity candidate) { return fileTaskMapper.update(null, new LambdaUpdateWrapper() - .eq(FileTaskEntity::getId, taskId) + .eq(FileTaskEntity::getId, candidate.getId()) .eq(FileTaskEntity::getStatus, STATUS_PENDING) + .eq(CollectRoutingProperties.MODULE_JD_PUBLISH.equals(candidate.getModuleType()), + FileTaskEntity::getResumeAttempt, candidate.getResumeAttempt()) .set(FileTaskEntity::getStatus, STATUS_RUNNING) .set(FileTaskEntity::getUpdatedAt, LocalDateTime.now()) .set(FileTaskEntity::getOwnerInstanceId, currentInstanceId())) > 0; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskInPlaceRetryService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskInPlaceRetryService.java index b7248acff..fc519d047 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskInPlaceRetryService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskInPlaceRetryService.java @@ -2,6 +2,7 @@ package com.nanri.aiimage.modules.task.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.nanri.aiimage.common.task.JdPublishProtocol; import com.nanri.aiimage.common.task.TaskStatuses; import com.nanri.aiimage.modules.task.mapper.FileResultMapper; import com.nanri.aiimage.modules.task.mapper.FileTaskMapper; @@ -80,6 +81,9 @@ public class TaskInPlaceRetryService { if (task == null || task.getId() == null) { return false; } + if (requiresBrandCorrection(task)) { + return false; + } if (STATUS_CANCELLED.equals(task.getStatus())) { // 「继续」前先清模块补检预算:失败即中止(此刻任务一行未动,用户重按即可)。 // 刻意不包 try/catch——本仓静默 catch 台账只许减,且放在 CAS 之前不会留下 @@ -222,11 +226,18 @@ public class TaskInPlaceRetryService { if (!STATUS_FAILED.equals(task.getStatus()) && !STATUS_CANCELLED.equals(task.getStatus())) { throw new com.nanri.aiimage.common.exception.BusinessException("只有失败或已中断的任务可以继续"); } + if (requiresBrandCorrection(task)) { + throw new com.nanri.aiimage.common.exception.BusinessException("请先修改目标品牌,再重试上架任务"); + } if (!retryInPlace(task)) { throw new com.nanri.aiimage.common.exception.BusinessException("任务状态已变化,请刷新后再试"); } } + private static boolean requiresBrandCorrection(FileTaskEntity task) { + return "JD_PUBLISH".equals(task.getModuleType()) && JdPublishProtocol.needsBrandCorrection(task.getErrorMessage()); + } + /** * 模块侧明细行复位(AC-7 服务端半边):京东上架的行级真源在 biz_jd_publish_item, * 上一代的 FAILED/PUBLISHING 行不复位,重试后的明细分批下发(只出 PENDING 行)就是 diff --git a/backend-java/src/main/resources/mapper/task/FileTaskMapper.xml b/backend-java/src/main/resources/mapper/task/FileTaskMapper.xml index 8f3b0f879..cffe8a2d2 100644 --- a/backend-java/src/main/resources/mapper/task/FileTaskMapper.xml +++ b/backend-java/src/main/resources/mapper/task/FileTaskMapper.xml @@ -30,7 +30,7 @@ diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/JdPublishContractPendingTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/JdPublishContractPendingTest.java index a350db0c2..60a20d695 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/JdPublishContractPendingTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/JdPublishContractPendingTest.java @@ -120,8 +120,8 @@ class JdPublishContractPendingTest { String source = Files.readString(PUBLISH_CONTROLLER); // 类级 @RequestMapping 与方法级 @PostMapping 分开写,拼接串搜不到(照 AC-9 格同一口径)。 assertTrue(source.contains("/api/jd-publish"), "缺类级 @RequestMapping /api/jd-publish"); - assertTrue(source.contains("@PostMapping(\"/tasks\")"), "缺建单端点 POST /tasks"); - assertTrue(source.contains("@PostMapping"), "建单必须是 POST 端点"); + assertTrue(source.contains("@PostMapping({\"/tasks\", \"/tasks/target-brand\"})"), + "保留原建单入口,新页面必须用独立品牌入口,避免旧服务静默忽略品牌"); // AC-9 归属半边:选了他人商品要业务码拒绝(照 JdCollectController 的 fail-closed 鉴权形状) assertTrue(source.contains("adminAuthSupport.requireSessionOwnerUserId(httpRequest"), "京东发布必须使用真实会话绑定所有者"); diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishIngestServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishIngestServiceTest.java index 2d5ec4ba4..f51002eab 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishIngestServiceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishIngestServiceTest.java @@ -168,6 +168,36 @@ class JdPublishIngestServiceTest { verify(taskProgressSnapshotService).markTerminal(TASK_ID, "JD_PUBLISH", "FAILED", "发布完成:成功 0 行,失败 1 行"); } + @Test + void 品牌预检阻断整单但保留既有成功与待确认行() { + task("RUNNING", 1, 3); + row("PENDING", null, null); + when(jdPublishItemMapper.update(isNull(), any())).thenReturn(1); + when(fileTaskMapper.update(isNull(), any())).thenReturn(1); + when(jdPublishItemMapper.countByPublishStatus(TASK_ID)).thenReturn(List.of( + Map.of("publishStatus", "FAILED", "cnt", 1), + Map.of("publishStatus", "SUCCESS", "cnt", 1), + Map.of("publishStatus", "PUBLISHING", "cnt", 1))); + JdPublishChunkRequest request = request(1, "batchA", "FAILED", "商品 101 无法选择品牌 B"); + request.setPreflightFailure(JdPublishChunkRequest.PreflightFailure.BRAND); + var result = service.submitChunk(TASK_ID, request, UID); + assertThat(result.getTaskStatus()).isEqualTo("FAILED"); + assertThat(result.getPublishingCount()).isOne(); + verify(taskProgressSnapshotService).markTerminal(TASK_ID, "JD_PUBLISH", "FAILED", + "目标品牌校验失败:商品 101 无法选择品牌 B"); + verifyNoInteractions(staleTaskService); + } + + @Test + void 预检没有关联有效失败行不能终止任务() { + task("RUNNING", 1, 2); + JdPublishChunkRequest request = request(1, "batchA", null, null); + request.setPreflightFailure(JdPublishChunkRequest.PreflightFailure.SOURCE); + assertThatThrownBy(() -> service.submitChunk(TASK_ID, request, UID)) + .isInstanceOf(BusinessException.class).extracting("code").isEqualTo(400); + verifyNoInteractions(jdPublishItemMapper, taskProgressSnapshotService); + } + @Test void 登录失效必须先写真实失败行才可判死() { FileTaskEntity task = task("RUNNING", 1, 2); diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskServiceTest.java index 45ab1a483..b09a2feeb 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskServiceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskServiceTest.java @@ -69,6 +69,8 @@ class JdPublishTaskServiceTest { private TaskHeartbeatService taskHeartbeatService; @Mock private TaskHeartbeatPositionService taskHeartbeatPositionService; + @Mock + private JdPublishTaskItemsResetSpiImpl itemsReset; @InjectMocks private JdPublishTaskService service; @@ -92,6 +94,7 @@ class JdPublishTaskServiceTest { request.setUserId(userId); request.setCategoryId(11L); request.setProductIds(List.of(101L, 102L)); + request.setTargetBrandName(" 目标品牌B "); return request; } @@ -119,7 +122,8 @@ class JdPublishTaskServiceTest { assertThat(task.getStatus()).isEqualTo("PENDING"); assertThat(task.getUserId()).isEqualTo(7L); assertThat(task.getSourceFileCount()).isEqualTo(2); - assertThat(task.getRequestJson()).contains("101").contains("102"); + assertThat(task.getRequestJson()).contains("101").contains("102") + .contains("\"targetBrandName\":\"目标品牌B\""); // AC-1 明细快照行:每勾选商品一行 verify(jdPublishItemMapper, org.mockito.Mockito.times(2)).insert(any(JdPublishItemEntity.class)); // AC-8 配额闸:前置且按勾选数计 @@ -243,6 +247,74 @@ class JdPublishTaskServiceTest { .hasMessageContaining("必须填写加价值"); } + @Test + void 空白目标品牌建单不查配额不落库() { + var request = validRequest(7L); + request.setTargetBrandName("  "); + assertThatThrownBy(() -> service.createTask(request, null)) + .isInstanceOf(BusinessException.class).hasMessageContaining("请填写目标品牌"); + verify(adminUserMapper, never()).selectById(any()); + } + + @Test + void 品牌任务旧版不激活也不下发明细() { + FileTaskEntity task = new FileTaskEntity(); + task.setModuleType("JD_PUBLISH"); + task.setUserId(7L); + task.setRequestJson("{\"productIds\":[101],\"targetBrandName\":\"品牌B\"}"); + when(fileTaskMapper.selectById(34400L)).thenReturn(task); + assertThatThrownBy(() -> service.activateTask(34400L, 7L, 0, 2)) + .isInstanceOf(BusinessException.class).hasMessageContaining("升级"); + task.setStatus("RUNNING"); + assertThatThrownBy(() -> service.pullItems(34400L, 7L, 0, 0L, null, null)) + .isInstanceOf(BusinessException.class).hasMessageContaining("升级"); + when(jdPublishItemMapper.selectPublishableItems(34400L, 0L, 20)).thenReturn(List.of()); + when(jdPublishItemMapper.countByPublishStatus(34400L)).thenReturn(List.of()); + assertThat(service.pullItems(34400L, 7L, 0, 0L, null, 3).getTargetBrandName()).isEqualTo("品牌B"); + } + + @Test + void 修正品牌在原任务换代并经同一快照下发() { + FileTaskEntity task = rejectedBrandTask(); + when(jdPublishItemMapper.countByPublishStatus(34400L)).thenReturn(List.of()); + when(fileTaskMapper.update(any(), any())).thenReturn(1); + var result = service.retryWithBrand(34400L, 7L, 4, " 品牌C "); + assertThat(result.getTaskId()).isEqualTo(34400L); + assertThat(result.getQueuePayload().get("data").toString()).contains("resumeAttempt=5", "targetBrandRequired=true"); + assertThat(service.readCreateRequest(task).getTargetBrandName()).isEqualTo("品牌C"); + assertThat(service.readCreateRequest(task).getProductIds()).containsExactly(101L); + verify(itemsReset).resetForRetry(34400L); + } + + @Test + void 品牌纠错不接受旧代相同品牌或已有提交许可() { + rejectedBrandTask(); + assertThatThrownBy(() -> service.retryWithBrand(34400L, 7L, 3, "品牌C")) + .isInstanceOf(BusinessException.class).hasMessageContaining("代次"); + when(jdPublishItemMapper.countByPublishStatus(34400L)).thenReturn(List.of()); + assertThatThrownBy(() -> service.retryWithBrand(34400L, 7L, 4, "品牌B")) + .isInstanceOf(BusinessException.class).hasMessageContaining("不能原样重试"); + when(jdPublishItemMapper.countByPublishStatus(34400L)).thenReturn(List.of( + java.util.Map.of("publishStatus", "PUBLISHING", "cnt", 1))); + assertThatThrownBy(() -> service.retryWithBrand(34400L, 7L, 4, "品牌C")) + .isInstanceOf(BusinessException.class).hasMessageContaining("待确认"); + verify(fileTaskMapper, never()).update(any(), any()); + verify(itemsReset, never()).resetForRetry(any()); + } + + private FileTaskEntity rejectedBrandTask() { + FileTaskEntity task = new FileTaskEntity(); + task.setId(34400L); + task.setUserId(7L); + task.setModuleType("JD_PUBLISH"); + task.setStatus("FAILED"); + task.setResumeAttempt(4); + task.setErrorMessage("目标品牌校验失败:目标店铺中不存在品牌B"); + task.setRequestJson("{\"productIds\":[101],\"targetBrandName\":\"品牌B\"}"); + when(fileTaskMapper.selectByIdForUpdate(34400L)).thenReturn(task); + return task; + } + @Test void 统一改价折算口径() { PriceRule percent = new PriceRule(); @@ -267,6 +339,7 @@ class JdPublishTaskServiceTest { task.setModuleType("JD_PUBLISH"); task.setUserId(7L); task.setStatus("RUNNING"); + task.setRequestJson("{\"productIds\":[101]}"); when(fileTaskMapper.selectById(34400L)).thenReturn(task); JdPublishItemEntity row = new JdPublishItemEntity(); @@ -286,7 +359,8 @@ class JdPublishTaskServiceTest { when(jdProductSkuMapper.selectList(any())).thenReturn(List.of()); when(jdProductImageMapper.selectList(any())).thenReturn(List.of()); - var vo = service.pullItems(34400L, 7L, 0, 0L, null); + var vo = service.pullItems(34400L, 7L, 0, 0L, null, null); + assertThat(vo.getTargetBrandName()).isNull(); assertThat(vo.getTaskId()).isEqualTo(34400L); assertThat(vo.getItems()).hasSize(1); @@ -304,7 +378,7 @@ class JdPublishTaskServiceTest { task.setUserId(8L); task.setStatus("RUNNING"); when(fileTaskMapper.selectById(34400L)).thenReturn(task); - assertThatThrownBy(() -> service.pullItems(34400L, 7L, 0, 0L, null)) + assertThatThrownBy(() -> service.pullItems(34400L, 7L, 0, 0L, null, null)) .isInstanceOf(BusinessException.class) .extracting("code") .isEqualTo(403); diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/task/mapper/FileTaskMapperChannelSqlTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/task/mapper/FileTaskMapperChannelSqlTest.java index 183a3db29..8c0b689ec 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/task/mapper/FileTaskMapperChannelSqlTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/task/mapper/FileTaskMapperChannelSqlTest.java @@ -50,7 +50,7 @@ class FileTaskMapperChannelSqlTest { assertTrue(limit > at, () -> "通道谓词必须出现在 LIMIT 之前,否则取到的那一页里没有本机单: " + sql); assertTrue(sql.indexOf("ORDER BY created_at ASC") < limit, () -> "排序必须在 LIMIT 之前,否则取页不是「最早创建的本机单」: " + sql); - assertEquals("SELECT id, module_type, collect_channel, created_at FROM biz_file_task" + assertEquals("SELECT id, module_type, collect_channel, created_at, resume_attempt FROM biz_file_task" + " WHERE user_id = ? AND status = ? AND module_type IN (?, ?) AND created_at < ?" + " AND CASE WHEN collect_channel IN ('LOCAL', 'ONLINE') THEN collect_channel" + " WHEN module_type IN (?, ?) THEN 'LOCAL' ELSE 'ONLINE' END = 'LOCAL'" @@ -83,9 +83,19 @@ class FileTaskMapperChannelSqlTest { } @Test - void 取页投影只有认领需要的四列() throws Exception { + void 旧版排除品牌任务且版本筛选在取页以前() throws Exception { + var params = new java.util.HashMap<>(clientParams(2)); + params.put("supportsTargetBrand", false); + String sql = render("selectLocalChannelPendingTasks", params); + int predicate = sql.indexOf("JSON_EXTRACT(request_json, '$.targetBrandName')"); + assertTrue(predicate > 0 && predicate < sql.indexOf("LIMIT ?"), sql); + assertFalse(render("selectLocalChannelPendingTasks", clientParams(2)).contains("JSON_EXTRACT")); + } + + @Test + void 取页只投影认领所需的窄列和代次() throws Exception { String sql = render("selectLocalChannelPendingTasks", clientParams(2)); - assertTrue(sql.startsWith("SELECT id, module_type, collect_channel, created_at FROM biz_file_task"), + assertTrue(sql.startsWith("SELECT id, module_type, collect_channel, created_at, resume_attempt FROM biz_file_task"), () -> "投影列清单变了(整行拉回来会把 result_json 这类大列带进兜底轮询): " + sql); } diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskClientPullServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskClientPullServiceTest.java index ccb701eb5..a29b9c17a 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskClientPullServiceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskClientPullServiceTest.java @@ -95,7 +95,7 @@ class TaskClientPullServiceTest { // 这里钉「调用的是哪条具名查询、传了什么」,两者合起来才挡住 P1-1 复发。 verify(fileTaskMapper).selectLocalChannelPendingTasks(eq(USER_ID), eq("PENDING"), eq(List.of("SIMILAR_ASIN", "COLLECT_DATA")), eq(CollectChannel.localDefaultModuleTypes()), - any(LocalDateTime.class), eq(5)); + any(LocalDateTime.class), eq(5), eq(false)); } @Test @@ -103,12 +103,15 @@ class TaskClientPullServiceTest { TaskClientPullService service = service(new StubHandler("SIMILAR_ASIN", payload("similar-asin-run"))); ReflectionTestUtils.setField(service, "moduleTypes", "JD_PUBLISH,SIMILAR_ASIN"); service.pullPendingTasks(USER_ID); - service.pullPendingTasks(USER_ID, true); + service.pullPendingTasks(USER_ID, 2); + service.pullPendingTasks(USER_ID, 3); verify(fileTaskMapper).selectLocalChannelPendingTasks(eq(USER_ID), eq("PENDING"), - eq(List.of("SIMILAR_ASIN")), eq(CollectChannel.localDefaultModuleTypes()), any(), eq(5)); + eq(List.of("SIMILAR_ASIN")), eq(CollectChannel.localDefaultModuleTypes()), any(), eq(5), eq(false)); verify(fileTaskMapper).selectLocalChannelPendingTasks(eq(USER_ID), eq("PENDING"), - eq(List.of("JD_PUBLISH", "SIMILAR_ASIN")), eq(CollectChannel.localDefaultModuleTypes()), any(), eq(5)); + eq(List.of("JD_PUBLISH", "SIMILAR_ASIN")), eq(CollectChannel.localDefaultModuleTypes()), any(), eq(5), eq(false)); + verify(fileTaskMapper).selectLocalChannelPendingTasks(eq(USER_ID), eq("PENDING"), + eq(List.of("JD_PUBLISH", "SIMILAR_ASIN")), eq(CollectChannel.localDefaultModuleTypes()), any(), eq(5), eq(true)); } @Test @@ -289,7 +292,8 @@ class TaskClientPullServiceTest { } private void stubPullCandidates(FileTaskEntity... rows) { - when(fileTaskMapper.selectLocalChannelPendingTasks(any(), any(), any(), any(), any(), anyInt())) + when(fileTaskMapper.selectLocalChannelPendingTasks(any(), any(), any(), any(), any(), anyInt(), + org.mockito.ArgumentMatchers.anyBoolean())) .thenReturn(List.of(rows)); } diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskInPlaceRetryServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskInPlaceRetryServiceTest.java index b87381d28..d52f12a9a 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskInPlaceRetryServiceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskInPlaceRetryServiceTest.java @@ -130,6 +130,17 @@ class TaskInPlaceRetryServiceTest { } // ---- AC-7 服务端半边(v1.5 Phase 5):模块侧明细行随任务头一并复位 ---- + @Test + void 京东上架品牌校验失败不能原样重试() { + FileTaskMapper mapper = mock(FileTaskMapper.class); + FileTaskEntity task = failedTask(); + task.setModuleType("JD_PUBLISH"); + task.setErrorMessage("目标品牌校验失败:店铺中没有品牌B"); + var retry = service(mapper, mock(FileResultMapper.class), mock(TaskFileJobService.class)); + assertFalse(retry.retryInPlace(task)); + verify(mapper, never()).update(any(), any()); + } + @Test void 京东上架重试必须复位模块侧明细行() { FileTaskMapper mapper = mock(FileTaskMapper.class); diff --git a/frontend-vue/src/pages/jd/JdPublishTab.vue b/frontend-vue/src/pages/jd/JdPublishTab.vue index f50c1d0f1..6bcbc4474 100644 --- a/frontend-vue/src/pages/jd/JdPublishTab.vue +++ b/frontend-vue/src/pages/jd/JdPublishTab.vue @@ -1,5 +1,5 @@