From 84a4bc38b5e9c6d75fa7a92843f8e45ea22fb3c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Sun, 15 Nov 2026 19:03:40 +0800 Subject: [PATCH] =?UTF-8?q?feat(jd):=20=E4=BA=AC=E4=B8=9C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=B4=A7=E5=8F=B7=E7=B3=BB=E7=BB=9F=E7=94=9F?= =?UTF-8?q?=E6=88=90=E2=80=94=E2=80=94=E8=A1=8C=E5=8F=B7=E5=8D=B3=E8=B4=A7?= =?UTF-8?q?=E5=8F=B7=EF=BC=882026-11-15=20=E7=94=A8=E6=88=B7=E5=8F=A3?= =?UTF-8?q?=E5=BE=84=E3=80=8C=E7=B3=BB=E7=BB=9F=E8=87=AA=E8=A1=8C=E7=94=9F?= =?UTF-8?q?=E6=88=90=E8=B4=A7=E5=8F=B7=EF=BC=8C=E4=B8=8D=E7=94=A8=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=E7=9A=84=E8=B4=A7=E5=8F=B7=EF=BC=9B=E4=BB=8E=201=20?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E9=80=92=E5=A2=9E=E6=88=96=E9=9A=8F=E6=9C=BA?= =?UTF-8?q?=E6=95=B0=EF=BC=88=E5=94=AF=E4=B8=80=EF=BC=89=E3=80=8D=EF=BC=89?= =?UTF-8?q?=EF=BC=9A=E6=96=B0=E8=90=BD=E5=BA=93=E8=A1=8C=20item=5Fnum=20?= =?UTF-8?q?=E5=9C=A8=E5=9B=9E=E4=BC=A0=E8=90=BD=E5=BA=93=E5=90=8E=E7=94=B1?= =?UTF-8?q?=20reassignItemNums=20=E5=88=B7=E6=88=90=E8=A1=8C=E5=8F=B7?= =?UTF-8?q?=EF=BC=88CONVERT(id,=20CHAR)=E2=80=94=E2=80=94=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E5=94=AF=E4=B8=80=E3=80=81=E4=BB=8E=201=20=E9=80=92?= =?UTF-8?q?=E5=A2=9E=E3=80=81=E8=A1=8C=E4=B8=8D=E5=8F=98=E8=B4=A7=E5=8F=B7?= =?UTF-8?q?=E5=B0=B1=E4=B8=8D=E5=8F=98=EF=BC=8C=E9=9B=B6=E5=B9=B6=E5=8F=91?= =?UTF-8?q?=E7=AB=9E=E4=BA=89=EF=BC=89=EF=BC=9BupsertBatch=20=E7=9A=84=20U?= =?UTF-8?q?PDATE=20=E6=AE=B5=E6=91=98=E6=8E=89=20item=5Fnum=20=E8=A6=86?= =?UTF-8?q?=E7=9B=96=EF=BC=88=E9=87=8D=E7=88=AC=E5=91=BD=E4=B8=AD=E5=B7=B2?= =?UTF-8?q?=E6=9C=89=E8=A1=8C=E4=B8=8D=E5=BE=97=E6=8A=8A=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E8=B4=A7=E5=8F=B7=E5=88=B7=E5=9B=9E=E4=BA=AC=E4=B8=9C=E5=8E=9F?= =?UTF-8?q?=E5=80=BC=EF=BC=8C=E7=BB=8A=E7=BA=BF=E9=92=89=E4=BD=8F=EF=BC=89?= =?UTF-8?q?=EF=BC=9B=E9=94=81=E5=AE=9A=E8=A1=8C=EF=BC=88manual=5Flocked=3D?= =?UTF-8?q?1=EF=BC=89=E4=B8=8D=E5=88=B7=E2=80=94=E2=80=94=E4=BA=BA?= =?UTF-8?q?=E5=B7=A5=E7=BC=96=E8=BE=91=E8=BF=87=E7=9A=84=E8=B4=A7=E5=8F=B7?= =?UTF-8?q?=E4=BC=98=E5=85=88=EF=BC=9B=E4=BA=AC=E4=B8=9C=E5=8E=9F=E8=B4=A7?= =?UTF-8?q?=E5=8F=B7=E4=BB=8D=E5=9C=A8=20attr=5Fjson=20=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E5=8C=BA=E7=95=99=E6=A1=A3=E6=BA=AF=E6=BA=90=E3=80=82=E5=AD=98?= =?UTF-8?q?=E9=87=8F=E8=A1=8C=E9=9A=8F=E4=B8=8B=E4=B8=80=E6=AC=A1=E5=90=8C?= =?UTF-8?q?=E5=BA=97=E9=93=BA=E9=87=8D=E7=88=AC=E5=88=B7=E6=88=90=E8=A1=8C?= =?UTF-8?q?=E5=8F=B7=EF=BC=88item=5Fnum=20!=3D=20id=20=E5=91=BD=E4=B8=AD?= =?UTF-8?q?=EF=BC=89=EF=BC=9B=E5=A6=82=E9=9C=80=E7=AB=8B=E5=8D=B3=E7=94=9F?= =?UTF-8?q?=E6=95=88=E5=8F=AF=E5=AF=B9=E5=AD=98=E9=87=8F=E8=B7=91=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E5=90=8C=E6=AC=BE=20UPDATE=EF=BC=88=E5=8F=91=E7=89=88?= =?UTF-8?q?=E7=AA=97=E5=8F=A3=E5=86=B3=E5=AE=9A=EF=BC=89=E3=80=82=E5=88=A4?= =?UTF-8?q?=E6=8D=AE=EF=BC=9ASyncServiceTest=20+3=EF=BC=88=E8=90=BD?= =?UTF-8?q?=E5=BA=93=E5=90=8E=E5=88=B7=E5=86=99=E8=A2=AB=E8=B0=83/?= =?UTF-8?q?=E6=95=B4=E6=89=B9=E8=A2=AB=E4=BF=9D=E6=8A=A4=E4=B8=8D=E5=88=B7?= =?UTF-8?q?/UPDATE=20=E6=AE=B5=E4=B8=8D=E8=A6=86=E7=9B=96+=E5=88=B7?= =?UTF-8?q?=E5=86=99=E6=8E=92=E9=99=A4=E9=94=81=E5=AE=9A=E8=A1=8C=E7=9A=84?= =?UTF-8?q?=20XML=20=E7=BB=8A=E7=BA=BF=EF=BC=89=EF=BC=9BSqlLayeringConvent?= =?UTF-8?q?ionTest=20=E8=B4=A6=E6=9C=AC=20162=E2=86=92163=20=E9=80=90?= =?UTF-8?q?=E7=AC=94=E8=AE=B0=E5=90=8D=E3=80=82=E5=90=8C=E7=AC=94=E4=BF=AE?= =?UTF-8?q?=E5=AD=98=E9=87=8F=E7=BA=A2=EF=BC=9ACompanyIdParamGoesThroughRe?= =?UTF-8?q?adScopeTest=20=E7=9A=84=20ProductCategory=20=E5=AD=90=E4=B8=B2?= =?UTF-8?q?=E9=94=9A=E5=89=A5=E9=99=A4=20JdProductCategoryVo=20=E5=AD=97?= =?UTF-8?q?=E6=A0=B7=EF=BC=88=E4=BA=AC=E4=B8=9C=E5=95=86=E5=93=81=E5=BA=93?= =?UTF-8?q?=E8=87=AA=E5=B7=B1=E7=9A=84=E7=B1=BB=E7=9B=AE=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=20VO=20=E4=B8=8E=E5=85=A8=E5=B9=B3=E5=8F=B0=E5=85=B1=E4=BA=AB?= =?UTF-8?q?=E8=A1=A8=E6=97=A0=E5=85=B3=EF=BC=8C=E5=AD=90=E4=B8=B2=E6=92=9E?= =?UTF-8?q?=E8=BD=A6=E6=8A=8A=E6=95=B4=E4=B8=AA=20AdminJdProductController?= =?UTF-8?q?=20=E8=AF=AF=E6=8B=96=E8=BF=9B=E6=B6=88=E8=B4=B9=E8=80=85?= =?UTF-8?q?=E6=B8=85=E5=8D=95=EF=BC=9B=E5=89=A5=E5=AD=97=E6=A0=B7=E9=9D=9E?= =?UTF-8?q?=E6=95=B4=E8=A1=8C=E6=8E=92=E9=99=A4=E2=80=94=E2=80=94=E5=90=8C?= =?UTF-8?q?=E8=A1=8C=E7=9C=9F=E5=BC=95=E7=94=A8=20ProductCategoryEntity=20?= =?UTF-8?q?=E7=85=A7=E6=A0=B7=E5=91=BD=E4=B8=AD=EF=BC=8C=E6=8A=A4=E6=A0=8F?= =?UTF-8?q?=E6=84=8F=E5=9B=BE=E4=B8=8D=E5=89=8A=E5=BC=B1=EF=BC=89=E3=80=82?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=95=B4=E9=87=8F=205,610=20=E4=BE=8B=200=20?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=85=A8=E7=BB=BF=EF=BC=9B=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=8A=BD=E5=B1=89=E8=B4=A7=E5=8F=B7=20label=20=E6=B3=A8?= =?UTF-8?q?=E6=98=8E=E3=80=8C=E7=B3=BB=E7=BB=9F=E7=94=9F=E6=88=90=EF=BC=9D?= =?UTF-8?q?=E8=A1=8C=E5=8F=B7=EF=BC=8C=E5=8F=AF=E6=94=B9=E3=80=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/jd/JdProductEditDrawer.vue | 2 +- .../modules/jd/mapper/JdProductMapper.java | 8 ++++ .../jd/service/JdResultIngestService.java | 4 ++ .../resources/mapper/jd/JdProductMapper.xml | 19 +++++++- .../aiimage/SqlLayeringConventionTest.java | 6 ++- ...ompanyIdParamGoesThroughReadScopeTest.java | 16 ++++++- .../jd/service/JdProductSyncServiceTest.java | 48 ++++++++++++++++++- 7 files changed, 97 insertions(+), 6 deletions(-) diff --git a/admin-frontend-vue/src/pages/jd/JdProductEditDrawer.vue b/admin-frontend-vue/src/pages/jd/JdProductEditDrawer.vue index a02710941..ba6fff59b 100644 --- a/admin-frontend-vue/src/pages/jd/JdProductEditDrawer.vue +++ b/admin-frontend-vue/src/pages/jd/JdProductEditDrawer.vue @@ -244,7 +244,7 @@ function dash(value: string | number | null | undefined): string {
- +
diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/mapper/JdProductMapper.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/mapper/JdProductMapper.java index d3a2a86c4..4e032456f 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/mapper/JdProductMapper.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/mapper/JdProductMapper.java @@ -32,6 +32,14 @@ public interface JdProductMapper extends BaseMapper { */ int upsertBatch(@Param("rows") List rows); + /** + * 货号系统生成(2026-11-15 用户口径「系统自行生成货号,不用之前的货号」): + * 本任务落库的行 {@code item_num = 行号}(全局唯一、从 1 递增;行不变货号不变, + * 重爬命中已有行时货号稳定)。幂等:已等于行号的行不重复写;{@code manual_locked=1} + * 的行不动(人工编辑过的人工值优先)。京东原货号只在 attr_json 属性区留档。 + */ + int reassignItemNums(@Param("companyId") Long companyId, @Param("taskId") Long taskId); + /** * 后管只读页总数(Phase 5,v1.4):与 {@link #selectProductPage} 同一过滤面 * (公司/店铺名/商品编码/标题关键词/类目/分组/同步起止,全部 SQL 侧下推, diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdResultIngestService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdResultIngestService.java index f56ff3507..9f497a4cf 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdResultIngestService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdResultIngestService.java @@ -145,6 +145,10 @@ public class JdResultIngestService { int protectedSkipped = filterProtectedRows(companyId, rows, pendingImages, pendingSkus); if (!rows.isEmpty()) { jdProductMapper.upsertBatch(rows); + // 货号系统生成(2026-11-15 用户口径「系统自行生成货号,不用之前的货号」): + // 行号即货号,落库后按本任务刷一次(幂等——已等于行号的行不重复写; + // 锁定行不动)。重爬命中已有行时 UPDATE 段不覆盖 item_num,货号保持稳定。 + jdProductMapper.reassignItemNums(companyId, taskId); } else { log.info("[{}] 整批行都被人工编辑锁/删除忽略保护,本次不落库 taskId={} skipped={}", LOG_TAG, taskId, protectedSkipped); diff --git a/backend-java/src/main/resources/mapper/jd/JdProductMapper.xml b/backend-java/src/main/resources/mapper/jd/JdProductMapper.xml index d921c81b7..453fa9b33 100644 --- a/backend-java/src/main/resources/mapper/jd/JdProductMapper.xml +++ b/backend-java/src/main/resources/mapper/jd/JdProductMapper.xml @@ -38,7 +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), @@ -60,6 +62,21 @@ synced_at = CURRENT_TIMESTAMP + + + UPDATE biz_jd_product + SET item_num = CONVERT(id, CHAR) + WHERE company_id = #{companyId} + AND task_id = #{taskId} + AND manual_locked = 0 + AND (item_num IS NULL OR item_num = '' OR item_num != CONVERT(id, CHAR)) + +