feat(jd-collect): 建单页按京麦店内分类多选采集
客户口径「类目不需要只要分类」「做成多选的」:采集建单页下线类目级联与平台分组, 换京麦「店内分类」快照多选(getShopCategoryList 2026-11-16 取证 9 个,见 ops docs/jd-collect-api-contract.md §2.6)。建单请求体/页面推送/兜底拉取三处同键 shopCategoryNames+shopCategoryIds(label+id 双键,行级填充形状未取证,客户端任一 命中即命中);categoryPaths 标 @Deprecated 仅历史行兼容。超长归一化文案泛化为 normalizeStringSelection;历史行 VO 带回双键供重试/继续同源。 删除建单页唯一消费方的死件:JdCategoryCascader.vue/jd-category-tree.ts/其测试 (后管另有在用副本,不受影响)。 判据:JdCollectTaskServiceTest 三例(双键归一化/空白归 null/51 个拒)+ JdTaskPullSpiImplTest 七键载荷透传;前端 jd-collect-tab/jd-shop-category/mount 三支(快照消费、双键同链、绊线:级联组件与分组接口不得回流建单页)。 可读棘轮:JdCollectTab.vue 804→786 行(同款返回按钮 CSS 合并、死 .download 类删除)。 客户端侧(app_client jd_base 行级过滤)同窗另一仓提交。
This commit is contained in:
+61
@@ -162,4 +162,65 @@ class JdCollectTaskServiceTest {
|
||||
assertThat(stored.getCategoryPaths())
|
||||
.as("全空白类目归 null=全店采集(既有行为,不因新参数收紧)").isNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
void 店内分类双键归一化后落requestJson() throws Exception {
|
||||
when(fileTaskMapper.insert(any(FileTaskEntity.class))).thenAnswer(invocation -> {
|
||||
invocation.getArgument(0, FileTaskEntity.class).setId(33893L);
|
||||
return 1;
|
||||
});
|
||||
JdCollectTaskCreateRequest request = validRequest();
|
||||
// 2026-11-16 店内分类双键(label + value/id):与类目同一归一化出口(trim/去空/保序去重)。
|
||||
request.setShopCategoryNames(new java.util.ArrayList<>(java.util.Arrays.asList(
|
||||
" 工作制服 ", "拉丁舞服", "工作制服", " ")));
|
||||
request.setShopCategoryIds(new java.util.ArrayList<>(java.util.Arrays.asList(
|
||||
" 1024347567 ", "1024347572", "1024347567")));
|
||||
|
||||
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.getShopCategoryNames())
|
||||
.as("request_json 里的店内分类名=归一化后的值(铁律 27a 同源)")
|
||||
.containsExactly("工作制服", "拉丁舞服");
|
||||
assertThat(stored.getShopCategoryIds()).containsExactly("1024347567", "1024347572");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 店内分类全空白视为不过滤() throws Exception {
|
||||
when(fileTaskMapper.insert(any(FileTaskEntity.class))).thenAnswer(invocation -> {
|
||||
invocation.getArgument(0, FileTaskEntity.class).setId(33894L);
|
||||
return 1;
|
||||
});
|
||||
JdCollectTaskCreateRequest request = validRequest();
|
||||
request.setShopCategoryNames(new java.util.ArrayList<>(java.util.Arrays.asList(" ", "")));
|
||||
request.setShopCategoryIds(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.getShopCategoryNames())
|
||||
.as("全空白分类归 null=全店采集(与类目同口径)").isNull();
|
||||
assertThat(stored.getShopCategoryIds()).isNull();
|
||||
}
|
||||
|
||||
@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.setShopCategoryNames(tooMany);
|
||||
|
||||
assertThatThrownBy(() -> service.createTask(request, null))
|
||||
.isInstanceOf(BusinessException.class)
|
||||
.hasMessageContaining("采集分类最多选 50 个");
|
||||
verify(fileTaskMapper, never()).insert(any(FileTaskEntity.class));
|
||||
}
|
||||
}
|
||||
|
||||
+34
-3
@@ -71,10 +71,16 @@ class JdTaskPullSpiImplTest {
|
||||
assertThat(data.get("categoryPaths"))
|
||||
.as("建单没选类目时派空列表(键集稳定,客户端读空=不过滤全店采集)")
|
||||
.isEqualTo(List.of());
|
||||
// 客户端 process_task 只读这五键:多键无害,缺键即空跑——所以逐键钉
|
||||
assertThat(data.get("shopCategoryNames"))
|
||||
.as("建单没选店内分类时派空列表(2026-11-16 双键契约,同 categoryPaths 口径)")
|
||||
.isEqualTo(List.of());
|
||||
assertThat(data.get("shopCategoryIds")).isEqualTo(List.of());
|
||||
// 客户端 process_task 只读这七键:多键无害,缺键即空跑——所以逐键钉
|
||||
assertThat(data.keySet())
|
||||
.as("data 键集与客户端 jd_base.process_task 读取契约同键(taskId/shopName/listTabs/maxProducts/categoryPaths)")
|
||||
.containsExactlyInAnyOrder("taskId", "shopName", "listTabs", "maxProducts", "categoryPaths");
|
||||
.as("data 键集与客户端 jd_base.process_task 读取契约同键(taskId/shopName/listTabs/"
|
||||
+ "maxProducts/categoryPaths/shopCategoryNames/shopCategoryIds)")
|
||||
.containsExactlyInAnyOrder("taskId", "shopName", "listTabs", "maxProducts",
|
||||
"categoryPaths", "shopCategoryNames", "shopCategoryIds");
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -97,6 +103,31 @@ class JdTaskPullSpiImplTest {
|
||||
.isEqualTo(List.of("女装", "男装"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void 店内分类双键随载荷透传客户端() throws Exception {
|
||||
FileTaskEntity withShopCategories = task();
|
||||
withShopCategories.setRequestJson("{\"userId\":7,\"shopName\":\"测试旗舰店\","
|
||||
+ "\"listTabs\":[\"ONSALE\"],\"maxProducts\":0,"
|
||||
+ "\"shopCategoryNames\":[\"工作制服\",\"拉丁舞服\"],"
|
||||
+ "\"shopCategoryIds\":[\"1024347567\",\"1024347572\"]}");
|
||||
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(withShopCategories);
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
Map<String, Object> data = (Map<String, Object>) payload.get("data");
|
||||
assertThat(data.get("shopCategoryNames"))
|
||||
.as("店内分类 label 原样透传(客户端按行 shopCategorys/shopCategoryPath 等值过滤)")
|
||||
.isEqualTo(List.of("工作制服", "拉丁舞服"));
|
||||
assertThat(data.get("shopCategoryIds"))
|
||||
.as("店内分类 id 原样透传(行级填充形状未取证,双键同发任一命中即命中)")
|
||||
.isEqualTo(List.of("1024347567", "1024347572"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void 建单载荷缺失按SPI语义返回异常路径而非空载荷() {
|
||||
FileTaskEntity broken = task();
|
||||
|
||||
Reference in New Issue
Block a user