feat(jd): 列表列对齐+主图投影+SKU 矩阵+删除链收口(B101/B102 服务端与后管)
This commit is contained in:
+25
@@ -67,4 +67,29 @@ class JdIngestPayloadContractTest {
|
||||
assertTrue(ingest.contains("merge") || ingest.contains("沿用前值"),
|
||||
"cursor 必须合并写(铁律 30 / B84-01:缺件请求不得把游标读成没有)");
|
||||
}
|
||||
|
||||
/**
|
||||
* 用户口径「后台的数据库要和京麦对上,包括详情里」:京麦详情页「销售属性」区是
|
||||
* 12 行 SKU(颜色 3 × 尺码 4)。客户端已把 {@code detail.skus} 回传上来,但只有被
|
||||
* 服务端消费并落到 {@code biz_jd_product_sku}(V198)才算数——不消费就白采、
|
||||
* 抽屉里的 SKU 矩阵恒空。且登记必须排在商品行 upsert 之后,否则按
|
||||
* {@code (company_id, task_id, product_code)} 回查不到 product_id,行会被整批跳过。
|
||||
*/
|
||||
@Test
|
||||
void 详情SKU矩阵必须消费且在商品行落库之后登记() throws IOException {
|
||||
String ingest = read(findInJdModule("JdResultIngestService.java"));
|
||||
assertTrue(ingest.contains("\"skus\""), "detail.skus 未被消费(详情抽屉 SKU 矩阵会恒空)");
|
||||
assertTrue(ingest.contains("registerTaskSkus"), "SKU 登记未接(V198 白建表)");
|
||||
int upsertAt = ingest.indexOf("jdProductMapper.upsertBatch(rows)");
|
||||
int skuAt = ingest.indexOf("jdProductSkuIngestService.registerTaskSkus");
|
||||
assertTrue(upsertAt > 0, "商品行 upsert 调用点缺失");
|
||||
assertTrue(skuAt > upsertAt, "SKU 登记必须排在商品行 upsert 之后(否则回查不到 product_id)");
|
||||
}
|
||||
|
||||
@Test
|
||||
void SKU落库必须upsert_only() {
|
||||
String xml = read(Path.of("src", "main", "resources", "mapper", "jd", "JdProductSkuMapper.xml"));
|
||||
assertTrue(xml.contains("ON DUPLICATE KEY UPDATE"), "SKU 落库必须 upsert(uk_product_sku)");
|
||||
assertFalse(xml.toUpperCase().contains("DELETE FROM"), "SKU 落库不得 delete-then-insert");
|
||||
}
|
||||
}
|
||||
|
||||
+124
-8
@@ -8,10 +8,14 @@ import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.common.service.DataReadScope;
|
||||
import com.nanri.aiimage.modules.jd.mapper.JdProductImageMapper;
|
||||
import com.nanri.aiimage.modules.jd.mapper.JdProductMapper;
|
||||
import com.nanri.aiimage.modules.jd.model.dto.JdProductBatchDeleteRequest;
|
||||
import com.nanri.aiimage.modules.jd.model.entity.JdProductEntity;
|
||||
import com.nanri.aiimage.modules.jd.model.entity.JdProductImageEntity;
|
||||
import com.nanri.aiimage.modules.jd.model.entity.JdProductSkuEntity;
|
||||
import com.nanri.aiimage.modules.jd.model.vo.JdProductDeleteVo;
|
||||
import com.nanri.aiimage.modules.jd.model.vo.JdProductDetailVo;
|
||||
import com.nanri.aiimage.modules.jd.model.vo.JdProductPageVo;
|
||||
import com.nanri.aiimage.modules.jd.service.JdProductDeleteService;
|
||||
import com.nanri.aiimage.modules.jd.service.JdProductQueryService;
|
||||
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
@@ -72,17 +76,21 @@ class AdminJdProductControllerTest {
|
||||
// ===================== 结构判据 =====================
|
||||
|
||||
@Test
|
||||
void 控制器与只读端点就位() throws IOException {
|
||||
void 控制器与端点就位() throws IOException {
|
||||
assertTrue(Files.exists(CONTROLLER), "控制器必须落在 " + CONTROLLER);
|
||||
String source = stripComments(Files.readString(CONTROLLER));
|
||||
assertTrue(source.contains("/api/admin/jd-products"), "端点必须挂在 /api/admin/jd-products");
|
||||
assertTrue(source.contains("@GetMapping"), "查询端点必须落在 @GetMapping");
|
||||
assertTrue(source.contains("\"/{id}\""), "详情端点必须是 GET /{id}");
|
||||
assertTrue(source.contains("\"/export\""), "导出端点必须是 GET /export");
|
||||
// 本页只读(出表走导出端点):禁 POST/PUT/DELETE,分组管理另有同款鉴权闸的分组控制器。
|
||||
assertFalse(source.contains("@PostMapping") || source.contains("@PutMapping")
|
||||
|| source.contains("@DeleteMapping"),
|
||||
"京东数据库页只读:不得有 POST/PUT/DELETE(分组 CRUD 落 AdminJdProductGroupController)");
|
||||
// 删除入口(用户口径「后台删除数据的时候也要把桶对应的文件删除」):DELETE /{id} 单行
|
||||
// + POST /batch-delete 批量,先删桶、全成功才删库行(JdProductDeleteService 判据另钉)。
|
||||
assertTrue(source.contains("@DeleteMapping"), "删除端点必须落在 @DeleteMapping");
|
||||
assertTrue(source.contains("\"/batch-delete\""), "批量删除端点必须是 POST /batch-delete");
|
||||
assertTrue(source.contains("@Valid"), "批量删除请求体必须过 @Valid(ids 非空)");
|
||||
// 不得有 PUT:商品行只能被采集链回传覆盖,界面改名改值都不存在。
|
||||
assertFalse(source.contains("@PutMapping"),
|
||||
"京东数据库页不得有 PUT(商品行由采集回传覆盖,分组改排序落 AdminJdProductGroupController)");
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -164,7 +172,8 @@ class AdminJdProductControllerTest {
|
||||
PermissionMenuService permissionMenuService = mock(PermissionMenuService.class);
|
||||
DataReadScope dataReadScope = mock(DataReadScope.class);
|
||||
AdminJdProductController controller = new AdminJdProductController(
|
||||
queryService, authSupport, permissionMenuService, dataReadScope);
|
||||
queryService, mock(JdProductDeleteService.class), authSupport,
|
||||
permissionMenuService, dataReadScope);
|
||||
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(7L);
|
||||
@@ -195,7 +204,8 @@ class AdminJdProductControllerTest {
|
||||
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
|
||||
DataReadScope dataReadScope = mock(DataReadScope.class);
|
||||
AdminJdProductController controller = new AdminJdProductController(
|
||||
queryService, authSupport, mock(PermissionMenuService.class), dataReadScope);
|
||||
queryService, mock(JdProductDeleteService.class), authSupport,
|
||||
mock(PermissionMenuService.class), dataReadScope);
|
||||
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(7L);
|
||||
@@ -216,13 +226,68 @@ class AdminJdProductControllerTest {
|
||||
assertEquals(detailVo, response.getData());
|
||||
}
|
||||
|
||||
@Test
|
||||
void 删除端点走同一正门并把服务回执装进200信封() {
|
||||
JdProductQueryService queryService = mock(JdProductQueryService.class);
|
||||
JdProductDeleteService deleteService = mock(JdProductDeleteService.class);
|
||||
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
|
||||
DataReadScope dataReadScope = mock(DataReadScope.class);
|
||||
AdminJdProductController controller = new AdminJdProductController(
|
||||
queryService, deleteService, authSupport, mock(PermissionMenuService.class), dataReadScope);
|
||||
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(7L);
|
||||
HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
when(authSupport.requireUser(request)).thenReturn(operator);
|
||||
when(authSupport.currentRole(operator)).thenReturn("super_admin");
|
||||
when(dataReadScope.readCompanyIdOrOwn(operator, 5L)).thenReturn(5L);
|
||||
JdProductDeleteVo receipt = new JdProductDeleteVo();
|
||||
receipt.setDeleted(1);
|
||||
receipt.setObjectsDeleted(9);
|
||||
receipt.setObjectsKept(2);
|
||||
when(deleteService.delete(List.of(11L), 5L)).thenReturn(receipt);
|
||||
|
||||
ApiResponse<JdProductDeleteVo> response = controller.delete(11L, 5L, request);
|
||||
|
||||
verify(dataReadScope).readCompanyIdOrOwn(operator, 5L);
|
||||
verify(deleteService).delete(List.of(11L), 5L);
|
||||
assertEquals(Boolean.TRUE, response.isSuccess());
|
||||
assertEquals(9, response.getData().getObjectsDeleted());
|
||||
}
|
||||
|
||||
@Test
|
||||
void 批量删除走同一出口且越界失败文案透出() {
|
||||
JdProductQueryService queryService = mock(JdProductQueryService.class);
|
||||
JdProductDeleteService deleteService = mock(JdProductDeleteService.class);
|
||||
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
|
||||
DataReadScope dataReadScope = mock(DataReadScope.class);
|
||||
AdminJdProductController controller = new AdminJdProductController(
|
||||
queryService, deleteService, authSupport, mock(PermissionMenuService.class), dataReadScope);
|
||||
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(7L);
|
||||
HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
when(authSupport.requireUser(request)).thenReturn(operator);
|
||||
when(authSupport.currentRole(operator)).thenReturn("super_admin");
|
||||
when(dataReadScope.readCompanyIdOrOwn(operator, null)).thenReturn(5L);
|
||||
when(deleteService.delete(List.of(11L, 12L), 5L))
|
||||
.thenThrow(new BusinessException("有 1 个商品不存在或不属于当前公司,请刷新后重试(本次未删除任何数据)"));
|
||||
|
||||
JdProductBatchDeleteRequest body = new JdProductBatchDeleteRequest();
|
||||
body.setIds(List.of(11L, 12L));
|
||||
BusinessException ex = assertThrows(BusinessException.class,
|
||||
() -> controller.batchDelete(body, null, request));
|
||||
assertTrue(ex.getMessage().contains("本次未删除任何数据"), "整批拒绝的语义必须到界面");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 控制器导出走同一正门并回Excel响应() {
|
||||
JdProductQueryService queryService = mock(JdProductQueryService.class);
|
||||
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
|
||||
DataReadScope dataReadScope = mock(DataReadScope.class);
|
||||
AdminJdProductController controller = new AdminJdProductController(
|
||||
queryService, authSupport, mock(PermissionMenuService.class), dataReadScope);
|
||||
queryService, mock(JdProductDeleteService.class), authSupport,
|
||||
mock(PermissionMenuService.class), dataReadScope);
|
||||
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(7L);
|
||||
@@ -250,6 +315,7 @@ class AdminJdProductControllerTest {
|
||||
void 查询服务分页钳制防溢出() {
|
||||
JdProductMapper mapper = mock(JdProductMapper.class);
|
||||
JdProductQueryService service = new JdProductQueryService(mapper, mock(JdProductImageMapper.class),
|
||||
mock(com.nanri.aiimage.modules.jd.mapper.JdProductSkuMapper.class),
|
||||
mock(com.nanri.aiimage.modules.jd.mapper.JdProductGroupMapper.class));
|
||||
when(mapper.countProducts(any(), any(), any(), any(), any(), any(), any(), any())).thenReturn(1L);
|
||||
|
||||
@@ -276,6 +342,7 @@ class AdminJdProductControllerTest {
|
||||
void 查询服务同步起止倒挂拒绝() {
|
||||
JdProductMapper mapper = mock(JdProductMapper.class);
|
||||
JdProductQueryService service = new JdProductQueryService(mapper, mock(JdProductImageMapper.class),
|
||||
mock(com.nanri.aiimage.modules.jd.mapper.JdProductSkuMapper.class),
|
||||
mock(com.nanri.aiimage.modules.jd.mapper.JdProductGroupMapper.class));
|
||||
LocalDateTime from = LocalDateTime.of(2026, 11, 14, 12, 0);
|
||||
LocalDateTime to = LocalDateTime.of(2026, 11, 14, 8, 0);
|
||||
@@ -294,6 +361,7 @@ class AdminJdProductControllerTest {
|
||||
void 查询服务过滤面原样直传且空串归null() {
|
||||
JdProductMapper mapper = mock(JdProductMapper.class);
|
||||
JdProductQueryService service = new JdProductQueryService(mapper, mock(JdProductImageMapper.class),
|
||||
mock(com.nanri.aiimage.modules.jd.mapper.JdProductSkuMapper.class),
|
||||
mock(com.nanri.aiimage.modules.jd.mapper.JdProductGroupMapper.class));
|
||||
when(mapper.countProducts(any(), any(), any(), any(), any(), any(), any(), any())).thenReturn(0L);
|
||||
|
||||
@@ -312,6 +380,7 @@ class AdminJdProductControllerTest {
|
||||
JdProductMapper mapper = mock(JdProductMapper.class);
|
||||
JdProductImageMapper imageMapper = mock(JdProductImageMapper.class);
|
||||
JdProductQueryService service = new JdProductQueryService(mapper, imageMapper,
|
||||
mock(com.nanri.aiimage.modules.jd.mapper.JdProductSkuMapper.class),
|
||||
mock(com.nanri.aiimage.modules.jd.mapper.JdProductGroupMapper.class));
|
||||
|
||||
JdProductEntity row = productEntity(11L);
|
||||
@@ -357,6 +426,7 @@ class AdminJdProductControllerTest {
|
||||
void 详情非法attr_json落空分组且原文兜底不抛500() {
|
||||
JdProductMapper mapper = mock(JdProductMapper.class);
|
||||
JdProductQueryService service = new JdProductQueryService(mapper, mock(JdProductImageMapper.class),
|
||||
mock(com.nanri.aiimage.modules.jd.mapper.JdProductSkuMapper.class),
|
||||
mock(com.nanri.aiimage.modules.jd.mapper.JdProductGroupMapper.class));
|
||||
|
||||
// 形状一:非法 JSON(解析异常)。
|
||||
@@ -385,10 +455,54 @@ class AdminJdProductControllerTest {
|
||||
assertNull(blankVo.getAttrJsonRaw());
|
||||
}
|
||||
|
||||
@Test
|
||||
void 详情下发SKU矩阵_销售属性JSON解析成键值对() {
|
||||
JdProductMapper mapper = mock(JdProductMapper.class);
|
||||
com.nanri.aiimage.modules.jd.mapper.JdProductSkuMapper skuMapper =
|
||||
mock(com.nanri.aiimage.modules.jd.mapper.JdProductSkuMapper.class);
|
||||
JdProductQueryService service = new JdProductQueryService(mapper,
|
||||
mock(JdProductImageMapper.class), skuMapper,
|
||||
mock(com.nanri.aiimage.modules.jd.mapper.JdProductGroupMapper.class));
|
||||
|
||||
when(mapper.selectById(11L)).thenReturn(productEntity(11L));
|
||||
|
||||
JdProductSkuEntity first = new JdProductSkuEntity();
|
||||
first.setProductId(11L);
|
||||
first.setSkuId("10238877506570");
|
||||
first.setSkuName("花屿巷… 上衣 S");
|
||||
first.setSkuSeq("10012001");
|
||||
first.setPrice(new BigDecimal("162.00"));
|
||||
first.setStock(200);
|
||||
first.setSortNo(0);
|
||||
first.setSaleAttrsJson("[{\"name\":\"颜色\",\"value\":\"上衣\"},{\"name\":\"尺码\",\"value\":\"S\"}]");
|
||||
JdProductSkuEntity brokenJson = new JdProductSkuEntity();
|
||||
brokenJson.setProductId(11L);
|
||||
brokenJson.setSkuId("10238877506574");
|
||||
brokenJson.setSortNo(1);
|
||||
brokenJson.setSaleAttrsJson("[{\"name\":");
|
||||
when(skuMapper.selectList(any())).thenReturn(List.of(first, brokenJson));
|
||||
|
||||
JdProductDetailVo vo = service.detail(11L, 5L);
|
||||
|
||||
assertEquals(2, vo.getSkus().size(), "京麦那 12 行矩阵按入库行下发(抽屉渲染的唯一来源)");
|
||||
JdProductDetailVo.SkuVo sku = vo.getSkus().get(0);
|
||||
assertEquals("10238877506570", sku.getSkuId());
|
||||
assertEquals("10012001", sku.getSkuSeq(), "商家自定义序号(京麦「序号」列)");
|
||||
assertEquals(new BigDecimal("162.00"), sku.getPrice());
|
||||
assertEquals(200, sku.getStock());
|
||||
assertEquals(2, sku.getSaleAttrs().size(), "sale_attrs_json 解析成 name/value 对");
|
||||
assertEquals("颜色", sku.getSaleAttrs().get(0).getName());
|
||||
assertEquals("上衣", sku.getSaleAttrs().get(0).getValue());
|
||||
assertEquals("尺码", sku.getSaleAttrs().get(1).getName());
|
||||
assertTrue(vo.getSkus().get(1).getSaleAttrs().isEmpty(),
|
||||
"坏 sale_attrs_json 只让这一行属性为空,不抛 500、不丢整行");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 详情公司越界按不存在拒绝() {
|
||||
JdProductMapper mapper = mock(JdProductMapper.class);
|
||||
JdProductQueryService service = new JdProductQueryService(mapper, mock(JdProductImageMapper.class),
|
||||
mock(com.nanri.aiimage.modules.jd.mapper.JdProductSkuMapper.class),
|
||||
mock(com.nanri.aiimage.modules.jd.mapper.JdProductGroupMapper.class));
|
||||
|
||||
JdProductEntity row = productEntity(11L);
|
||||
@@ -408,6 +522,7 @@ class AdminJdProductControllerTest {
|
||||
void 导出超上限按业务错误拒绝且不取数() {
|
||||
JdProductMapper mapper = mock(JdProductMapper.class);
|
||||
JdProductQueryService service = new JdProductQueryService(mapper, mock(JdProductImageMapper.class),
|
||||
mock(com.nanri.aiimage.modules.jd.mapper.JdProductSkuMapper.class),
|
||||
mock(com.nanri.aiimage.modules.jd.mapper.JdProductGroupMapper.class));
|
||||
when(mapper.countProducts(any(), any(), any(), any(), any(), any(), any(), any()))
|
||||
.thenReturn(JdProductQueryService.EXPORT_MAX_ROWS + 1);
|
||||
@@ -426,6 +541,7 @@ class AdminJdProductControllerTest {
|
||||
com.nanri.aiimage.modules.jd.mapper.JdProductGroupMapper groupMapper =
|
||||
mock(com.nanri.aiimage.modules.jd.mapper.JdProductGroupMapper.class);
|
||||
JdProductQueryService service = new JdProductQueryService(mapper, mock(JdProductImageMapper.class),
|
||||
mock(com.nanri.aiimage.modules.jd.mapper.JdProductSkuMapper.class),
|
||||
groupMapper);
|
||||
|
||||
JdProductEntity grouped = productEntity(1L);
|
||||
|
||||
+36
@@ -22,6 +22,7 @@ import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
@@ -35,6 +36,7 @@ import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyInt;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.ArgumentMatchers.isNull;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
@@ -235,6 +237,40 @@ class JdImageStorageTest {
|
||||
verify(jdProductImageMapper, never()).upsertBatch(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void 登记后回写主图URL与图片数_列表主图列才有值() {
|
||||
// B98-01:main_image_url 此前全仓无写点 ⇒ 后管列表主图恒「无图」,即使图已在桶里。
|
||||
stubRegisterHappyPath();
|
||||
String objectUrl = "https://oss.aishufu.top/jd-products/2/" + SHA + ".jpg";
|
||||
when(ossStorageService.objectSize(eq("jd-products"), anyString())).thenReturn(102400L);
|
||||
when(ossStorageService.getBucketObjectUrl(eq("jd-products"), anyString())).thenReturn(objectUrl);
|
||||
JdProductImageEntity main = new JdProductImageEntity();
|
||||
main.setId(9L);
|
||||
main.setProductId(PRODUCT_ID);
|
||||
main.setImageType("MAIN");
|
||||
main.setSortNo(0);
|
||||
main.setUrl(objectUrl);
|
||||
when(jdProductImageMapper.selectList(any(Wrapper.class))).thenReturn(java.util.List.of(main));
|
||||
when(jdProductImageMapper.selectCount(any(Wrapper.class))).thenReturn(3L);
|
||||
|
||||
JdImageRegisterVo vo = service.register(USER_ID,
|
||||
registerRequest(regDto("jd-products/2/" + SHA + ".jpg", 102400L)));
|
||||
|
||||
assertThat(vo.getRegistered()).isEqualTo(1);
|
||||
@SuppressWarnings("unchecked")
|
||||
ArgumentCaptor<com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper<JdProductEntity>>
|
||||
captor = ArgumentCaptor.forClass(
|
||||
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper.class);
|
||||
verify(jdProductMapper).update(isNull(), captor.capture());
|
||||
var wrapper = captor.getValue();
|
||||
assertThat(wrapper.getSqlSet()).as("登记后同一条 UPDATE 里刷图片数与主图 URL")
|
||||
.contains("main_image_url").contains("image_count");
|
||||
assertThat(wrapper.getParamNameValuePairs().values())
|
||||
.as("主图 URL 取 MAIN 档首图的自有桶地址(京东原图域名不落库,AC-4)")
|
||||
.contains(objectUrl);
|
||||
assertThat(wrapper.getParamNameValuePairs().values()).contains(3);
|
||||
}
|
||||
|
||||
@Test
|
||||
void 空images与非法规格不落行() {
|
||||
// 空 images:显式登记口直接拒绝空载荷(无 taskId 上下文);chunk 路径空清单返回 0 不查库
|
||||
|
||||
+213
@@ -0,0 +1,213 @@
|
||||
package com.nanri.aiimage.modules.jd.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
||||
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
|
||||
import com.nanri.aiimage.modules.jd.mapper.JdProductImageMapper;
|
||||
import com.nanri.aiimage.modules.jd.mapper.JdProductMapper;
|
||||
import com.nanri.aiimage.modules.jd.model.entity.JdProductEntity;
|
||||
import com.nanri.aiimage.modules.jd.model.entity.JdProductImageEntity;
|
||||
import com.nanri.aiimage.modules.jd.model.vo.JdProductDeleteVo;
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import org.apache.ibatis.builder.MapperBuilderAssistant;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.doThrow;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.times;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* 京东商品删除编排判据(用户口径「后台删除数据的时候也要把桶对应的文件删除」)。
|
||||
*
|
||||
* <p>钉四件事:①<b>先删桶、全成功才删库行</b>——桶失败时库行删除出口必须零调用
|
||||
* (库行先消失就再没人知道该删哪些 key,对象成永久孤儿);②共用对象不删(同公司
|
||||
* 同内容同 key,删一个商品的图不能把别的商品搞裂图);③归属先判、越界整批拒绝
|
||||
* (不做部分删除);④前缀外的 key 不动手(只留 WARN),防脏数据把删除扩到别的桶前缀。</p>
|
||||
*/
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
class JdProductDeleteServiceTest {
|
||||
|
||||
private static final Long COMPANY_ID = 5L;
|
||||
|
||||
@Mock
|
||||
private JdProductMapper jdProductMapper;
|
||||
@Mock
|
||||
private JdProductImageMapper jdProductImageMapper;
|
||||
@Mock
|
||||
private JdProductRowDeleteService jdProductRowDeleteService;
|
||||
@Mock
|
||||
private OssStorageService ossStorageService;
|
||||
|
||||
private JdProductDeleteService service;
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
// LambdaQueryWrapper 需要 MP 的 lambda cache(AdminUserDisableTest 同款初始化)。
|
||||
MapperBuilderAssistant assistant = new MapperBuilderAssistant(new MybatisConfiguration(), "");
|
||||
TableInfoHelper.initTableInfo(assistant, JdProductEntity.class);
|
||||
TableInfoHelper.initTableInfo(assistant, JdProductImageEntity.class);
|
||||
service = new JdProductDeleteService(jdProductMapper, jdProductImageMapper,
|
||||
jdProductRowDeleteService, ossStorageService);
|
||||
ReflectionTestUtils.setField(service, "bucket", "jd-products");
|
||||
ReflectionTestUtils.setField(service, "keyPrefix", "jd-products/");
|
||||
}
|
||||
|
||||
private void givenOwnedRows(List<Long> ids) {
|
||||
List<JdProductEntity> rows = ids.stream().map(JdProductDeleteServiceTest::productRow).toList();
|
||||
when(jdProductMapper.selectList(any())).thenReturn(rows);
|
||||
}
|
||||
|
||||
private static JdProductEntity productRow(long id) {
|
||||
JdProductEntity row = new JdProductEntity();
|
||||
row.setId(id);
|
||||
row.setCompanyId(COMPANY_ID);
|
||||
return row;
|
||||
}
|
||||
|
||||
private static JdProductImageEntity image(long productId, String key) {
|
||||
JdProductImageEntity image = new JdProductImageEntity();
|
||||
image.setProductId(productId);
|
||||
image.setObjectKey(key);
|
||||
return image;
|
||||
}
|
||||
|
||||
@Test
|
||||
void 先删桶_全成功才删库行() {
|
||||
givenOwnedRows(List.of(11L));
|
||||
// selectList 依次被调:①商品归属闸 ②图片行取数 ③共用性回查(mock 不看 wrapper 条件,
|
||||
// 所以回查那次显式给空——没人引用这张图,才能真的删)。
|
||||
when(jdProductMapper.selectList(any())).thenReturn(List.of(productRow(11L)));
|
||||
when(jdProductImageMapper.selectList(any()))
|
||||
.thenReturn(List.of(image(11L, "jd-products/5/aaa.jpg")))
|
||||
.thenReturn(List.of());
|
||||
when(jdProductRowDeleteService.deleteRows(List.of(11L))).thenReturn(1);
|
||||
|
||||
JdProductDeleteVo vo = service.delete(List.of(11L), COMPANY_ID);
|
||||
|
||||
// 顺序:removeObject 先于 deleteRows。
|
||||
var inOrder = org.mockito.Mockito.inOrder(ossStorageService, jdProductRowDeleteService);
|
||||
inOrder.verify(ossStorageService).removeObject("jd-products", "jd-products/5/aaa.jpg");
|
||||
inOrder.verify(jdProductRowDeleteService).deleteRows(List.of(11L));
|
||||
assertThat(vo.getDeleted()).isEqualTo(1);
|
||||
assertThat(vo.getObjectsDeleted()).isEqualTo(1);
|
||||
}
|
||||
|
||||
@Test
|
||||
void 桶删失败_整批拒绝且一行库行都不动() {
|
||||
givenOwnedRows(List.of(11L));
|
||||
when(jdProductImageMapper.selectList(any()))
|
||||
.thenReturn(List.of(image(11L, "jd-products/5/aaa.jpg")))
|
||||
.thenReturn(List.of());
|
||||
doThrow(new RuntimeException("oss 5xx"))
|
||||
.when(ossStorageService).removeObject(anyString(), anyString());
|
||||
|
||||
assertThatThrownBy(() -> service.delete(List.of(11L), COMPANY_ID))
|
||||
.isInstanceOf(BusinessException.class)
|
||||
.hasMessageContaining("本次未删除任何数据");
|
||||
|
||||
verify(jdProductRowDeleteService, never()).deleteRows(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void 被其他商品共用的对象保留不删() {
|
||||
givenOwnedRows(List.of(11L));
|
||||
// selectList 依次被调:①商品归属闸 ②图片行取数 ③按 key 反查别的商品的共用性回查
|
||||
//(回查返回 99 号商品也引用同一 key ⇒ 保留)。
|
||||
when(jdProductImageMapper.selectList(any()))
|
||||
.thenReturn(List.of(image(11L, "jd-products/5/shared.jpg")))
|
||||
.thenReturn(List.of(image(99L, "jd-products/5/shared.jpg")));
|
||||
when(jdProductRowDeleteService.deleteRows(List.of(11L))).thenReturn(1);
|
||||
|
||||
JdProductDeleteVo vo = service.delete(List.of(11L), COMPANY_ID);
|
||||
|
||||
verify(ossStorageService, never()).removeObject(anyString(), anyString());
|
||||
assertThat(vo.getObjectsDeleted()).isZero();
|
||||
assertThat(vo.getObjectsKept()).isEqualTo(1);
|
||||
verify(jdProductRowDeleteService).deleteRows(List.of(11L));
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void 越界或缺失的行整批拒绝_不做部分删除() {
|
||||
// 请求 2 行,归属闸只找到 1 行(另一行不存在/不属于本公司)。
|
||||
JdProductEntity row = new JdProductEntity();
|
||||
row.setId(11L);
|
||||
row.setCompanyId(COMPANY_ID);
|
||||
when(jdProductMapper.selectList(any(Wrapper.class))).thenReturn(List.of(row));
|
||||
|
||||
assertThatThrownBy(() -> service.delete(List.of(11L, 12L), COMPANY_ID))
|
||||
.isInstanceOf(BusinessException.class)
|
||||
.hasMessageContaining("本次未删除任何数据");
|
||||
|
||||
verify(ossStorageService, never()).removeObject(anyString(), anyString());
|
||||
verify(jdProductRowDeleteService, never()).deleteRows(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void 前缀外的key不动手_只计数留痕() {
|
||||
givenOwnedRows(List.of(11L));
|
||||
when(jdProductImageMapper.selectList(any())).thenReturn(List.of(
|
||||
image(11L, "nanri-ai-images/legacy.jpg")));
|
||||
when(jdProductRowDeleteService.deleteRows(List.of(11L))).thenReturn(1);
|
||||
|
||||
JdProductDeleteVo vo = service.delete(List.of(11L), COMPANY_ID);
|
||||
|
||||
verify(ossStorageService, never()).removeObject(anyString(), anyString());
|
||||
assertThat(vo.getObjectsSkipped()).isEqualTo(1);
|
||||
assertThat(vo.getObjectsDeleted()).isZero();
|
||||
}
|
||||
|
||||
@Test
|
||||
void 空清单与超上限都在入口拒绝() {
|
||||
assertThatThrownBy(() -> service.delete(List.of(), COMPANY_ID))
|
||||
.isInstanceOf(BusinessException.class)
|
||||
.hasMessageContaining("请先选择");
|
||||
assertThatThrownBy(() -> service.delete(null, COMPANY_ID))
|
||||
.isInstanceOf(BusinessException.class)
|
||||
.hasMessageContaining("请先选择");
|
||||
|
||||
List<Long> tooMany = new java.util.ArrayList<>();
|
||||
for (long id = 1; id <= JdProductDeleteService.MAX_BATCH + 1; id++) {
|
||||
tooMany.add(id);
|
||||
}
|
||||
assertThatThrownBy(() -> service.delete(tooMany, COMPANY_ID))
|
||||
.isInstanceOf(BusinessException.class)
|
||||
.hasMessageContaining("200");
|
||||
|
||||
verify(jdProductMapper, times(0)).selectList(any());
|
||||
verify(jdProductRowDeleteService, never()).deleteRows(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void 非超管按本公司收口_越公司行不可见() {
|
||||
// scopedCompanyId=5:归属闸 wrapper 带 company_id=5 ⇒ 别家行查不到 ⇒ 整批拒绝。
|
||||
JdProductEntity row = new JdProductEntity();
|
||||
row.setId(11L);
|
||||
row.setCompanyId(6L);
|
||||
when(jdProductMapper.selectList(any(Wrapper.class))).thenReturn(List.of());
|
||||
|
||||
assertThatThrownBy(() -> service.delete(List.of(11L), COMPANY_ID))
|
||||
.isInstanceOf(BusinessException.class);
|
||||
|
||||
ArgumentCaptor<Wrapper<JdProductEntity>> captor = ArgumentCaptor.forClass(Wrapper.class);
|
||||
verify(jdProductMapper).selectList(captor.capture());
|
||||
assertThat(captor.getValue().getSqlSegment()).contains("company_id");
|
||||
}
|
||||
}
|
||||
+151
@@ -0,0 +1,151 @@
|
||||
package com.nanri.aiimage.modules.jd.service;
|
||||
|
||||
import com.nanri.aiimage.modules.jd.mapper.JdProductMapper;
|
||||
import com.nanri.aiimage.modules.jd.mapper.JdProductSkuMapper;
|
||||
import com.nanri.aiimage.modules.jd.model.entity.JdProductEntity;
|
||||
import com.nanri.aiimage.modules.jd.model.entity.JdProductSkuEntity;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* 京东商品 SKU 矩阵入库判据(V198,v1.4 详情面补齐)。
|
||||
*
|
||||
* <p>用户口径「后台的数据库要和京麦对上,包括详情里」:京麦详情页「销售属性」区是
|
||||
* 12 行 SKU(颜色 3 × 尺码 4),每行带自己的 skuId / 价格 / 库存 / 属性组合。这里钉住
|
||||
* ①商品行回查后才落行(首采行 upsert 前查不到不许落孤儿)、②uk 幂等 upsert、
|
||||
* ③上限截断与缺 skuId 跳过、④组合维度序列化成 JSON。</p>
|
||||
*/
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
class JdProductSkuIngestServiceTest {
|
||||
|
||||
private static final Long TASK_ID = 34500L;
|
||||
private static final Long COMPANY_ID = 2L;
|
||||
private static final Long PRODUCT_ID = 77L;
|
||||
private static final String PRODUCT_CODE = "10036442942137";
|
||||
|
||||
@Mock
|
||||
private JdProductMapper jdProductMapper;
|
||||
@Mock
|
||||
private JdProductSkuMapper jdProductSkuMapper;
|
||||
|
||||
private JdProductSkuIngestService service;
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
service = new JdProductSkuIngestService(jdProductMapper, jdProductSkuMapper, new ObjectMapper());
|
||||
ReflectionTestUtils.setField(service, "skuMaxPerProduct", 200);
|
||||
}
|
||||
|
||||
private void givenProductRow() {
|
||||
JdProductEntity row = new JdProductEntity();
|
||||
row.setId(PRODUCT_ID);
|
||||
when(jdProductMapper.selectOne(any())).thenReturn(row);
|
||||
}
|
||||
|
||||
@Test
|
||||
void 商品行不存在时不落孤儿SKU() {
|
||||
when(jdProductMapper.selectOne(any())).thenReturn(null);
|
||||
|
||||
int written = service.registerTaskSkus(TASK_ID, COMPANY_ID, PRODUCT_CODE, List.of(spec("10238877506570")));
|
||||
|
||||
assertThat(written).isZero();
|
||||
verify(jdProductSkuMapper, never()).upsertBatch(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void 落行带商品行id与公司归属_价格库存全映射() {
|
||||
givenProductRow();
|
||||
|
||||
int written = service.registerTaskSkus(TASK_ID, COMPANY_ID, PRODUCT_CODE,
|
||||
List.of(spec("10238877506570"), spec("10238877506574")));
|
||||
|
||||
assertThat(written).isEqualTo(2);
|
||||
@SuppressWarnings("unchecked")
|
||||
ArgumentCaptor<List<JdProductSkuEntity>> captor = ArgumentCaptor.forClass(List.class);
|
||||
verify(jdProductSkuMapper).upsertBatch(captor.capture());
|
||||
List<JdProductSkuEntity> rows = captor.getValue();
|
||||
JdProductSkuEntity first = rows.get(0);
|
||||
assertThat(first.getProductId()).isEqualTo(PRODUCT_ID);
|
||||
assertThat(first.getCompanyId()).isEqualTo(COMPANY_ID);
|
||||
assertThat(first.getSkuId()).isEqualTo("10238877506570");
|
||||
assertThat(first.getPrice()).isEqualByComparingTo(new BigDecimal("162.0"));
|
||||
assertThat(first.getStock()).isEqualTo(200);
|
||||
assertThat(first.getSaleAttrsJson()).contains("颜色").contains("上衣").contains("尺码");
|
||||
assertThat(rows.get(1).getSortNo()).isEqualTo(1);
|
||||
}
|
||||
|
||||
@Test
|
||||
void 缺skuId的行跳过不写空键() {
|
||||
givenProductRow();
|
||||
JdProductSkuIngestService.JdIngestSkuSpec blank =
|
||||
new JdProductSkuIngestService.JdIngestSkuSpec(" ", null, null, null, null, 0, null);
|
||||
|
||||
int written = service.registerTaskSkus(TASK_ID, COMPANY_ID, PRODUCT_CODE, List.of(blank));
|
||||
|
||||
assertThat(written).isZero();
|
||||
verify(jdProductSkuMapper, never()).upsertBatch(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void 超上限按配置截断_不写爆单商品() {
|
||||
givenProductRow();
|
||||
ReflectionTestUtils.setField(service, "skuMaxPerProduct", 2);
|
||||
List<JdProductSkuIngestService.JdIngestSkuSpec> specs = List.of(
|
||||
spec("10238877506570"), spec("10238877506571"), spec("10238877506572"));
|
||||
|
||||
int written = service.registerTaskSkus(TASK_ID, COMPANY_ID, PRODUCT_CODE, specs);
|
||||
|
||||
assertThat(written).isEqualTo(2);
|
||||
}
|
||||
|
||||
@Test
|
||||
void 空清单直接返回零且不查库() {
|
||||
assertThat(service.registerTaskSkus(TASK_ID, COMPANY_ID, PRODUCT_CODE, List.of())).isZero();
|
||||
verify(jdProductMapper, never()).selectOne(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void 从客户端detail的skus_map宽容取值() {
|
||||
Map<String, Object> raw = new LinkedHashMap<>();
|
||||
raw.put("skuId", 10238877506570L);
|
||||
raw.put("skuName", "花屿巷… 上衣 S");
|
||||
raw.put("price", 162.0);
|
||||
raw.put("stock", 200);
|
||||
raw.put("sortNo", 3);
|
||||
raw.put("saleAttrs", List.of(Map.of("name", "颜色", "value", "上衣"),
|
||||
Map.of("name", "尺码", "value", "S")));
|
||||
|
||||
JdProductSkuIngestService.JdIngestSkuSpec spec =
|
||||
JdProductSkuIngestService.JdIngestSkuSpec.fromMap(raw, 0);
|
||||
|
||||
assertThat(spec).isNotNull();
|
||||
assertThat(spec.skuId()).isEqualTo("10238877506570");
|
||||
assertThat(spec.price()).isEqualByComparingTo(new BigDecimal("162.0"));
|
||||
assertThat(spec.stock()).isEqualTo(200);
|
||||
assertThat(spec.sortNo()).isEqualTo(3);
|
||||
assertThat(spec.saleAttrs()).hasSize(2);
|
||||
}
|
||||
|
||||
private static JdProductSkuIngestService.JdIngestSkuSpec spec(String skuId) {
|
||||
return new JdProductSkuIngestService.JdIngestSkuSpec(skuId, "花屿巷… 上衣 S", "10012001",
|
||||
new BigDecimal("162.00"), 200, null,
|
||||
List.of(Map.of("name", "颜色", "value", "上衣"), Map.of("name", "尺码", "value", "S")));
|
||||
}
|
||||
}
|
||||
+15
-2
@@ -80,6 +80,8 @@ class JdProductSyncServiceTest {
|
||||
private TaskProgressSnapshotService taskProgressSnapshotService;
|
||||
@Mock
|
||||
private JdProductImageIngestService jdProductImageIngestService;
|
||||
@Mock
|
||||
private JdProductSkuIngestService jdProductSkuIngestService;
|
||||
@Spy
|
||||
private ObjectMapper objectMapper = new ObjectMapper();
|
||||
|
||||
@@ -138,7 +140,12 @@ class JdProductSyncServiceTest {
|
||||
summary.put("shopId", "shop-001");
|
||||
summary.put("saleStatus", "上架中");
|
||||
summary.put("stockTotal", 2400);
|
||||
summary.put("jdCreatedAt", "2026-11-13 14:06:07");
|
||||
summary.put("itemNum", "956597306407");
|
||||
summary.put("skuCount", 12);
|
||||
summary.put("healthScore", 81);
|
||||
summary.put("jdCreatedAt", "2026-11-07 18:49:47");
|
||||
summary.put("jdOnlineAt", "2026-11-12 15:03:37");
|
||||
summary.put("jdUpdatedAt", "2026-11-13 14:06:07");
|
||||
summary.put("unknownFutureKey", "ignored");
|
||||
item.setSummary(summary);
|
||||
Map<String, Object> detail = new LinkedHashMap<>();
|
||||
@@ -193,7 +200,13 @@ class JdProductSyncServiceTest {
|
||||
assertThat(first.getTaskId()).isEqualTo(TASK_ID);
|
||||
assertThat(first.getShopId()).isEqualTo("shop-001");
|
||||
assertThat(first.getShopName()).isEqualTo("测试旗舰店");
|
||||
assertThat(first.getJdCreatedAt()).isEqualTo(LocalDateTime.of(2026, 11, 13, 14, 6, 7));
|
||||
assertThat(first.getJdCreatedAt()).isEqualTo(LocalDateTime.of(2026, 11, 7, 18, 49, 47));
|
||||
assertThat(first.getJdOnlineAt()).as("上架时间与创建时间不是同一个值(京麦后台两列)")
|
||||
.isEqualTo(LocalDateTime.of(2026, 11, 12, 15, 3, 37));
|
||||
assertThat(first.getJdUpdatedAt()).isEqualTo(LocalDateTime.of(2026, 11, 13, 14, 6, 7));
|
||||
assertThat(first.getItemNum()).as("货号(京麦列表列,≠ skuId)").isEqualTo("956597306407");
|
||||
assertThat(first.getSkuCount()).isEqualTo(12);
|
||||
assertThat(first.getHealthScore()).isEqualTo(81);
|
||||
assertThat(first.getAttrCount()).as("detail 键数进 attr_count").isEqualTo(2);
|
||||
assertThat(first.getAttrJson()).as("detail 原样透传,不裁剪").contains("品牌").contains("花屿巷");
|
||||
assertThat(first.getCollectBatchId()).isEqualTo("JD20261114-0001");
|
||||
|
||||
Reference in New Issue
Block a user