diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlTaskService.java index c991d6fc..51935c35 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlTaskService.java @@ -2132,6 +2132,7 @@ public class ShopDataCrawlTaskService { LocalDateTime now = dailyFileService.currentBusinessDateTime(); if (dailyFile == null) { dailyFile = new ShopDataCrawlDailyFileEntity(); + dailyFile.setUserId(row.getUserId()); dailyFile.setShopKeyHash(shopKeyHash); dailyFile.setShopKey(shopKey); dailyFile.setBusinessDate(businessDate); diff --git a/backend-java/src/main/resources/db/V104__shop_data_crawl_daily_file_user_id_nullable.sql b/backend-java/src/main/resources/db/V104__shop_data_crawl_daily_file_user_id_nullable.sql new file mode 100644 index 00000000..225050af --- /dev/null +++ b/backend-java/src/main/resources/db/V104__shop_data_crawl_daily_file_user_id_nullable.sql @@ -0,0 +1,11 @@ +-- V104: 店铺数据抓取累计文件 user_id 改可空 +-- 背景:V95(97ae8a7)累计文件改为店铺级共享,persistDailyAggregation 已不再 +-- 写入 user_id(去 user 维度),但 V95 只改了唯一键,未把 user_id 列改可空。 +-- 新店铺首次插入 biz_shop_data_crawl_daily_file 时 MyBatis-Plus 对 null 的 +-- user_id 跳过该列 → INSERT 不含 user_id → 生产 MySQL 报 +-- "Field 'user_id' doesn't have a default value"(任务 26401 复现)。 +-- 已有 daily_file 行的店铺走 update 分支不受影响,因此该 bug 只出现在新店铺。 +-- 存量行(25 行)的 user_id 已是旧账号值,保留不动;唯一键 (shop_key,business_date) +-- 不含 user_id,可空不影响去重。 +ALTER TABLE biz_shop_data_crawl_daily_file + MODIFY COLUMN `user_id` BIGINT NULL DEFAULT NULL COMMENT '(V95 起不再使用,保留兼容)'; diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlDailyFileIncrementalTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlDailyFileIncrementalTest.java index a7fb149c..8ba765d4 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlDailyFileIncrementalTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlDailyFileIncrementalTest.java @@ -554,6 +554,10 @@ class ShopDataCrawlDailyFileIncrementalTest { assertEquals(1, dbDailyFiles.size(), "跨账号同店同日只保留一份累计文件"); assertEquals(3, dbMembers.size(), "三个结果各有一个成员行"); + // 回归:V95 把累计文件改为店铺级共享时误删了 setUserId,导致新建 + // daily_file 的 INSERT 不含 user_id(表列 NOT NULL 无默认值), + // 新店铺首次归档必报 Field 'user_id' doesn't have a default value。 + assertEquals(7L, dbDailyFiles.get(0).getUserId(), "新建累计文件必须写入 user_id"); // 整表重建:英国以最后一次(9503)为准,德国(9502)保留 triggerRebuild();