feat(jd): 列表列对齐+主图投影+SKU 矩阵+删除链收口(B101/B102 服务端与后管)
This commit is contained in:
+52
-3
@@ -8,8 +8,11 @@ import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
|
||||
import com.nanri.aiimage.common.service.DataReadScope;
|
||||
import com.nanri.aiimage.common.support.DownloadHeaderUtil;
|
||||
import com.nanri.aiimage.modules.jd.model.dto.JdProductBatchDeleteRequest;
|
||||
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 io.swagger.v3.oas.annotations.Operation;
|
||||
@@ -19,25 +22,35 @@ import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponses;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 后管「京东数据库」只读页(v1.4 Phase 5)。数据由采集回传同步落表
|
||||
* ({@code JdResultIngestService},覆盖最新),本页只读——列表/详情/导出三个 GET 端点,
|
||||
* 不出表、不改商品行、无导入;分组管理走 {@code AdminJdProductGroupController}(同款鉴权闸)。
|
||||
* 后管「京东数据库」(v1.4 Phase 5)。数据由采集回传同步落表
|
||||
* ({@code JdResultIngestService},覆盖最新):列表/详情/导出三个 GET 端点 +
|
||||
* 删除(单行 {@code DELETE /{id}} 与批量 {@code POST /batch-delete},用户口径
|
||||
* 「后台删除数据的时候也要把桶对应的文件删除」);分组管理走
|
||||
* {@code AdminJdProductGroupController}(同款鉴权闸)。
|
||||
*
|
||||
* <p>删除是唯一会改数据的动作,语义写在 {@code JdProductDeleteService}:先删 {@code jd-products}
|
||||
* 桶内对象、全成功才删库行(SKU → 图片登记 → 商品行),被其他商品共用的图片对象保留。</p>
|
||||
*
|
||||
* <p>鉴权照外观专利只读页私有 {@code requireXxxAccess} 形状:JWT → 内部令牌回退 → 超管放行 →
|
||||
* 非超管菜单权限(column_key/route_path 双匹配)。菜单行由 V196 只插 columns 不预授权
|
||||
@@ -62,6 +75,7 @@ public class AdminJdProductController {
|
||||
private static final DateTimeFormatter EXPORT_FILENAME_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMddHHmm");
|
||||
|
||||
private final JdProductQueryService jdProductQueryService;
|
||||
private final JdProductDeleteService jdProductDeleteService;
|
||||
private final AdminAuthSupport adminAuthSupport;
|
||||
private final PermissionMenuService permissionMenuService;
|
||||
private final DataReadScope dataReadScope;
|
||||
@@ -139,6 +153,41 @@ public class AdminJdProductController {
|
||||
.body(bytes);
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
@Operation(summary = "删除单个京东商品", description = "先删 jd-products 桶内该商品的图片对象、"
|
||||
+ "全部成功后才删库行(SKU → 图片登记 → 商品行);被其他商品共用的图片对象保留。"
|
||||
+ "任何对象删不掉就整批拒绝、一行库行都不动。越界 id 按不存在拒绝。")
|
||||
public ApiResponse<JdProductDeleteVo> delete(
|
||||
@Parameter(description = "商品行 id") @PathVariable("id") Long id,
|
||||
@Parameter(description = "公司 ID") @RequestParam(name = "company_id", required = false) Long companyId,
|
||||
HttpServletRequest request) {
|
||||
RequestOperator operator = requireJdAccess(request);
|
||||
AdminUserEntity user = operator.user();
|
||||
Long scopedCompanyId = dataReadScope.readCompanyIdOrOwn(user, companyId);
|
||||
JdProductDeleteVo vo = jdProductDeleteService.delete(List.of(id), scopedCompanyId);
|
||||
// 管理端破坏性动作必须留痕:谁、删了哪些行、桶里清了几个对象(同分组删除口径)。
|
||||
log.info("[jd-product] 删除商品 operatorId={} companyId={} id={} deleted={} objectsDeleted={}",
|
||||
operator.id(), scopedCompanyId, id, vo.getDeleted(), vo.getObjectsDeleted());
|
||||
return ApiResponse.success(vo);
|
||||
}
|
||||
|
||||
@PostMapping("/batch-delete")
|
||||
@Operation(summary = "批量删除京东商品", description = "与单行删除同一出口(先删桶对象、全成功才删库行);"
|
||||
+ "单次最多 200 个,id 里有一行不存在或不属于当前公司则整批拒绝(不做部分删除)。")
|
||||
public ApiResponse<JdProductDeleteVo> batchDelete(
|
||||
@Valid @RequestBody JdProductBatchDeleteRequest body,
|
||||
@Parameter(description = "公司 ID") @RequestParam(name = "company_id", required = false) Long companyId,
|
||||
HttpServletRequest request) {
|
||||
RequestOperator operator = requireJdAccess(request);
|
||||
AdminUserEntity user = operator.user();
|
||||
Long scopedCompanyId = dataReadScope.readCompanyIdOrOwn(user, companyId);
|
||||
JdProductDeleteVo vo = jdProductDeleteService.delete(body.getIds(), scopedCompanyId);
|
||||
log.info("[jd-product] 批量删除商品 operatorId={} companyId={} requested={} deleted={} objectsDeleted={} kept={}",
|
||||
operator.id(), scopedCompanyId, body.getIds().size(), vo.getDeleted(),
|
||||
vo.getObjectsDeleted(), vo.getObjectsKept());
|
||||
return ApiResponse.success(vo);
|
||||
}
|
||||
|
||||
private RequestOperator requireJdAccess(HttpServletRequest request) {
|
||||
AdminUserEntity operator = resolveOperator(request);
|
||||
if (operator == null || operator.getId() == null || operator.getId() <= 0) {
|
||||
|
||||
+25
@@ -0,0 +1,25 @@
|
||||
package com.nanri.aiimage.modules.jd.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.nanri.aiimage.modules.jd.model.entity.JdProductSkuEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 京东商品 SKU 矩阵(biz_jd_product_sku,V198)数据访问口。
|
||||
*
|
||||
* <p>写入口唯一是 {@link #upsertBatch}:按唯一键 {@code uk_product_sku(product_id, sku_id)}
|
||||
* upsert——同商品同 SKU 重复采集刷新价格/库存/名称,行数不增;SQL 全落
|
||||
* {@code mapper/jd/JdProductSkuMapper.xml}(铁律 1)。</p>
|
||||
*
|
||||
* <p>不做 delete:京麦侧删掉某 SKU 后旧行会留着(与商品主表同口径「只覆盖不删行」),
|
||||
* 但 SKU 数真源仍是商品行的 {@code sku_count}(列表列),抽屉里的矩阵按本表逐行展示。</p>
|
||||
*/
|
||||
@Mapper
|
||||
public interface JdProductSkuMapper extends BaseMapper<JdProductSkuEntity> {
|
||||
|
||||
/** 多值批量 upsert(冲突键 uk_product_sku);单商品 SKU 数上限由调用方钳制。 */
|
||||
int upsertBatch(@Param("rows") List<JdProductSkuEntity> rows);
|
||||
}
|
||||
+13
@@ -93,6 +93,15 @@ public class JdIngestChunkRequest {
|
||||
|
||||
private String skuId;
|
||||
|
||||
/** 货号(京麦列表行 itemNum,V197;与 skuId 不同)。 */
|
||||
private String itemNum;
|
||||
|
||||
/** SKU 数(京麦列表行 productSkuInfoVO.skuCount,V197)。 */
|
||||
private Integer skuCount;
|
||||
|
||||
/** 信息分(京麦列表行 healthScoreVO.score,V197)。 */
|
||||
private Integer healthScore;
|
||||
|
||||
private String brand;
|
||||
|
||||
private String brandId;
|
||||
@@ -115,6 +124,10 @@ public class JdIngestChunkRequest {
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private String jdCreatedAt;
|
||||
|
||||
/** 京东侧上架时间(yyyy-MM-dd HH:mm:ss;京麦列表「上架时间」列,V197)。 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private String jdOnlineAt;
|
||||
|
||||
/** 京东侧修改时间(yyyy-MM-dd HH:mm:ss)。 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private String jdUpdatedAt;
|
||||
|
||||
+21
@@ -0,0 +1,21 @@
|
||||
package com.nanri.aiimage.modules.jd.model.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 后管批量删除京东商品的请求体(v1.4 补口)。公司隔离不走 body——`company_id` 是请求参数,
|
||||
* 由 `DataReadScope#readCompanyIdOrOwn` 统一收口(同本模块全部分页/导出/分组端点),
|
||||
* 免得 body 里再出现一次"公司不传就当全公司"的假 tab 形状。
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "批量删除京东商品请求")
|
||||
public class JdProductBatchDeleteRequest {
|
||||
|
||||
@Schema(description = "商品行 id 清单(单次最多 200 个)")
|
||||
@NotEmpty(message = "请先选择要删除的商品")
|
||||
private List<Long> ids;
|
||||
}
|
||||
+8
@@ -39,6 +39,12 @@ public class JdProductEntity {
|
||||
private String productCode;
|
||||
/** 京东 SKU/货号。 */
|
||||
private String skuId;
|
||||
/** 货号(京麦列表行 {@code itemNum},V197;与 {@code skuId} 不是同一个值)。 */
|
||||
private String itemNum;
|
||||
/** SKU 数(京麦列表行 {@code productSkuInfoVO.skuCount},V197)。 */
|
||||
private Integer skuCount;
|
||||
/** 信息分(京麦列表行 {@code healthScoreVO.score},V197)。 */
|
||||
private Integer healthScore;
|
||||
private String title;
|
||||
private String brand;
|
||||
private String brandId;
|
||||
@@ -55,6 +61,8 @@ public class JdProductEntity {
|
||||
private String listTab;
|
||||
/** 京东侧创建时间。 */
|
||||
private LocalDateTime jdCreatedAt;
|
||||
/** 京东侧上架时间(V197,京麦列表行的上架时间列,与创建时间不是同一个值)。 */
|
||||
private LocalDateTime jdOnlineAt;
|
||||
/** 京东侧修改时间。 */
|
||||
private LocalDateTime jdUpdatedAt;
|
||||
/** 自有桶主图 URL(京东原图域名不落库,AC-4)。 */
|
||||
|
||||
+47
@@ -0,0 +1,47 @@
|
||||
package com.nanri.aiimage.modules.jd.model.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 京东商品 SKU 行({@code biz_jd_product_sku},V198,v1.4 详情面补齐)。
|
||||
*
|
||||
* <p>京麦详情页「销售属性」区是一个 SKU 矩阵(真机样本 12 行 = 颜色 3 × 尺码 4),
|
||||
* 每行有自己的 {@code skuId} / 价格 / 库存 / 销售属性组合。幂等键
|
||||
* {@code uk_product_sku(product_id, sku_id)}:二次采集 upsert,行数不增。</p>
|
||||
*
|
||||
* <p>{@code saleAttrsJson} 存组合维度({@code [{"name":"颜色","value":"上衣"},…]})——
|
||||
* 京麦把它当展示维度而不是「商品属性」,所以不并进 {@code attr_json}(那列是属性三元组正本)。</p>
|
||||
*/
|
||||
@Data
|
||||
@TableName("biz_jd_product_sku")
|
||||
public class JdProductSkuEntity {
|
||||
|
||||
@TableId(type = IdType.AUTO)
|
||||
private Long id;
|
||||
/** 商品行 id(biz_jd_product.id,不是京麦 productId)。 */
|
||||
private Long productId;
|
||||
/** 物化归属分公司(与商品行一致)。 */
|
||||
private Long companyId;
|
||||
/** 京麦 SKU id(真机样本 10238877506570)。 */
|
||||
private String skuId;
|
||||
/** SKU 名(京麦 skuName,含销售属性后缀)。 */
|
||||
private String skuName;
|
||||
/** 京麦 skuSeq(商家自定义序号)。 */
|
||||
private String skuSeq;
|
||||
/** SKU 京东价(京麦 jdPrice)。 */
|
||||
private BigDecimal price;
|
||||
/** SKU 库存(京麦 stockNum)。 */
|
||||
private Integer stock;
|
||||
/** 销售属性组合 JSON([{"name":"颜色","value":"上衣"},…])。 */
|
||||
private String saleAttrsJson;
|
||||
/** 同商品内排序(详情抽屉 SKU 矩阵顺序)。 */
|
||||
private Integer sortNo;
|
||||
/** 同步时刻(upsert 刷新)。 */
|
||||
private LocalDateTime syncedAt;
|
||||
}
|
||||
@@ -21,6 +21,9 @@ public class JdIngestChunkVo {
|
||||
|
||||
private int imagesRegistered;
|
||||
|
||||
/** SKU 矩阵落库行数(V198 详情面补齐;客户端未带 detail.skus 时恒 0)。 */
|
||||
private int skusRegistered;
|
||||
|
||||
/** 点名原因(accept=false 时给采集端与日志看)。 */
|
||||
private String message;
|
||||
}
|
||||
|
||||
+34
@@ -0,0 +1,34 @@
|
||||
package com.nanri.aiimage.modules.jd.model.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 京东数据库「删除商品」回执(v1.4 补口,用户口径「后台删除数据的时候也要把桶对应的文件删除」)。
|
||||
*
|
||||
* <p>删除是先删桶、全成功才删库行(见 {@code JdProductDeleteService}):任何一个对象删不掉
|
||||
* 就整批拒绝、回滚,不留"库里没有、桶里还在"的孤儿。因此本 VO 只在**真的删成功**时返回。</p>
|
||||
*
|
||||
* <p>三个对象计数分开报,是因为它们对用户意义不同:{@code objectsDeleted} 是这次真清掉的图,
|
||||
* {@code objectsKept} 是**仍被别的商品引用**的内容寻址对象(同公司同内容同 key,删了会让别的
|
||||
* 商品裂图),{@code objectsSkipped} 是 key 不在配置前缀内、不敢动的历史脏行(只留 WARN,不动手)。</p>
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "删除京东商品回执")
|
||||
public class JdProductDeleteVo {
|
||||
|
||||
@Schema(description = "实际删除的商品行数")
|
||||
private int deleted;
|
||||
|
||||
@Schema(description = "随之删除的图片登记行数")
|
||||
private int imagesDeleted;
|
||||
|
||||
@Schema(description = "jd-products 桶内实际删除的对象数")
|
||||
private int objectsDeleted;
|
||||
|
||||
@Schema(description = "仍被其他商品引用而保留的对象数(共用图不删)")
|
||||
private int objectsKept;
|
||||
|
||||
@Schema(description = "key 不在配置前缀内、未删除的对象数(脏行留痕)")
|
||||
private int objectsSkipped;
|
||||
}
|
||||
+54
@@ -41,6 +41,15 @@ public class JdProductDetailVo {
|
||||
@Schema(description = "京东 SKU/货号")
|
||||
private String skuId;
|
||||
|
||||
@Schema(description = "货号(京麦列表列,与 SKU 不同)")
|
||||
private String itemNum;
|
||||
|
||||
@Schema(description = "SKU 数(京麦列表列)")
|
||||
private Integer skuCount;
|
||||
|
||||
@Schema(description = "信息分(京麦列表列)")
|
||||
private Integer healthScore;
|
||||
|
||||
@Schema(description = "商品标题")
|
||||
private String title;
|
||||
|
||||
@@ -71,6 +80,9 @@ public class JdProductDetailVo {
|
||||
@Schema(description = "京东侧创建时间")
|
||||
private LocalDateTime jdCreatedAt;
|
||||
|
||||
@Schema(description = "京东侧上架时间")
|
||||
private LocalDateTime jdOnlineAt;
|
||||
|
||||
@Schema(description = "京东侧修改时间")
|
||||
private LocalDateTime jdUpdatedAt;
|
||||
|
||||
@@ -104,6 +116,9 @@ public class JdProductDetailVo {
|
||||
@Schema(description = "已转存图片(自有域名 URL)")
|
||||
private List<ImageViewVo> images;
|
||||
|
||||
@Schema(description = "SKU 矩阵(京麦详情页「销售属性」区,V198;旧数据为空列表)")
|
||||
private List<SkuVo> skus;
|
||||
|
||||
/** attr_json 的一个 Tab:{@code {"tab":"商品基本信息","attrs":[...]}}。 */
|
||||
@Data
|
||||
@Schema(description = "属性分组(一个 Tab 一组)")
|
||||
@@ -157,4 +172,43 @@ public class JdProductDetailVo {
|
||||
@Schema(description = "图片高(像素,可空)")
|
||||
private Integer height;
|
||||
}
|
||||
|
||||
/** 一个 SKU(biz_jd_product_sku 行的读侧投影,京麦详情页「销售属性」区)。 */
|
||||
@Data
|
||||
@Schema(description = "SKU 行")
|
||||
public static class SkuVo {
|
||||
|
||||
@Schema(description = "京麦 SKU id(真机样本 10238877506570)")
|
||||
private String skuId;
|
||||
|
||||
@Schema(description = "SKU 名(京麦 skuName)")
|
||||
private String skuName;
|
||||
|
||||
@Schema(description = "商家自定义序号(京麦 skuSeq)")
|
||||
private String skuSeq;
|
||||
|
||||
@Schema(description = "SKU 京东价")
|
||||
private BigDecimal price;
|
||||
|
||||
@Schema(description = "SKU 库存")
|
||||
private Integer stock;
|
||||
|
||||
@Schema(description = "销售属性组合([{\"name\":\"颜色\",\"value\":\"上衣\"}])")
|
||||
private List<SkuAttrVo> saleAttrs;
|
||||
|
||||
@Schema(description = "同商品内排序")
|
||||
private Integer sortNo;
|
||||
}
|
||||
|
||||
/** 销售属性组合的一项(颜色=上衣 / 尺码=S)。 */
|
||||
@Data
|
||||
@Schema(description = "销售属性组合项")
|
||||
public static class SkuAttrVo {
|
||||
|
||||
@Schema(description = "属性名(京麦 attrName)")
|
||||
private String name;
|
||||
|
||||
@Schema(description = "属性值(京麦 attrValueAlias)")
|
||||
private String value;
|
||||
}
|
||||
}
|
||||
|
||||
+15
@@ -31,6 +31,15 @@ public class JdProductListItemVo {
|
||||
@Schema(description = "京东 SKU/货号")
|
||||
private String skuId;
|
||||
|
||||
@Schema(description = "货号(京麦列表列,与 SKU 不同)")
|
||||
private String itemNum;
|
||||
|
||||
@Schema(description = "SKU 数(京麦列表列,如「12个SKU」)")
|
||||
private Integer skuCount;
|
||||
|
||||
@Schema(description = "信息分(京麦列表列,0~100)")
|
||||
private Integer healthScore;
|
||||
|
||||
@Schema(description = "商品标题")
|
||||
private String title;
|
||||
|
||||
@@ -55,6 +64,12 @@ public class JdProductListItemVo {
|
||||
@Schema(description = "采集来源 Tab(ONSALE/OFFSALE)")
|
||||
private String listTab;
|
||||
|
||||
@Schema(description = "京东侧创建时间")
|
||||
private LocalDateTime jdCreatedAt;
|
||||
|
||||
@Schema(description = "京东侧上架时间")
|
||||
private LocalDateTime jdOnlineAt;
|
||||
|
||||
@Schema(description = "京东侧修改时间")
|
||||
private LocalDateTime jdUpdatedAt;
|
||||
|
||||
|
||||
+207
@@ -0,0 +1,207 @@
|
||||
package com.nanri.aiimage.modules.jd.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
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 lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* 京东数据库「删除商品」编排(v1.4 补口,用户口径「后台删除数据的时候也要把桶对应的文件删除」)。
|
||||
*
|
||||
* <p>执行顺序是本类的全部要点:<b>先删桶、全成功才删库行</b>。理由不是洁癖——图片对象是
|
||||
* 内容寻址的({@code <key-prefix><companyId>/<sha256>.<ext>}),一旦库行先消失,
|
||||
* 之后就再没人知道该删哪些 key:删不掉的会变成永久孤儿(该桶 {@code retention-days=0}=永久保留)。</p>
|
||||
*
|
||||
* <p>三条边界:</p>
|
||||
* <ul>
|
||||
* <li><b>共用对象不删</b>:同一张图可能挂在多个商品上(同 key),删一个商品时还要看
|
||||
* {@code biz_jd_product_image} 里有没有别的商品引用它;有就保留,计入 {@code objectsKept}。</li>
|
||||
* <li><b>只删自己前缀内的 key</b>:key 不以 {@code aiimage.jd.oss.key-prefix} 开头的行只留 WARN、
|
||||
* 不动手(防早期脏数据把删除扩到别的桶前缀上),计入 {@code objectsSkipped}。</li>
|
||||
* <li><b>归属先判、整批拒绝</b>:id 里有一行不存在或不属于当前公司 ⇒ 整批不删(不做部分删除,
|
||||
* 也不泄露越界行的存在性),文案点明"本次未删除任何数据"。</li>
|
||||
* </ul>
|
||||
*/
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
@Slf4j
|
||||
public class JdProductDeleteService {
|
||||
|
||||
private static final String LOG_TAG = "jd-delete";
|
||||
|
||||
/** 单次批量删除上限(与列表页一次最多可选行数同量级;超限让用户分批,防一次拖死事务与桶)。 */
|
||||
public static final int MAX_BATCH = 200;
|
||||
|
||||
/** 单次可能触碰的对象数上限(200 行 × 200 图/行理论值 4 万;超过说明这批数据异常,拒绝)。 */
|
||||
private static final int MAX_OBJECTS = 20000;
|
||||
|
||||
/** 共用性回查的分片大小(IN 清单过大在 MySQL 侧会走坏执行计划)。 */
|
||||
private static final int KEY_LOOKUP_CHUNK = 500;
|
||||
|
||||
private final JdProductMapper jdProductMapper;
|
||||
private final JdProductImageMapper jdProductImageMapper;
|
||||
private final JdProductRowDeleteService jdProductRowDeleteService;
|
||||
private final OssStorageService ossStorageService;
|
||||
|
||||
/** 京东商品图独立桶(application.yml 写死 jd-products,不设 env 防 ILM 误配,铁律 17)。 */
|
||||
@Value("${aiimage.jd.oss.bucket:jd-products}")
|
||||
private String bucket;
|
||||
|
||||
/** 对象 key 前缀(与 {@code JdProductImageIngestService} 同源)。 */
|
||||
@Value("${aiimage.jd.oss.key-prefix:jd-products/}")
|
||||
private String keyPrefix;
|
||||
|
||||
/** 删除给定商品(含 SKU、图片登记行与桶内对象);见类注释的三条边界。 */
|
||||
public JdProductDeleteVo delete(List<Long> requestedIds, Long scopedCompanyId) {
|
||||
List<Long> ids = normalizeIds(requestedIds);
|
||||
requireScopedRows(ids, scopedCompanyId);
|
||||
List<JdProductImageEntity> images = imageRowsOf(ids);
|
||||
Set<String> ownedKeys = new LinkedHashSet<>();
|
||||
Set<String> foreignKeys = new LinkedHashSet<>();
|
||||
splitKeys(images, ownedKeys, foreignKeys);
|
||||
if (!foreignKeys.isEmpty()) {
|
||||
log.warn("[{}] 有 {} 个对象 key 不在配置前缀 {} 内,本次不动手 productIds={} sample={}",
|
||||
LOG_TAG, foreignKeys.size(), keyPrefix, ids, firstOf(foreignKeys));
|
||||
}
|
||||
Set<String> sharedKeys = sharedObjectKeys(ownedKeys, ids);
|
||||
int purged = purgeObjects(ownedKeys, sharedKeys);
|
||||
|
||||
int deleted;
|
||||
try {
|
||||
deleted = jdProductRowDeleteService.deleteRows(ids);
|
||||
} catch (RuntimeException ex) {
|
||||
// 桶已删空、库行回滚:数据面会裂图。把可复算的信息留在日志里(key 清单可从图片登记行重建)。
|
||||
log.error("[{}] 桶内已删 {} 个对象但库行删除失败(需人工核对 productIds={})",
|
||||
LOG_TAG, purged, ids, ex);
|
||||
throw ex;
|
||||
}
|
||||
|
||||
JdProductDeleteVo vo = new JdProductDeleteVo();
|
||||
vo.setDeleted(deleted);
|
||||
vo.setImagesDeleted(images.size());
|
||||
vo.setObjectsDeleted(purged);
|
||||
vo.setObjectsKept(ownedKeys.size() - purged);
|
||||
vo.setObjectsSkipped(foreignKeys.size());
|
||||
log.info("[{}] 删除完成 companyId={} productIds={} deleted={} images={} objectsDeleted={} kept={} skipped={}",
|
||||
LOG_TAG, scopedCompanyId, ids, deleted, images.size(), purged, vo.getObjectsKept(),
|
||||
foreignKeys.size());
|
||||
return vo;
|
||||
}
|
||||
|
||||
// ---------- 校验与取数 ----------
|
||||
|
||||
private List<Long> normalizeIds(List<Long> requestedIds) {
|
||||
if (requestedIds == null || requestedIds.isEmpty()) {
|
||||
throw new BusinessException("请先选择要删除的商品");
|
||||
}
|
||||
Set<Long> unique = new LinkedHashSet<>();
|
||||
for (Long id : requestedIds) {
|
||||
if (id != null && id > 0) {
|
||||
unique.add(id);
|
||||
}
|
||||
}
|
||||
if (unique.isEmpty()) {
|
||||
throw new BusinessException("请先选择要删除的商品");
|
||||
}
|
||||
if (unique.size() > MAX_BATCH) {
|
||||
throw new BusinessException("单次最多删除 " + MAX_BATCH + " 个商品,请分批操作");
|
||||
}
|
||||
return new ArrayList<>(unique);
|
||||
}
|
||||
|
||||
/** 归属闸:行必须都在(且都在当前公司可见面内),否则整批拒绝——不做部分删除。 */
|
||||
private void requireScopedRows(List<Long> ids, Long scopedCompanyId) {
|
||||
boolean scoped = scopedCompanyId != null && scopedCompanyId > 0;
|
||||
List<JdProductEntity> rows = jdProductMapper.selectList(new LambdaQueryWrapper<JdProductEntity>()
|
||||
.select(JdProductEntity::getId)
|
||||
.in(JdProductEntity::getId, ids)
|
||||
.eq(scoped, JdProductEntity::getCompanyId, scopedCompanyId));
|
||||
if (rows.size() != ids.size()) {
|
||||
throw new BusinessException("有 " + (ids.size() - rows.size())
|
||||
+ " 个商品不存在或不属于当前公司,请刷新后重试(本次未删除任何数据)");
|
||||
}
|
||||
}
|
||||
|
||||
private List<JdProductImageEntity> imageRowsOf(List<Long> ids) {
|
||||
return jdProductImageMapper.selectList(new LambdaQueryWrapper<JdProductImageEntity>()
|
||||
.in(JdProductImageEntity::getProductId, ids));
|
||||
}
|
||||
|
||||
/** 图片登记行的 key 分两堆:前缀内的(可删)与前缀外的(只留痕)。 */
|
||||
private void splitKeys(List<JdProductImageEntity> images, Set<String> owned, Set<String> foreign) {
|
||||
for (JdProductImageEntity image : images) {
|
||||
String key = image.getObjectKey() == null ? "" : image.getObjectKey().trim();
|
||||
if (key.isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
if (keyPrefix != null && !keyPrefix.isEmpty() && key.startsWith(keyPrefix)) {
|
||||
owned.add(key);
|
||||
} else {
|
||||
foreign.add(key);
|
||||
}
|
||||
}
|
||||
if (owned.size() > MAX_OBJECTS) {
|
||||
throw new BusinessException("这批商品的图片对象超过 " + MAX_OBJECTS + " 个,请分批删除");
|
||||
}
|
||||
}
|
||||
|
||||
/** 仍被「其他商品」引用的 key(内容寻址⇒同公司同内容同 key,删了会让别的商品裂图)。 */
|
||||
private Set<String> sharedObjectKeys(Set<String> keys, List<Long> deletingIds) {
|
||||
Set<String> shared = new LinkedHashSet<>();
|
||||
if (keys.isEmpty()) {
|
||||
return shared;
|
||||
}
|
||||
List<String> all = new ArrayList<>(keys);
|
||||
for (int from = 0; from < all.size(); from += KEY_LOOKUP_CHUNK) {
|
||||
List<String> chunk = all.subList(from, Math.min(all.size(), from + KEY_LOOKUP_CHUNK));
|
||||
List<JdProductImageEntity> others = jdProductImageMapper.selectList(
|
||||
new LambdaQueryWrapper<JdProductImageEntity>()
|
||||
.select(JdProductImageEntity::getObjectKey)
|
||||
.in(JdProductImageEntity::getObjectKey, chunk)
|
||||
.notIn(JdProductImageEntity::getProductId, deletingIds));
|
||||
for (JdProductImageEntity other : others) {
|
||||
if (other.getObjectKey() != null) {
|
||||
shared.add(other.getObjectKey());
|
||||
}
|
||||
}
|
||||
}
|
||||
return shared;
|
||||
}
|
||||
|
||||
// ---------- 桶 ----------
|
||||
|
||||
/** 逐个删对象;任何一个失败立刻抛(此时一行库行都还没动,整批可安全重试)。 */
|
||||
private int purgeObjects(Set<String> keys, Set<String> shared) {
|
||||
int purged = 0;
|
||||
for (String key : keys) {
|
||||
if (shared.contains(key)) {
|
||||
continue;
|
||||
}
|
||||
try {
|
||||
ossStorageService.removeObject(bucket, key);
|
||||
} catch (RuntimeException ex) {
|
||||
throw new BusinessException("桶内对象删除失败,本次未删除任何数据(" + key + "):"
|
||||
+ ex.getMessage());
|
||||
}
|
||||
purged++;
|
||||
}
|
||||
return purged;
|
||||
}
|
||||
|
||||
private static String firstOf(Set<String> keys) {
|
||||
return keys.isEmpty() ? "" : keys.iterator().next();
|
||||
}
|
||||
}
|
||||
+21
-5
@@ -255,7 +255,7 @@ public class JdProductImageIngestService {
|
||||
}
|
||||
if (!rows.isEmpty()) {
|
||||
jdProductImageMapper.upsertBatch(rows);
|
||||
refreshProductImageCount(productId);
|
||||
refreshProductImageProjection(productId);
|
||||
}
|
||||
log.info("[{}] 图片登记完成 taskId={} productId={} productCode={} received={} registered={} "
|
||||
+ "skipped={} mismatched={}",
|
||||
@@ -264,15 +264,31 @@ public class JdProductImageIngestService {
|
||||
}
|
||||
|
||||
/**
|
||||
* 登记后把商品行 image_count 刷成图片表实际行数(V193 列 DEFAULT 0,不刷会长期停在 0
|
||||
* 冒充没图);按表实数取值天然幂等,重复登记不累计。
|
||||
* 登记后把商品行的图片投影刷成图片表实数:{@code image_count}=已登记图片行数,
|
||||
* {@code main_image_url}=MAIN 档首图的自有桶 URL(B98-01:这一列此前全仓无写点,
|
||||
* 后管列表主图位恒「无图」,即使图片已经传进桶里)。
|
||||
*
|
||||
* <p>按表实数取、不按本次登记的清单累加:重复登记天然幂等,删图后也会被纠正。
|
||||
* 没有任何 MAIN 图时把主图 URL 置 NULL(宁可显示「无图」,也不留一张已经被替换的旧图)。</p>
|
||||
*/
|
||||
private void refreshProductImageCount(Long productId) {
|
||||
private void refreshProductImageProjection(Long productId) {
|
||||
Long total = jdProductImageMapper.selectCount(new LambdaQueryWrapper<JdProductImageEntity>()
|
||||
.eq(JdProductImageEntity::getProductId, productId));
|
||||
String mainImageUrl = null;
|
||||
List<JdProductImageEntity> mains = jdProductImageMapper.selectList(
|
||||
new LambdaQueryWrapper<JdProductImageEntity>()
|
||||
.eq(JdProductImageEntity::getProductId, productId)
|
||||
.eq(JdProductImageEntity::getImageType, "MAIN")
|
||||
.orderByAsc(JdProductImageEntity::getSortNo)
|
||||
.orderByAsc(JdProductImageEntity::getId)
|
||||
.last("limit 1"));
|
||||
if (mains != null && !mains.isEmpty()) {
|
||||
mainImageUrl = mains.get(0).getUrl();
|
||||
}
|
||||
jdProductMapper.update(null, new com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper<JdProductEntity>()
|
||||
.eq(JdProductEntity::getId, productId)
|
||||
.set(JdProductEntity::getImageCount, total == null ? 0 : total.intValue()));
|
||||
.set(JdProductEntity::getImageCount, total == null ? 0 : total.intValue())
|
||||
.set(JdProductEntity::getMainImageUrl, mainImageUrl));
|
||||
}
|
||||
|
||||
// ---------- 公共小件 ----------
|
||||
|
||||
+91
-18
@@ -8,9 +8,11 @@ import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.modules.jd.mapper.JdProductGroupMapper;
|
||||
import com.nanri.aiimage.modules.jd.mapper.JdProductImageMapper;
|
||||
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.JdProductGroupEntity;
|
||||
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.JdProductDetailVo;
|
||||
import com.nanri.aiimage.modules.jd.model.vo.JdProductListItemVo;
|
||||
import com.nanri.aiimage.modules.jd.model.vo.JdProductPageVo;
|
||||
@@ -74,12 +76,13 @@ public class JdProductQueryService {
|
||||
|
||||
/** 导出列序(与后管页面主要字段同序,中文列名)。 */
|
||||
private static final List<String> EXPORT_HEADERS = List.of(
|
||||
"店铺名", "店铺ID", "商品编码", "SKU", "标题", "品牌", "类目路径",
|
||||
"价格下限", "价格上限", "库存", "商品状态", "来源Tab",
|
||||
"京东更新时间", "属性键数", "图片数", "分组", "同步时间");
|
||||
"店铺名", "店铺ID", "商品编码", "货号", "SKU", "SKU数", "信息分", "标题", "品牌", "类目路径",
|
||||
"价格下限", "价格上限", "库存", "商品状态", "来源Tab", "上架时间", "京东创建时间",
|
||||
"京东修改时间", "属性键数", "图片数", "主图URL", "分组", "同步时间");
|
||||
|
||||
private final JdProductMapper jdProductMapper;
|
||||
private final JdProductImageMapper jdProductImageMapper;
|
||||
private final JdProductSkuMapper jdProductSkuMapper;
|
||||
private final JdProductGroupMapper jdProductGroupMapper;
|
||||
private final ObjectMapper objectMapper = new ObjectMapper();
|
||||
|
||||
@@ -141,6 +144,9 @@ public class JdProductQueryService {
|
||||
vo.setShopName(row.getShopName());
|
||||
vo.setProductCode(row.getProductCode());
|
||||
vo.setSkuId(row.getSkuId());
|
||||
vo.setItemNum(row.getItemNum());
|
||||
vo.setSkuCount(row.getSkuCount());
|
||||
vo.setHealthScore(row.getHealthScore());
|
||||
vo.setTitle(row.getTitle());
|
||||
vo.setBrand(row.getBrand());
|
||||
vo.setBrandId(row.getBrandId());
|
||||
@@ -151,6 +157,7 @@ public class JdProductQueryService {
|
||||
vo.setSaleStatus(row.getSaleStatus());
|
||||
vo.setListTab(row.getListTab());
|
||||
vo.setJdCreatedAt(row.getJdCreatedAt());
|
||||
vo.setJdOnlineAt(row.getJdOnlineAt());
|
||||
vo.setJdUpdatedAt(row.getJdUpdatedAt());
|
||||
vo.setMainImageUrl(row.getMainImageUrl());
|
||||
vo.setDetailUrl(row.getDetailUrl());
|
||||
@@ -161,6 +168,7 @@ public class JdProductQueryService {
|
||||
vo.setSyncedAt(row.getSyncedAt());
|
||||
parseAttrGroups(vo, row.getAttrJson());
|
||||
vo.setImages(loadImages(row.getId()));
|
||||
vo.setSkus(loadSkus(row.getId()));
|
||||
return vo;
|
||||
}
|
||||
|
||||
@@ -227,6 +235,9 @@ public class JdProductQueryService {
|
||||
vo.setShopId(row.getShopId());
|
||||
vo.setProductCode(row.getProductCode());
|
||||
vo.setSkuId(row.getSkuId());
|
||||
vo.setItemNum(row.getItemNum());
|
||||
vo.setSkuCount(row.getSkuCount());
|
||||
vo.setHealthScore(row.getHealthScore());
|
||||
vo.setTitle(row.getTitle());
|
||||
vo.setBrand(row.getBrand());
|
||||
vo.setCategoryPath(row.getCategoryPath());
|
||||
@@ -235,6 +246,8 @@ public class JdProductQueryService {
|
||||
vo.setStockTotal(row.getStockTotal());
|
||||
vo.setSaleStatus(row.getSaleStatus());
|
||||
vo.setListTab(row.getListTab());
|
||||
vo.setJdCreatedAt(row.getJdCreatedAt());
|
||||
vo.setJdOnlineAt(row.getJdOnlineAt());
|
||||
vo.setJdUpdatedAt(row.getJdUpdatedAt());
|
||||
vo.setMainImageUrl(row.getMainImageUrl());
|
||||
vo.setAttrCount(row.getAttrCount());
|
||||
@@ -289,8 +302,59 @@ public class JdProductQueryService {
|
||||
return images;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- attr_json 解析
|
||||
/**
|
||||
* SKU 矩阵(biz_jd_product_sku,V198):按商品内排序号、id 稳定升序。
|
||||
*
|
||||
* <p>{@code sale_attrs_json} 解不出时该行 {@code saleAttrs} 落空列表——
|
||||
* 价格/库存/名称照常给(一行组合维度脏了不该让整张矩阵消失)。</p>
|
||||
*/
|
||||
private List<JdProductDetailVo.SkuVo> loadSkus(Long productId) {
|
||||
List<JdProductSkuEntity> rows = jdProductSkuMapper.selectList(
|
||||
new LambdaQueryWrapper<JdProductSkuEntity>()
|
||||
.eq(JdProductSkuEntity::getProductId, productId)
|
||||
.orderByAsc(JdProductSkuEntity::getSortNo)
|
||||
.orderByAsc(JdProductSkuEntity::getId));
|
||||
List<JdProductDetailVo.SkuVo> skus = new ArrayList<>(rows.size());
|
||||
for (JdProductSkuEntity row : rows) {
|
||||
JdProductDetailVo.SkuVo view = new JdProductDetailVo.SkuVo();
|
||||
view.setSkuId(row.getSkuId());
|
||||
view.setSkuName(row.getSkuName());
|
||||
view.setSkuSeq(row.getSkuSeq());
|
||||
view.setPrice(row.getPrice());
|
||||
view.setStock(row.getStock());
|
||||
view.setSortNo(row.getSortNo());
|
||||
view.setSaleAttrs(parseSaleAttrs(row.getSaleAttrsJson(), row.getSkuId()));
|
||||
skus.add(view);
|
||||
}
|
||||
return skus;
|
||||
}
|
||||
|
||||
/** 销售属性组合 JSON → VO 列表(非法/空按空列表,原文只进日志)。 */
|
||||
private List<JdProductDetailVo.SkuAttrVo> parseSaleAttrs(String json, String skuId) {
|
||||
List<JdProductDetailVo.SkuAttrVo> attrs = new ArrayList<>();
|
||||
if (json == null || json.isBlank()) {
|
||||
return attrs;
|
||||
}
|
||||
try {
|
||||
JsonNode array = objectMapper.readTree(json);
|
||||
if (!array.isArray()) {
|
||||
return attrs;
|
||||
}
|
||||
for (JsonNode node : array) {
|
||||
JdProductDetailVo.SkuAttrVo attr = new JdProductDetailVo.SkuAttrVo();
|
||||
attr.setName(node.path("name").asText(null));
|
||||
attr.setValue(node.path("value").asText(null));
|
||||
if (attr.getName() != null || attr.getValue() != null) {
|
||||
attrs.add(attr);
|
||||
}
|
||||
}
|
||||
} catch (com.fasterxml.jackson.core.JsonProcessingException ex) {
|
||||
log.warn("[jd-db] SKU 销售属性组合解析失败 skuId={} err={}", skuId, ex.getMessage());
|
||||
}
|
||||
return attrs;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- attr_json 解析
|
||||
/**
|
||||
* attr_json → attrGroups。契约形状 {@code {"tabs":[{"tab":..,"attrs":[..]}]}};
|
||||
* 为空/非法 JSON/形状不识别一律落空列表并把原文放进 {@code attrJsonRaw}(不抛 500,AC-7)。
|
||||
@@ -371,21 +435,30 @@ public class JdProductQueryService {
|
||||
row.createCell(0).setCellValue(safe(item.getShopName()));
|
||||
row.createCell(1).setCellValue(safe(item.getShopId()));
|
||||
row.createCell(2).setCellValue(safe(item.getProductCode()));
|
||||
row.createCell(3).setCellValue(safe(item.getSkuId()));
|
||||
row.createCell(4).setCellValue(safe(item.getTitle()));
|
||||
row.createCell(5).setCellValue(safe(item.getBrand()));
|
||||
row.createCell(6).setCellValue(safe(item.getCategoryPath()));
|
||||
row.createCell(7).setCellValue(item.getPriceMin() == null ? "" : item.getPriceMin().toPlainString());
|
||||
row.createCell(8).setCellValue(item.getPriceMax() == null ? "" : item.getPriceMax().toPlainString());
|
||||
row.createCell(9).setCellValue(item.getStockTotal() == null ? "" : String.valueOf(item.getStockTotal()));
|
||||
row.createCell(10).setCellValue(safe(item.getSaleStatus()));
|
||||
row.createCell(11).setCellValue(safe(item.getListTab()));
|
||||
row.createCell(12).setCellValue(item.getJdUpdatedAt() == null
|
||||
row.createCell(3).setCellValue(safe(item.getItemNum()));
|
||||
row.createCell(4).setCellValue(safe(item.getSkuId()));
|
||||
row.createCell(5).setCellValue(item.getSkuCount() == null ? "" : String.valueOf(item.getSkuCount()));
|
||||
row.createCell(6).setCellValue(item.getHealthScore() == null
|
||||
? "" : String.valueOf(item.getHealthScore()));
|
||||
row.createCell(7).setCellValue(safe(item.getTitle()));
|
||||
row.createCell(8).setCellValue(safe(item.getBrand()));
|
||||
row.createCell(9).setCellValue(safe(item.getCategoryPath()));
|
||||
row.createCell(10).setCellValue(item.getPriceMin() == null ? "" : item.getPriceMin().toPlainString());
|
||||
row.createCell(11).setCellValue(item.getPriceMax() == null ? "" : item.getPriceMax().toPlainString());
|
||||
row.createCell(12).setCellValue(item.getStockTotal() == null ? "" : String.valueOf(item.getStockTotal()));
|
||||
row.createCell(13).setCellValue(safe(item.getSaleStatus()));
|
||||
row.createCell(14).setCellValue(safe(item.getListTab()));
|
||||
row.createCell(15).setCellValue(item.getJdOnlineAt() == null
|
||||
? "" : EXPORT_DATETIME_FORMATTER.format(item.getJdOnlineAt()));
|
||||
row.createCell(16).setCellValue(item.getJdCreatedAt() == null
|
||||
? "" : EXPORT_DATETIME_FORMATTER.format(item.getJdCreatedAt()));
|
||||
row.createCell(17).setCellValue(item.getJdUpdatedAt() == null
|
||||
? "" : EXPORT_DATETIME_FORMATTER.format(item.getJdUpdatedAt()));
|
||||
row.createCell(13).setCellValue(item.getAttrCount() == null ? "" : String.valueOf(item.getAttrCount()));
|
||||
row.createCell(14).setCellValue(item.getImageCount() == null ? "" : String.valueOf(item.getImageCount()));
|
||||
row.createCell(15).setCellValue(safe(item.getGroupName()));
|
||||
row.createCell(16).setCellValue(item.getSyncedAt() == null
|
||||
row.createCell(18).setCellValue(item.getAttrCount() == null ? "" : String.valueOf(item.getAttrCount()));
|
||||
row.createCell(19).setCellValue(item.getImageCount() == null ? "" : String.valueOf(item.getImageCount()));
|
||||
row.createCell(20).setCellValue(safe(item.getMainImageUrl()));
|
||||
row.createCell(21).setCellValue(safe(item.getGroupName()));
|
||||
row.createCell(22).setCellValue(item.getSyncedAt() == null
|
||||
? "" : EXPORT_DATETIME_FORMATTER.format(item.getSyncedAt()));
|
||||
}
|
||||
|
||||
|
||||
+55
@@ -0,0 +1,55 @@
|
||||
package com.nanri.aiimage.modules.jd.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.nanri.aiimage.modules.jd.mapper.JdProductImageMapper;
|
||||
import com.nanri.aiimage.modules.jd.mapper.JdProductMapper;
|
||||
import com.nanri.aiimage.modules.jd.mapper.JdProductSkuMapper;
|
||||
import com.nanri.aiimage.modules.jd.model.entity.JdProductImageEntity;
|
||||
import com.nanri.aiimage.modules.jd.model.entity.JdProductSkuEntity;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 京东商品「库行」删除的唯一出口(子表 → 主表,同一事务)。
|
||||
*
|
||||
* <p>为什么单独一支:对象存储的删除是**不可回滚的外部动作**,它必须发生在事务之外
|
||||
* ({@link JdProductDeleteService} 先删桶、全成功才调本类)。若把三次 delete 与 S3 调用塞进
|
||||
* 同一个事务,S3 通一次网就多占一次行锁,而且事务回滚也救不回已经删掉的对象。</p>
|
||||
*
|
||||
* <p>删除顺序固定 {@code SKU → 图片行 → 商品行}:三张表都按 {@code product_id} 关联、没有外键,
|
||||
* 先删子行不会因为"主行先没"而留下查不到的孤儿;反过来则会。SQL 全走 BaseMapper wrapper
|
||||
* (铁律 1 允许的两种形态之一,与 {@link JdProductGroupService} 同形状)。</p>
|
||||
*/
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
@Slf4j
|
||||
public class JdProductRowDeleteService {
|
||||
|
||||
private final JdProductMapper jdProductMapper;
|
||||
private final JdProductImageMapper jdProductImageMapper;
|
||||
private final JdProductSkuMapper jdProductSkuMapper;
|
||||
|
||||
/**
|
||||
* 删除给定商品行的 SKU / 图片登记 / 商品行,返回商品行删除条数。
|
||||
*
|
||||
* <p>调用方必须保证 {@code ids} 非空(MP 的 {@code delete(wrapper)} 在 id 清单为空时
|
||||
* 会退化成"删全表")——本类首行再挡一次,防后来者直接调它。</p>
|
||||
*/
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public int deleteRows(List<Long> ids) {
|
||||
if (ids == null || ids.isEmpty()) {
|
||||
throw new IllegalArgumentException("删除商品行必须给出非空 id 清单");
|
||||
}
|
||||
jdProductSkuMapper.delete(new LambdaQueryWrapper<JdProductSkuEntity>()
|
||||
.in(JdProductSkuEntity::getProductId, ids));
|
||||
jdProductImageMapper.delete(new LambdaQueryWrapper<JdProductImageEntity>()
|
||||
.in(JdProductImageEntity::getProductId, ids));
|
||||
int deleted = jdProductMapper.deleteBatchIds(ids);
|
||||
log.info("[jd-delete] 库行已删 productIds={} rowCount={} deleted={}", ids.size(), ids.size(), deleted);
|
||||
return deleted;
|
||||
}
|
||||
}
|
||||
+170
@@ -0,0 +1,170 @@
|
||||
package com.nanri.aiimage.modules.jd.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
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 lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 京东商品 SKU 矩阵入库(v1.4 详情面补齐,V198)。
|
||||
*
|
||||
* <p>用户口径(2026-11-14):「后台的数据库要和京麦对上,包括详情里」——京麦详情页
|
||||
* 「销售属性」区是一张 SKU 矩阵(真机样本 12 行 = 颜色 3 × 尺码 4),每行有自己的
|
||||
* skuId / 价格 / 库存 / 属性组合。此前只有商品主表上的主 SKU 与 SKU 个数,抽屉里
|
||||
* 看不到这张矩阵。</p>
|
||||
*
|
||||
* <p>链路与图片登记同形:chunk 回传里带 detail.skus → 商品行 upsert **之后**才按
|
||||
* (companyId, taskId, productCode) 回查到 {@code biz_jd_product.id}(首采行 upsert 前
|
||||
* 必然查不到)→ 落 {@link JdProductSkuMapper#upsertBatch}(uk_product_sku 幂等)。</p>
|
||||
*/
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
@Slf4j
|
||||
public class JdProductSkuIngestService {
|
||||
|
||||
private static final String LOG_TAG = "jd-skus";
|
||||
|
||||
/** 单商品 SKU 数上限(防脏包一次写爆;京麦单商品 SKU 通常个位数到几十)。 */
|
||||
@Value("${aiimage.jd.sku-max-per-product:200}")
|
||||
private int skuMaxPerProduct;
|
||||
|
||||
private final JdProductMapper jdProductMapper;
|
||||
private final JdProductSkuMapper jdProductSkuMapper;
|
||||
private final ObjectMapper objectMapper;
|
||||
|
||||
/**
|
||||
* 登记一个商品的 SKU 矩阵,返回实际落库行数(商品行不存在/清单为空返回 0)。
|
||||
*
|
||||
* @param specs 客户端 detail.skus 逐行(形状见 {@link JdIngestSkuSpec}),空元素跳过
|
||||
*/
|
||||
public int registerTaskSkus(Long taskId, Long companyId, String productCode,
|
||||
List<JdIngestSkuSpec> specs) {
|
||||
if (specs == null || specs.isEmpty()) {
|
||||
return 0;
|
||||
}
|
||||
JdProductEntity product = jdProductMapper.selectOne(new LambdaQueryWrapper<JdProductEntity>()
|
||||
.eq(JdProductEntity::getCompanyId, companyId)
|
||||
.eq(JdProductEntity::getTaskId, taskId)
|
||||
.eq(JdProductEntity::getProductCode, productCode)
|
||||
.last("limit 1"));
|
||||
if (product == null) {
|
||||
log.warn("[{}] 商品行未落库,SKU 登记跳过 taskId={} productCode={} skuCount={}",
|
||||
LOG_TAG, taskId, productCode, specs.size());
|
||||
return 0;
|
||||
}
|
||||
int cap = Math.max(1, skuMaxPerProduct);
|
||||
List<JdIngestSkuSpec> effective = specs;
|
||||
if (specs.size() > cap) {
|
||||
effective = specs.subList(0, cap);
|
||||
log.warn("[{}] 单商品 SKU 超上限截断 taskId={} productCode={} received={} cap={}",
|
||||
LOG_TAG, taskId, productCode, specs.size(), cap);
|
||||
}
|
||||
List<JdProductSkuEntity> rows = new ArrayList<>();
|
||||
int skipped = 0;
|
||||
int sortNo = 0;
|
||||
for (JdIngestSkuSpec spec : effective) {
|
||||
if (spec == null || isBlank(spec.skuId())) {
|
||||
skipped++;
|
||||
continue;
|
||||
}
|
||||
JdProductSkuEntity row = new JdProductSkuEntity();
|
||||
row.setProductId(product.getId());
|
||||
row.setCompanyId(companyId);
|
||||
row.setSkuId(spec.skuId().trim());
|
||||
row.setSkuName(spec.skuName());
|
||||
row.setSkuSeq(spec.skuSeq());
|
||||
row.setPrice(spec.price());
|
||||
row.setStock(spec.stock());
|
||||
row.setSaleAttrsJson(writeJson(spec.saleAttrs()));
|
||||
row.setSortNo(spec.sortNo() == null ? sortNo : spec.sortNo());
|
||||
rows.add(row);
|
||||
sortNo++;
|
||||
}
|
||||
if (skipped > 0) {
|
||||
log.warn("[{}] SKU 登记跳过缺 skuId 的行 taskId={} productCode={} skipped={}",
|
||||
LOG_TAG, taskId, productCode, skipped);
|
||||
}
|
||||
if (rows.isEmpty()) {
|
||||
return 0;
|
||||
}
|
||||
jdProductSkuMapper.upsertBatch(rows);
|
||||
return rows.size();
|
||||
}
|
||||
|
||||
private String writeJson(List<Map<String, String>> saleAttrs) {
|
||||
if (saleAttrs == null || saleAttrs.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
return objectMapper.writeValueAsString(saleAttrs);
|
||||
} catch (com.fasterxml.jackson.core.JsonProcessingException ex) {
|
||||
// 组合维度假格式化失败不该让整批回传 500:留日志、这行不写组合(价格库存照落)。
|
||||
log.warn("[{}] 销售属性组合序列化失败(该 SKU 不写组合) err={}", LOG_TAG, ex.getMessage());
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean isBlank(String value) {
|
||||
return value == null || value.trim().isEmpty();
|
||||
}
|
||||
|
||||
/**
|
||||
* 客户端 detail.skus 的一行(中性形状:回传 DTO 与本服务解耦,判据与实现各测各的)。
|
||||
*/
|
||||
public record JdIngestSkuSpec(String skuId, String skuName, String skuSeq,
|
||||
java.math.BigDecimal price, Integer stock,
|
||||
Integer sortNo, List<Map<String, String>> saleAttrs) {
|
||||
|
||||
/** 从任意 map 形状宽容取一行(缺键按 null,不认识的键忽略)。 */
|
||||
@SuppressWarnings("unchecked")
|
||||
public static JdIngestSkuSpec fromMap(Map<String, Object> raw, int sortNo) {
|
||||
if (raw == null || raw.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
Object price = raw.get("price");
|
||||
Object stock = raw.get("stock");
|
||||
List<Map<String, String>> saleAttrs = null;
|
||||
Object attrs = raw.get("saleAttrs");
|
||||
if (attrs instanceof List<?> list) {
|
||||
saleAttrs = new ArrayList<>();
|
||||
for (Object item : list) {
|
||||
if (!(item instanceof Map<?, ?> map)) {
|
||||
continue;
|
||||
}
|
||||
Map<String, String> pair = new LinkedHashMap<>();
|
||||
Object name = map.get("name");
|
||||
Object value = map.get("value");
|
||||
if (name != null) {
|
||||
pair.put("name", String.valueOf(name));
|
||||
}
|
||||
if (value != null) {
|
||||
pair.put("value", String.valueOf(value));
|
||||
}
|
||||
if (!pair.isEmpty()) {
|
||||
saleAttrs.add(pair);
|
||||
}
|
||||
}
|
||||
}
|
||||
Object sort = raw.get("sortNo");
|
||||
return new JdIngestSkuSpec(
|
||||
raw.get("skuId") == null ? null : String.valueOf(raw.get("skuId")),
|
||||
raw.get("skuName") == null ? null : String.valueOf(raw.get("skuName")),
|
||||
raw.get("skuSeq") == null ? null : String.valueOf(raw.get("skuSeq")),
|
||||
price == null ? null : new java.math.BigDecimal(String.valueOf(price)),
|
||||
stock == null ? null : (int) Double.parseDouble(String.valueOf(stock)),
|
||||
sort instanceof Number number ? number.intValue() : sortNo,
|
||||
saleAttrs);
|
||||
}
|
||||
}
|
||||
}
|
||||
+54
@@ -70,6 +70,7 @@ public class JdResultIngestService {
|
||||
private final JdStaleTaskService jdStaleTaskService;
|
||||
private final TaskProgressSnapshotService taskProgressSnapshotService;
|
||||
private final JdProductImageIngestService jdProductImageIngestService;
|
||||
private final JdProductSkuIngestService jdProductSkuIngestService;
|
||||
private final ObjectMapper objectMapper;
|
||||
|
||||
public JdIngestChunkVo submitChunk(Long taskId, JdIngestChunkRequest request, boolean trustedErrorReporter) {
|
||||
@@ -101,11 +102,14 @@ public class JdResultIngestService {
|
||||
|
||||
int deduped = 0;
|
||||
int imageCount = 0;
|
||||
int skuCount = 0;
|
||||
List<JdProductEntity> rows = new ArrayList<>();
|
||||
// 图片登记延后到 upsert 之后(P0-2):registerTaskImages 按 companyId+taskId+productCode
|
||||
// 查商品行,首采行在 upsert 前必然不存在 → 登记会被 100% 跳过、图片永远落不了库。
|
||||
// 这里先收集,行落库后再逐商品登记。
|
||||
List<PendingImageRegistration> pendingImages = new ArrayList<>();
|
||||
// SKU 矩阵同理(V198):要先拿到 biz_jd_product.id 才能落 biz_jd_product_sku。
|
||||
List<PendingSkuRegistration> pendingSkus = new ArrayList<>();
|
||||
if (request.getItems() != null) {
|
||||
for (JdIngestChunkRequest.JdIngestItemDto item : request.getItems()) {
|
||||
if (item == null || isBlank(item.getProductCode())) {
|
||||
@@ -122,6 +126,8 @@ public class JdResultIngestService {
|
||||
rows.add(buildRow(task, companyId, createRequest, item, summary, request.getBatchId(), scope));
|
||||
pendingImages.add(new PendingImageRegistration(item.getProductCode().trim(),
|
||||
toImageSpecs(item.getImages())));
|
||||
pendingSkus.add(new PendingSkuRegistration(item.getProductCode().trim(),
|
||||
toSkuSpecs(item.getDetail())));
|
||||
}
|
||||
}
|
||||
if (!rows.isEmpty()) {
|
||||
@@ -133,6 +139,11 @@ public class JdResultIngestService {
|
||||
imageCount += jdProductImageIngestService.registerTaskImages(taskId, companyId,
|
||||
pending.productCode(), pending.specs());
|
||||
}
|
||||
// V198 详情面补齐:SKU 矩阵同样必须在商品行落库之后(要回查 biz_jd_product.id)。
|
||||
for (PendingSkuRegistration pending : pendingSkus) {
|
||||
skuCount += jdProductSkuIngestService.registerTaskSkus(taskId, companyId,
|
||||
pending.productCode(), pending.specs());
|
||||
}
|
||||
int itemsReceived = mergeScopeState(scope, request, request.getItems() == null ? 0 : request.getItems().size());
|
||||
if (Boolean.TRUE.equals(request.getIsEnd())) {
|
||||
finalizeSuccess(task, itemsReceived);
|
||||
@@ -142,6 +153,7 @@ public class JdResultIngestService {
|
||||
vo.setDeduped(deduped);
|
||||
vo.setUpserted(rows.size());
|
||||
vo.setImagesRegistered(imageCount);
|
||||
vo.setSkusRegistered(skuCount);
|
||||
return vo;
|
||||
}
|
||||
|
||||
@@ -285,6 +297,9 @@ public class JdResultIngestService {
|
||||
row.setShopName(shopName);
|
||||
row.setProductCode(item.getProductCode().trim());
|
||||
row.setSkuId(summary.getSkuId());
|
||||
row.setItemNum(summary.getItemNum());
|
||||
row.setSkuCount(summary.getSkuCount());
|
||||
row.setHealthScore(summary.getHealthScore());
|
||||
row.setTitle(summary.getTitle().trim());
|
||||
row.setBrand(summary.getBrand());
|
||||
row.setBrandId(summary.getBrandId());
|
||||
@@ -295,6 +310,7 @@ public class JdResultIngestService {
|
||||
row.setSaleStatus(summary.getSaleStatus());
|
||||
row.setListTab(firstNonBlank(summary.getListTab(), cursorTab(scope)));
|
||||
row.setJdCreatedAt(parseJdTime(summary.getJdCreatedAt()));
|
||||
row.setJdOnlineAt(parseJdTime(summary.getJdOnlineAt()));
|
||||
row.setJdUpdatedAt(parseJdTime(summary.getJdUpdatedAt()));
|
||||
row.setDetailUrl(summary.getDetailUrl());
|
||||
// detail 原样透传入 attr_json(AC-3 保真防丢键),不裁剪不转写;键数进 attr_count 供质量核查。
|
||||
@@ -410,4 +426,42 @@ public class JdResultIngestService {
|
||||
private record PendingImageRegistration(String productCode,
|
||||
List<JdProductImageIngestService.JdIngestImageSpec> specs) {
|
||||
}
|
||||
|
||||
/** 延后登记的 SKU 矩阵(V198 同形:商品行 upsert 之后才有 product_id)。 */
|
||||
private record PendingSkuRegistration(String productCode,
|
||||
List<JdProductSkuIngestService.JdIngestSkuSpec> specs) {
|
||||
}
|
||||
|
||||
/**
|
||||
* chunk 行 detail.skus → SKU 登记规格(缺 skus/形状不合返回空,不炸整批)。
|
||||
*
|
||||
* <p>SKU 缺失只影响详情抽屉里的矩阵,不影响列表字段落库——所以解析失败按行级留痕
|
||||
* (WARN + productCode),绝不因为一个商品的 skus 脏了就让整批回传 500。</p>
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
private List<JdProductSkuIngestService.JdIngestSkuSpec> toSkuSpecs(Map<String, Object> detail) {
|
||||
if (detail == null || detail.isEmpty()) {
|
||||
return List.of();
|
||||
}
|
||||
Object raw = detail.get("skus");
|
||||
if (!(raw instanceof List<?> list) || list.isEmpty()) {
|
||||
return List.of();
|
||||
}
|
||||
List<JdProductSkuIngestService.JdIngestSkuSpec> specs = new ArrayList<>();
|
||||
int sortNo = 0;
|
||||
for (Object item : list) {
|
||||
if (!(item instanceof Map<?, ?>)) {
|
||||
continue;
|
||||
}
|
||||
try {
|
||||
specs.add(JdProductSkuIngestService.JdIngestSkuSpec.fromMap(
|
||||
(Map<String, Object>) item, sortNo));
|
||||
} catch (RuntimeException ex) {
|
||||
// 单行 SKU 形状不合法(price 非数字等)只跳过这一行,原文只进日志。
|
||||
log.warn("[{}] SKU 行形状不合法,跳过 sortNo={} err={}", LOG_TAG, sortNo, ex.getMessage());
|
||||
}
|
||||
sortNo++;
|
||||
}
|
||||
return specs;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -41,6 +41,8 @@ AIIMAGE_JD_COLLECT_PAGE_SIZE=50
|
||||
AIIMAGE_JD_COLLECT_DETAIL_CONCURRENCY=1
|
||||
AIIMAGE_JD_COLLECT_IMAGE_MAX_PER_PRODUCT=200
|
||||
AIIMAGE_JD_COLLECT_STALE_MINUTES=60
|
||||
# SKU 矩阵单商品上限(V198 详情面):真机一个商品 12 行,超限截断并 WARN。
|
||||
AIIMAGE_JD_SKU_MAX_PER_PRODUCT=200
|
||||
# 京东采集的客户端兜底拉取白名单(v1.4 P0-1):默认值已含 JD_SHOP_COLLECT(见 application.yml)。
|
||||
# ⚠ 只有真的要覆盖整个白名单时才设 AIIMAGE_CLIENT_TASK_PULL_MODULE_TYPES——env 变量存在即生效,
|
||||
# 设成空串会把白名单清空(兜底拉取对 JD 形同关闭)。打开 AIIMAGE_CLIENT_TASK_PULL_ENABLED
|
||||
|
||||
@@ -174,6 +174,9 @@ aiimage:
|
||||
detail-concurrency: ${AIIMAGE_JD_COLLECT_DETAIL_CONCURRENCY:1}
|
||||
image-max-per-product: ${AIIMAGE_JD_COLLECT_IMAGE_MAX_PER_PRODUCT:200}
|
||||
stale-minutes: ${AIIMAGE_JD_COLLECT_STALE_MINUTES:60}
|
||||
# SKU 矩阵单商品上限(V198 详情面):真机一个商品 12 行,超限截断并 WARN,
|
||||
# 防脏回传把整批撑爆。显式写在这里,不许只活在代码默认值里。
|
||||
sku-max-per-product: ${AIIMAGE_JD_SKU_MAX_PER_PRODUCT:200}
|
||||
# 设备日志对象存储:主机B 独立 MinIO(与业务 OSS 隔离,日志只保留 7 天)。
|
||||
# endpoint 未配置时日志上报/管理接口不可用(宁可失败也不静默落到业务桶)。
|
||||
# 桶的 7 天过期规则由运维用 mc 配置(与 retention-days 口径一致)。
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
-- 迁移 V197:京东商品补齐京麦后台列表列(v1.4 真机取证后补,2026-11-14)
|
||||
-- =============================================================
|
||||
-- 1. 变更目的:后管「京东数据库」列表要能对上京麦商品列表页的列。真机取证
|
||||
-- (docs/jd-collect-api-contract.md §2.3 E11)确认京麦行里这四列一直有值、而本表
|
||||
-- 此前没有落点,导致后管只能显示「标题/编码/价格/库存/状态」这半套,货号、信息分、
|
||||
-- SKU 数、上架时间全缺。
|
||||
--
|
||||
-- 2. 列口径(全部取自列表接口行,不是详情页):
|
||||
-- - item_num ← 行 `itemNum`(截图口径 956597306407)。**不是** sku_id
|
||||
-- (sku_id 是 10238877506570),两者别混:京麦后台「货号」列显示的是它。
|
||||
-- - sku_count ← 行 `productSkuInfoVO.skuCount`(截图口径 12个SKU)。
|
||||
-- - health_score ← 行 `healthScoreVO.score`(截图口径 信息分 81/84/90)。
|
||||
-- - jd_online_at ← 行 `onlineTime`(毫秒时间戳,客户端归一成 yyyy-MM-dd HH:mm:ss)。
|
||||
-- 上架时间 ≠ 创建时间:截图首行上架 2026-11-12 15:03:37、创建 2026-11-07 18:49:47。
|
||||
--
|
||||
-- 3. 可重跑性:逐列 information_schema 判存后才 ALTER(V195 同形),重跑逐条 no-op。
|
||||
-- 存量行三列整数默认 NULL、时间默认 NULL(历史行本就没有这些字段的采集,不回填不造数)。
|
||||
--
|
||||
-- 4. 验证 SQL:
|
||||
-- SHOW CREATE TABLE biz_jd_product;
|
||||
-- -> 期望多出 item_num / sku_count / health_score / jd_online_at 四列
|
||||
-- 应用侧:MigrationInventoryTest 自动覆盖新迁移;JdProductSyncServiceTest 断言四列落行。
|
||||
--
|
||||
-- 5. 回滚(人工补丁,写成注释以免落在 Flyway 扫描路径里被当迁移执行):
|
||||
-- ALTER TABLE biz_jd_product DROP COLUMN jd_online_at;
|
||||
-- ALTER TABLE biz_jd_product DROP COLUMN health_score;
|
||||
-- ALTER TABLE biz_jd_product DROP COLUMN sku_count;
|
||||
-- ALTER TABLE biz_jd_product DROP COLUMN item_num;
|
||||
-- DELETE FROM flyway_schema_history WHERE version='197';
|
||||
-- =============================================================
|
||||
|
||||
SET @v197_has_item_num := (
|
||||
SELECT COUNT(*) FROM information_schema.COLUMNS
|
||||
WHERE TABLE_SCHEMA = DATABASE()
|
||||
AND TABLE_NAME = 'biz_jd_product'
|
||||
AND COLUMN_NAME = 'item_num'
|
||||
);
|
||||
SET @v197_item_num_ddl := IF(
|
||||
@v197_has_item_num = 0,
|
||||
'ALTER TABLE biz_jd_product ADD COLUMN item_num VARCHAR(64) NULL COMMENT ''货号(京麦列表行 itemNum,与 sku_id 不同)'' AFTER sku_id',
|
||||
'SELECT 1'
|
||||
);
|
||||
PREPARE v197_stmt FROM @v197_item_num_ddl;
|
||||
EXECUTE v197_stmt;
|
||||
DEALLOCATE PREPARE v197_stmt;
|
||||
|
||||
SET @v197_has_sku_count := (
|
||||
SELECT COUNT(*) FROM information_schema.COLUMNS
|
||||
WHERE TABLE_SCHEMA = DATABASE()
|
||||
AND TABLE_NAME = 'biz_jd_product'
|
||||
AND COLUMN_NAME = 'sku_count'
|
||||
);
|
||||
SET @v197_sku_count_ddl := IF(
|
||||
@v197_has_sku_count = 0,
|
||||
'ALTER TABLE biz_jd_product ADD COLUMN sku_count INT NULL COMMENT ''SKU 数(京麦列表行 productSkuInfoVO.skuCount)'' AFTER item_num',
|
||||
'SELECT 1'
|
||||
);
|
||||
PREPARE v197_stmt FROM @v197_sku_count_ddl;
|
||||
EXECUTE v197_stmt;
|
||||
DEALLOCATE PREPARE v197_stmt;
|
||||
|
||||
SET @v197_has_health_score := (
|
||||
SELECT COUNT(*) FROM information_schema.COLUMNS
|
||||
WHERE TABLE_SCHEMA = DATABASE()
|
||||
AND TABLE_NAME = 'biz_jd_product'
|
||||
AND COLUMN_NAME = 'health_score'
|
||||
);
|
||||
SET @v197_health_score_ddl := IF(
|
||||
@v197_has_health_score = 0,
|
||||
'ALTER TABLE biz_jd_product ADD COLUMN health_score INT NULL COMMENT ''信息分(京麦列表行 healthScoreVO.score)'' AFTER sku_count',
|
||||
'SELECT 1'
|
||||
);
|
||||
PREPARE v197_stmt FROM @v197_health_score_ddl;
|
||||
EXECUTE v197_stmt;
|
||||
DEALLOCATE PREPARE v197_stmt;
|
||||
|
||||
SET @v197_has_jd_online_at := (
|
||||
SELECT COUNT(*) FROM information_schema.COLUMNS
|
||||
WHERE TABLE_SCHEMA = DATABASE()
|
||||
AND TABLE_NAME = 'biz_jd_product'
|
||||
AND COLUMN_NAME = 'jd_online_at'
|
||||
);
|
||||
SET @v197_jd_online_at_ddl := IF(
|
||||
@v197_has_jd_online_at = 0,
|
||||
'ALTER TABLE biz_jd_product ADD COLUMN jd_online_at DATETIME NULL COMMENT ''京东上架时间(京麦列表行 onlineTime;与创建时间不是同一个值)'' AFTER jd_created_at',
|
||||
'SELECT 1'
|
||||
);
|
||||
PREPARE v197_stmt FROM @v197_jd_online_at_ddl;
|
||||
EXECUTE v197_stmt;
|
||||
DEALLOCATE PREPARE v197_stmt;
|
||||
@@ -0,0 +1,48 @@
|
||||
-- 迁移 V198:京东商品 SKU 表(v1.4 详情面补齐,2026-11-14 真机取证后新增)
|
||||
-- =============================================================
|
||||
-- 1. 为什么新增(用户口径「后台的数据库要和京麦对上,包括详情里」):
|
||||
-- 京麦商品详情页「销售属性」区是一个 SKU 矩阵(真机样本 12 行 = 颜色 3 × 尺码 4):
|
||||
-- 每行有自己的 skuId / 价格 / 库存 / 销售属性组合。此前只有商品主表上的 sku_id
|
||||
-- (主 SKU)与 sku_count(个数),详情抽屉里看不到这张矩阵;attr_json 是属性三元组,
|
||||
-- 塞 SKU 行会污染「属性保真」这一列的语义。
|
||||
--
|
||||
-- 2. 形状口径:
|
||||
-- - uk_product_sku(product_id, sku_id):二次采集按 INSERT ... ON DUPLICATE KEY UPDATE
|
||||
-- upsert(JdProductSkuMapper.upsertBatch),行数不增、synced_at 刷新。
|
||||
-- - product_id 指 biz_jd_product.id(不是京麦 productId):与 V194 图片表同一口径,
|
||||
-- 商品行按 uk_company_shop_code upsert 后再按 (company_id, task_id, product_code)
|
||||
-- 回查拿 id(同 JdProductImageIngestService.registerTaskImages)。
|
||||
-- - sale_attrs_json 存该 SKU 的销售属性组合([{"name":"颜色","value":"上衣"},…]):
|
||||
-- 京麦把它当展示维度而不是「商品属性」,所以不并进 attr_json。
|
||||
-- - price DECIMAL(12,2) 与主表 price_min/price_max 同精度;stock 与主表 stock_total
|
||||
-- 同类型;两者都可空(京麦对部分 SKU 回 null)。
|
||||
--
|
||||
-- 3. 可重跑性:CREATE TABLE IF NOT EXISTS——中途失败重跑整条 no-op(V193/V194 先例)。
|
||||
--
|
||||
-- 4. 验证 SQL(迁移后跑,不许只看启动日志的 Successfully applied):
|
||||
-- SHOW CREATE TABLE biz_jd_product_sku;
|
||||
-- -> 期望含 uk_product_sku(product_id,sku_id)、idx_product、idx_company 三键
|
||||
-- 应用侧:MigrationInventoryTest 自动覆盖新迁移;JdProductSkuIngestService 用例落行。
|
||||
--
|
||||
-- 5. 回滚(patch,不当期执行):
|
||||
-- DROP TABLE biz_jd_product_sku;
|
||||
-- DELETE FROM flyway_schema_history WHERE version='198';
|
||||
-- =============================================================
|
||||
|
||||
CREATE TABLE IF NOT EXISTS biz_jd_product_sku (
|
||||
`id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键',
|
||||
`product_id` BIGINT NOT NULL COMMENT '商品行 id(biz_jd_product.id,不是京麦 productId)',
|
||||
`company_id` BIGINT NOT NULL COMMENT '物化归属分公司(与商品行一致,同步时显式落值)',
|
||||
`sku_id` VARCHAR(64) NOT NULL COMMENT '京麦 SKU id(真机样本 10238877506570)',
|
||||
`sku_name` VARCHAR(600) NULL COMMENT 'SKU 名(京麦 skuName,含销售属性后缀)',
|
||||
`sku_seq` VARCHAR(64) NULL COMMENT '京麦 skuSeq(商家自定义序号)',
|
||||
`price` DECIMAL(12,2) NULL COMMENT 'SKU 京东价(京麦 jdPrice)',
|
||||
`stock` INT NULL COMMENT 'SKU 库存(京麦 stockNum)',
|
||||
`sale_attrs_json` VARCHAR(1000) NULL COMMENT '销售属性组合 JSON([{"name":"颜色","value":"上衣"}])',
|
||||
`sort_no` INT NOT NULL DEFAULT 0 COMMENT '同商品内排序(详情抽屉 SKU 矩阵顺序)',
|
||||
`synced_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '同步时刻(upsert 刷新)',
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `uk_product_sku` (`product_id`, `sku_id`),
|
||||
KEY `idx_product` (`product_id`, `sort_no`),
|
||||
KEY `idx_company` (`company_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='京东商品 SKU 矩阵(详情页销售属性区,后管详情抽屉数据源)';
|
||||
@@ -19,16 +19,17 @@
|
||||
是 P2 死列(BACKLOG B98-01)不随更新。 -->
|
||||
<insert id="upsertBatch">
|
||||
INSERT INTO biz_jd_product
|
||||
(company_id, user_id, task_id, shop_id, shop_name, product_code, sku_id,
|
||||
title, brand, brand_id, category_path, price_min, price_max, stock_total,
|
||||
sale_status, list_tab, jd_created_at, jd_updated_at,
|
||||
(company_id, user_id, task_id, shop_id, shop_name, product_code, sku_id, item_num, sku_count,
|
||||
health_score, title, brand, brand_id, category_path, price_min, price_max, stock_total,
|
||||
sale_status, list_tab, jd_created_at, jd_online_at, jd_updated_at,
|
||||
main_image_url, detail_url, attr_json, attr_count, image_count, collect_batch_id)
|
||||
VALUES
|
||||
<foreach collection="rows" item="row" separator=",">
|
||||
(#{row.companyId}, #{row.userId}, #{row.taskId}, #{row.shopId}, #{row.shopName},
|
||||
#{row.productCode}, #{row.skuId}, #{row.title}, #{row.brand}, #{row.brandId},
|
||||
#{row.productCode}, #{row.skuId}, #{row.itemNum}, #{row.skuCount},
|
||||
#{row.healthScore}, #{row.title}, #{row.brand}, #{row.brandId},
|
||||
#{row.categoryPath}, #{row.priceMin}, #{row.priceMax}, #{row.stockTotal},
|
||||
#{row.saleStatus}, #{row.listTab}, #{row.jdCreatedAt}, #{row.jdUpdatedAt},
|
||||
#{row.saleStatus}, #{row.listTab}, #{row.jdCreatedAt}, #{row.jdOnlineAt}, #{row.jdUpdatedAt},
|
||||
#{row.mainImageUrl}, #{row.detailUrl}, #{row.attrJson}, #{row.attrCount},
|
||||
#{row.imageCount}, #{row.collectBatchId})
|
||||
</foreach>
|
||||
@@ -37,6 +38,9 @@
|
||||
task_id = VALUES(task_id),
|
||||
shop_name = VALUES(shop_name),
|
||||
sku_id = VALUES(sku_id),
|
||||
item_num = VALUES(item_num),
|
||||
sku_count = VALUES(sku_count),
|
||||
health_score = VALUES(health_score),
|
||||
title = VALUES(title),
|
||||
brand = VALUES(brand),
|
||||
brand_id = VALUES(brand_id),
|
||||
@@ -47,6 +51,7 @@
|
||||
sale_status = VALUES(sale_status),
|
||||
list_tab = VALUES(list_tab),
|
||||
jd_created_at = VALUES(jd_created_at),
|
||||
jd_online_at = VALUES(jd_online_at),
|
||||
jd_updated_at = VALUES(jd_updated_at),
|
||||
detail_url = VALUES(detail_url),
|
||||
attr_json = VALUES(attr_json),
|
||||
@@ -80,8 +85,10 @@
|
||||
group_name 不在此联表:读侧按行集 group_id 批量取分组名补齐(一次查询,无逐行查询)。 -->
|
||||
<select id="selectProductPage" resultType="com.nanri.aiimage.modules.jd.model.entity.JdProductEntity">
|
||||
SELECT p.id, p.company_id, p.user_id, p.task_id, p.shop_id, p.shop_name, p.product_code, p.sku_id,
|
||||
p.item_num, p.sku_count, p.health_score,
|
||||
p.title, p.brand, p.brand_id, p.category_path, p.price_min, p.price_max, p.stock_total,
|
||||
p.sale_status, p.list_tab, p.jd_created_at, p.jd_updated_at, p.main_image_url, p.detail_url,
|
||||
p.sale_status, p.list_tab, p.jd_created_at, p.jd_online_at, p.jd_updated_at,
|
||||
p.main_image_url, p.detail_url,
|
||||
p.attr_json, p.attr_count, p.image_count, p.group_id, p.collect_batch_id, p.synced_at
|
||||
FROM biz_jd_product p
|
||||
WHERE 1=1 <include refid="productConds"/>
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.nanri.aiimage.modules.jd.mapper.JdProductSkuMapper">
|
||||
<!-- 京东商品 SKU 矩阵(V198,v1.4 详情面)。SQL 全部落 XML(铁律 1)。
|
||||
|
||||
唯一键 uk_product_sku(product_id, sku_id):二次采集按冲突键 upsert,行数不增,
|
||||
synced_at 随最近一次采集刷新。写入前调用方已按 (company_id, task_id, product_code)
|
||||
回查到 biz_jd_product.id,并把 SKU 数钳到上限(防脏包一次写爆)。 -->
|
||||
<insert id="upsertBatch">
|
||||
INSERT INTO biz_jd_product_sku
|
||||
(product_id, company_id, sku_id, sku_name, sku_seq, price, stock, sale_attrs_json, sort_no)
|
||||
VALUES
|
||||
<foreach collection="rows" item="row" separator=",">
|
||||
(#{row.productId}, #{row.companyId}, #{row.skuId}, #{row.skuName}, #{row.skuSeq},
|
||||
#{row.price}, #{row.stock}, #{row.saleAttrsJson}, #{row.sortNo})
|
||||
</foreach>
|
||||
ON DUPLICATE KEY UPDATE
|
||||
company_id = VALUES(company_id),
|
||||
sku_name = VALUES(sku_name),
|
||||
sku_seq = VALUES(sku_seq),
|
||||
price = VALUES(price),
|
||||
stock = VALUES(stock),
|
||||
sale_attrs_json = VALUES(sale_attrs_json),
|
||||
sort_no = VALUES(sort_no),
|
||||
synced_at = CURRENT_TIMESTAMP
|
||||
</insert>
|
||||
</mapper>
|
||||
+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