feat(jd): 列表列对齐+主图投影+SKU 矩阵+删除链收口(B101/B102 服务端与后管)
This commit is contained in:
@@ -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>
|
||||
Reference in New Issue
Block a user