feat(jd): 采集建单支持按京东类目圈范围(多选末级类目,客户端按 categoryPath 等值过滤)——JdCollectTaskCreateRequest 加 categoryPaths(null/空=全店采集,现行为不变),validate 归一化写回请求体再进 request_json(trim/去空/保序去重,上限 50 个/单名 100 字,超限当场点名拒);JdTaskPullSpiImpl.buildQueuePayload 载荷加 categoryPaths 键(缺省空列表,键集稳定,兜底拉取与页面推送同源);JdCollectBoardService 历史行同源带回 categoryPaths(重试/继续从历史行重建推送载荷不丢类目);JdCollectController 新增 GET /api/jd-collect/categories 用户域类目下拉端点(requireOwnershipUserId fail-closed,复用 JdProductQueryService.categories(null) 公共库全量口径,SQL 零新增;从未采集的店铺类目不在集内,先全店采一次即有)。判据:JdCollectTaskServiceTest +3(归一化落 requestJson/超上限拒/全空白视为不过滤)、JdTaskPullSpiImplTest 键集断言加 categoryPaths+透传用例、JdCollectBoardServiceTest 历史行带回断言;三支测试类 16 例全绿,mvn -o test-compile 零错。客户端读参/过滤与用户端建单页另笔(多仓边界)

This commit is contained in:
2026-11-16 01:10:56 +08:00
parent 9f869b2e81
commit 8b4f7a3a6b
9 changed files with 168 additions and 9 deletions
@@ -84,7 +84,7 @@ class JdCollectBoardServiceTest {
task.setStatus(status);
task.setSuccessFileCount(0);
task.setRequestJson("{\"userId\":" + userId + ",\"shopName\":\"花屿巷旗舰店\","
+ "\"listTabs\":[\"ONSALE\"],\"maxProducts\":0}");
+ "\"listTabs\":[\"ONSALE\"],\"maxProducts\":0,\"categoryPaths\":[\"女装\",\"男装\"]}");
task.setCreatedAt(LocalDateTime.of(2026, 11, 15, 10, 0));
task.setUpdatedAt(LocalDateTime.of(2026, 11, 15, 10, 1));
return task;
@@ -132,6 +132,9 @@ class JdCollectBoardServiceTest {
assertThat(vo.getItems().get(0).getTaskId()).isEqualTo(34398L);
JdCollectHistoryItemVo first = vo.getItems().get(0);
assertThat(first.getShopName()).as("店铺名来自建单载荷").isEqualTo("花屿巷旗舰店");
assertThat(first.getCategoryPaths())
.as("类目随建单载荷同源带回(重试/继续从历史行重建推送载荷用)")
.containsExactly("女装", "男装");
assertThat(first.getRowCount()).as("行数只来自 biz_jd_product 计数").isEqualTo(120);
assertThat(first.getItemsReceived()).isEqualTo(120);
assertThat(first.getTotal()).isEqualTo(300);
@@ -105,4 +105,61 @@ class JdCollectTaskServiceTest {
.hasMessageContaining("ONSALE/OFFSALE");
verify(fileTaskMapper, never()).insert(any(FileTaskEntity.class));
}
@Test
void 类目多选归一化后落requestJson() throws Exception {
when(fileTaskMapper.insert(any(FileTaskEntity.class))).thenAnswer(invocation -> {
invocation.getArgument(0, FileTaskEntity.class).setId(33891L);
return 1;
});
JdCollectTaskCreateRequest request = validRequest();
// List.of 不收 null:空白元素/重复项用 Arrays.asList 喂(建单页不会发这些形状,
// 这里钉的是服务端归一化的兜底)。
request.setCategoryPaths(new java.util.ArrayList<>(java.util.Arrays.asList(
" 女装 ", "男装", "女装", " ")));
service.createTask(request, "device-abc");
ArgumentCaptor<FileTaskEntity> taskCaptor = ArgumentCaptor.forClass(FileTaskEntity.class);
verify(fileTaskMapper).insert(taskCaptor.capture());
JdCollectTaskCreateRequest stored = new ObjectMapper().readValue(
taskCaptor.getValue().getRequestJson(), JdCollectTaskCreateRequest.class);
assertThat(stored.getCategoryPaths())
.as("request_json 里的类目=归一化后的值(trim/去空/保序去重,铁律 27a 同源)")
.containsExactly("女装", "男装");
}
@Test
void 超过类目上限建单被拒并点名() {
JdCollectTaskCreateRequest request = validRequest();
java.util.List<String> tooMany = new java.util.ArrayList<>();
for (int i = 0; i < 51; i++) {
tooMany.add("类目" + i);
}
request.setCategoryPaths(tooMany);
assertThatThrownBy(() -> service.createTask(request, null))
.isInstanceOf(BusinessException.class)
.hasMessageContaining("采集类目最多选 50 个");
verify(fileTaskMapper, never()).insert(any(FileTaskEntity.class));
}
@Test
void 类目全空白视为不过滤() throws Exception {
when(fileTaskMapper.insert(any(FileTaskEntity.class))).thenAnswer(invocation -> {
invocation.getArgument(0, FileTaskEntity.class).setId(33892L);
return 1;
});
JdCollectTaskCreateRequest request = validRequest();
request.setCategoryPaths(new java.util.ArrayList<>(java.util.Arrays.asList(" ", "")));
service.createTask(request, "device-abc");
ArgumentCaptor<FileTaskEntity> taskCaptor = ArgumentCaptor.forClass(FileTaskEntity.class);
verify(fileTaskMapper).insert(taskCaptor.capture());
JdCollectTaskCreateRequest stored = new ObjectMapper().readValue(
taskCaptor.getValue().getRequestJson(), JdCollectTaskCreateRequest.class);
assertThat(stored.getCategoryPaths())
.as("全空白类目归 null=全店采集(既有行为,不因新参数收紧)").isNull();
}
}
@@ -68,10 +68,33 @@ class JdTaskPullSpiImplTest {
assertThat(data.get("shopName")).isEqualTo("测试旗舰店");
assertThat(data.get("listTabs")).isEqualTo(List.of("ONSALE", "OFFSALE"));
assertThat(data.get("maxProducts")).isEqualTo(0);
// 客户端 process_task 只读这四键:多键无害,缺键即空跑——所以逐键钉
assertThat(data.get("categoryPaths"))
.as("建单没选类目时派空列表(键集稳定,客户端读空=不过滤全店采集)")
.isEqualTo(List.of());
// 客户端 process_task 只读这五键:多键无害,缺键即空跑——所以逐键钉
assertThat(data.keySet())
.as("data 键集与客户端 jd_base.process_task 读取契约同键(taskId/shopName/listTabs/maxProducts)")
.containsExactlyInAnyOrder("taskId", "shopName", "listTabs", "maxProducts");
.as("data 键集与客户端 jd_base.process_task 读取契约同键(taskId/shopName/listTabs/maxProducts/categoryPaths)")
.containsExactlyInAnyOrder("taskId", "shopName", "listTabs", "maxProducts", "categoryPaths");
}
@Test
void 类目多选随载荷透传客户端() throws Exception {
FileTaskEntity withCategories = task();
withCategories.setRequestJson("{\"userId\":7,\"shopName\":\"测试旗舰店\","
+ "\"listTabs\":[\"ONSALE\"],\"maxProducts\":0,\"categoryPaths\":[\"女装\",\"男装\"]}");
when(collectTaskService.readCreateRequest(any(FileTaskEntity.class)))
.thenAnswer(invocation -> {
FileTaskEntity t = invocation.getArgument(0);
return new ObjectMapper().readValue(t.getRequestJson(), JdCollectTaskCreateRequest.class);
});
Map<String, Object> payload = spi.buildQueuePayload(withCategories);
@SuppressWarnings("unchecked")
Map<String, Object> data = (Map<String, Object>) payload.get("data");
assertThat(data.get("categoryPaths"))
.as("类目多选原样透传(客户端按 categoryPath 等值过滤,兜底拉取与页面推送同源)")
.isEqualTo(List.of("女装", "男装"));
}
@Test