From 38d6a0a04b93672d7e5cc2842a81a9a4614a5010 Mon Sep 17 00:00:00 2001 From: chengma Date: Tue, 11 Aug 2026 11:18:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B1=95=E7=A4=BA=E8=9D=A6=E7=9A=AE?= =?UTF-8?q?=E4=B8=BB=E5=9B=BE=E5=92=8C=E5=BA=97=E9=93=BA=20(#142)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/handler/integration/auth_test.go | 2 +- admin/handler/integration/catalog_api.go | 2 +- admin/main_test.go | 25 +++++ admin/model/catalog_import.go | 60 ++++++----- admin/model/model.go | 24 +++-- admin/repository/catalog_import.go | 77 ++++++++++---- admin/repository/catalog_import_test.go | 2 +- admin/repository/mysql_db.go | 100 +++++++++++++++++- admin/repository/mysql_db_integration_test.go | 48 +++++++++ admin/repository/shopee.go | 30 ++++-- admin/service/catalog_import.go | 85 ++++++++++++--- admin/service/catalog_import_test.go | 98 ++++++++++++++++- admin/service/shopee_list.go | 46 ++++++-- admin/static/css/app.css | 3 + admin/static/js/app.js | 14 +++ admin/templates/catalog/detail_modal.html | 2 +- admin/templates/catalog/list.html | 4 +- admin/templates/shopee/detail_modal.html | 4 + admin/templates/shopee/list.html | 8 +- docs/admin/03-data-model.md | 6 ++ docs/admin/05-ui-specification.md | 6 ++ docs/admin/10-商品目录接入接口.md | 10 +- 22 files changed, 555 insertions(+), 101 deletions(-) diff --git a/admin/handler/integration/auth_test.go b/admin/handler/integration/auth_test.go index 131a86e..03f720d 100644 --- a/admin/handler/integration/auth_test.go +++ b/admin/handler/integration/auth_test.go @@ -57,7 +57,7 @@ func TestCatalogBatchAPI_按批次查询摘要(t *testing.T) { t.Fatal(err) } defer db.Close() - _, err = db.Exec(`CREATE TABLE catalog_import_runs(source TEXT,batch_id TEXT,request_hash TEXT,status TEXT,request_count INTEGER,conflict_count INTEGER,observed_at TEXT,update_policy TEXT DEFAULT 'fill_missing',last_request_at TEXT,last_conflict_at TEXT,shopee_created INTEGER DEFAULT 0,shopee_updated INTEGER DEFAULT 0,sku_created INTEGER DEFAULT 0,sku_updated INTEGER DEFAULT 0,sku_filled INTEGER DEFAULT 0,sku_same_source_updated INTEGER DEFAULT 0,sku_skipped INTEGER DEFAULT 0,sku_manual_skipped INTEGER DEFAULT 0,sku_stale_skipped INTEGER DEFAULT 0,pdd_created INTEGER DEFAULT 0,pdd_updated INTEGER DEFAULT 0,association_created INTEGER DEFAULT 0,association_unchanged INTEGER DEFAULT 0,failure_count INTEGER DEFAULT 0,error_summary TEXT,response_body TEXT,created_at TEXT,finished_at TEXT,PRIMARY KEY(source,batch_id))`) + _, err = db.Exec(`CREATE TABLE catalog_import_runs(source TEXT,batch_id TEXT,request_hash TEXT,status TEXT,request_count INTEGER,conflict_count INTEGER,observed_at TEXT,update_policy TEXT DEFAULT 'fill_missing',last_request_at TEXT,last_conflict_at TEXT,shopee_created INTEGER DEFAULT 0,shopee_updated INTEGER DEFAULT 0,shopee_fields_filled INTEGER DEFAULT 0,shopee_fields_same_source_updated INTEGER DEFAULT 0,shopee_fields_manual_skipped INTEGER DEFAULT 0,shopee_fields_stale_skipped INTEGER DEFAULT 0,sku_created INTEGER DEFAULT 0,sku_updated INTEGER DEFAULT 0,sku_filled INTEGER DEFAULT 0,sku_same_source_updated INTEGER DEFAULT 0,sku_skipped INTEGER DEFAULT 0,sku_manual_skipped INTEGER DEFAULT 0,sku_stale_skipped INTEGER DEFAULT 0,pdd_created INTEGER DEFAULT 0,pdd_updated INTEGER DEFAULT 0,association_created INTEGER DEFAULT 0,association_unchanged INTEGER DEFAULT 0,failure_count INTEGER DEFAULT 0,error_summary TEXT,response_body TEXT,created_at TEXT,finished_at TEXT,PRIMARY KEY(source,batch_id))`) if err != nil { t.Fatal(err) } diff --git a/admin/handler/integration/catalog_api.go b/admin/handler/integration/catalog_api.go index d5726c3..e364c50 100644 --- a/admin/handler/integration/catalog_api.go +++ b/admin/handler/integration/catalog_api.go @@ -37,7 +37,7 @@ func (h *Handler) GetBatch(c *gin.Context) { integrationError(c, 500, "INTERNAL_ERROR", "查询批次失败", true, nil) return } - c.JSON(200, gin.H{"source": run.Source, "batch_id": run.BatchID, "update_policy": run.UpdatePolicy, "status": run.Status, "request_count": run.RequestCount, "conflict_count": run.ConflictCount, "observed_at": run.ObservedAt, "created_at": run.CreatedAt, "finished_at": run.FinishedAt, "counts": gin.H{"shopee_created": run.ShopeeCreated, "shopee_updated": run.ShopeeUpdated, "sku_created": run.SKUCreated, "sku_updated": run.SKUUpdated, "sku_filled": run.SKUFilled, "sku_same_source_updated": run.SKUSameSourceUpdated, "sku_skipped": run.SKUSkipped, "sku_manual_skipped": run.SKUManualSkipped, "sku_stale_skipped": run.SKUStaleSkipped, "pdd_created": run.PddCreated, "pdd_updated": run.PddUpdated, "association_created": run.AssociationCreated, "association_unchanged": run.AssociationUnchanged}, "failure_count": run.FailureCount, "error_summary": run.ErrorSummary}) + c.JSON(200, gin.H{"source": run.Source, "batch_id": run.BatchID, "update_policy": run.UpdatePolicy, "status": run.Status, "request_count": run.RequestCount, "conflict_count": run.ConflictCount, "observed_at": run.ObservedAt, "created_at": run.CreatedAt, "finished_at": run.FinishedAt, "counts": gin.H{"shopee_created": run.ShopeeCreated, "shopee_updated": run.ShopeeUpdated, "shopee_fields_filled": run.ShopeeFieldsFilled, "shopee_fields_same_source_updated": run.ShopeeFieldsSameSourceUpdated, "shopee_fields_manual_skipped": run.ShopeeFieldsManualSkipped, "shopee_fields_stale_skipped": run.ShopeeFieldsStaleSkipped, "sku_created": run.SKUCreated, "sku_updated": run.SKUUpdated, "sku_filled": run.SKUFilled, "sku_same_source_updated": run.SKUSameSourceUpdated, "sku_skipped": run.SKUSkipped, "sku_manual_skipped": run.SKUManualSkipped, "sku_stale_skipped": run.SKUStaleSkipped, "pdd_created": run.PddCreated, "pdd_updated": run.PddUpdated, "association_created": run.AssociationCreated, "association_unchanged": run.AssociationUnchanged}, "failure_count": run.FailureCount, "error_summary": run.ErrorSummary}) } func (h *Handler) CreateBatch(c *gin.Context) { diff --git a/admin/main_test.go b/admin/main_test.go index 8493501..bdfa217 100644 --- a/admin/main_test.go +++ b/admin/main_test.go @@ -168,6 +168,31 @@ func TestCatalogHistory_展示更新策略和分级统计(t *testing.T) { } } +func TestShopeePage_展示主图店铺且保留标题宽度(t *testing.T) { + page, err := os.ReadFile("templates/shopee/list.html") + if err != nil { + t.Fatal(err) + } + detail, err := os.ReadFile("templates/shopee/detail_modal.html") + if err != nil { + t.Fatal(err) + } + css, err := os.ReadFile("static/css/app.css") + if err != nil { + t.Fatal(err) + } + js, err := os.ReadFile("static/js/app.js") + if err != nil { + t.Fatal(err) + } + content := string(page) + string(detail) + string(css) + string(js) + for _, want := range []string{"蝦皮店铺", "data-image-preview-url", "loading=\"lazy\"", "data-image-thumb-fallback", "ImageSourceText", "max-width: 18%", ".col-shop", "setupImageThumbnails"} { + if !strings.Contains(content, want) { + t.Errorf("蝦皮图片店铺界面缺少 %q", want) + } + } +} + func TestShopeeImportRoute_已移除(t *testing.T) { router, err := newRouter(nil) if err != nil { diff --git a/admin/model/catalog_import.go b/admin/model/catalog_import.go index 073e66b..dffacd2 100644 --- a/admin/model/catalog_import.go +++ b/admin/model/catalog_import.go @@ -11,32 +11,36 @@ const ( // CatalogImportRun 保存批次追踪信息，不保存 Token 或完整请求体。 type CatalogImportRun struct { - Source string - BatchID string - RequestHash string - Status CatalogImportStatus - RequestCount int - ConflictCount int - ObservedAt string - LastRequestAt string - LastConflictAt string - ShopeeCreated int - ShopeeUpdated int - SKUCreated int - SKUUpdated int - UpdatePolicy string - SKUFilled int - SKUSameSourceUpdated int - SKUSkipped int - SKUManualSkipped int - SKUStaleSkipped int - PddCreated int - PddUpdated int - AssociationCreated int - AssociationUnchanged int - FailureCount int - ErrorSummary string - ResponseBody string - CreatedAt string - FinishedAt string + Source string + BatchID string + RequestHash string + Status CatalogImportStatus + RequestCount int + ConflictCount int + ObservedAt string + LastRequestAt string + LastConflictAt string + ShopeeCreated int + ShopeeUpdated int + ShopeeFieldsFilled int + ShopeeFieldsSameSourceUpdated int + ShopeeFieldsManualSkipped int + ShopeeFieldsStaleSkipped int + SKUCreated int + SKUUpdated int + UpdatePolicy string + SKUFilled int + SKUSameSourceUpdated int + SKUSkipped int + SKUManualSkipped int + SKUStaleSkipped int + PddCreated int + PddUpdated int + AssociationCreated int + AssociationUnchanged int + FailureCount int + ErrorSummary string + ResponseBody string + CreatedAt string + FinishedAt string } diff --git a/admin/model/model.go b/admin/model/model.go index b922ec9..1f46e59 100644 --- a/admin/model/model.go +++ b/admin/model/model.go @@ -164,15 +164,21 @@ func (p PddProduct) IsDeleted() bool { // // 采集结果和采集状态**不在这里**——它们属于 PDD 商品，见 PddProduct。 type ShopeeProduct struct { - GoodsID string - Title string - ShopeeStatus string - MainSKUCode string - Source string // report=蝦皮报表完整行；syb=顺运宝同步补建的商品骨架 - PddGoodsURL string - PddGoodsID string // 指向 PddProduct.GoodsID，为空表示还没填链接 - CreatedAt string - UpdatedAt string + GoodsID string + Title string + ShopeeStatus string + MainSKUCode string + ImageURL string + ShopeeShopName string + ImageSource, ImageObservedAt string + ImageIsManual bool + ShopNameSource, ShopNameObservedAt string + ShopNameIsManual bool + Source string // report=蝦皮报表完整行；syb=顺运宝同步补建的商品骨架 + PddGoodsURL string + PddGoodsID string // 指向 PddProduct.GoodsID，为空表示还没填链接 + CreatedAt string + UpdatedAt string } // ShopeeSKU 是蝦皮的一个规格（SKU 级）。 diff --git a/admin/repository/catalog_import.go b/admin/repository/catalog_import.go index d66b379..9c553a6 100644 --- a/admin/repository/catalog_import.go +++ b/admin/repository/catalog_import.go @@ -43,13 +43,13 @@ func GetCatalogImportRun(q Execer, source, batchID string) (model.CatalogImportR var run model.CatalogImportRun var observedAt, lastConflictAt, errorSummary, responseBody, finishedAt sql.NullString err := q.QueryRow(`SELECT source,batch_id,request_hash,status,request_count,conflict_count, - observed_at,update_policy,last_request_at,last_conflict_at,shopee_created,shopee_updated,sku_created, + observed_at,update_policy,last_request_at,last_conflict_at,shopee_created,shopee_updated,shopee_fields_filled,shopee_fields_same_source_updated,shopee_fields_manual_skipped,shopee_fields_stale_skipped,sku_created, sku_updated,sku_filled,sku_same_source_updated,sku_skipped,sku_manual_skipped,sku_stale_skipped, pdd_created,pdd_updated,association_created,association_unchanged,failure_count, error_summary,response_body,created_at,finished_at FROM catalog_import_runs WHERE source=? AND batch_id=?`, source, batchID).Scan( &run.Source, &run.BatchID, &run.RequestHash, &run.Status, &run.RequestCount, &run.ConflictCount, - &observedAt, &run.UpdatePolicy, &run.LastRequestAt, &lastConflictAt, &run.ShopeeCreated, &run.ShopeeUpdated, + &observedAt, &run.UpdatePolicy, &run.LastRequestAt, &lastConflictAt, &run.ShopeeCreated, &run.ShopeeUpdated, &run.ShopeeFieldsFilled, &run.ShopeeFieldsSameSourceUpdated, &run.ShopeeFieldsManualSkipped, &run.ShopeeFieldsStaleSkipped, &run.SKUCreated, &run.SKUUpdated, &run.SKUFilled, &run.SKUSameSourceUpdated, &run.SKUSkipped, &run.SKUManualSkipped, &run.SKUStaleSkipped, &run.PddCreated, &run.PddUpdated, &run.AssociationCreated, &run.AssociationUnchanged, &run.FailureCount, &errorSummary, &responseBody, &run.CreatedAt, &finishedAt) @@ -149,37 +149,78 @@ func RecordCatalogImportConflict(q Execer, source, batchID, requestedAt string) // CompleteCatalogImportRun 把处理结果摘要和安全的响应 JSON 固化，供幂等重放。 func CompleteCatalogImportRun(q Execer, run model.CatalogImportRun) error { - result, err := q.Exec(`UPDATE catalog_import_runs SET status=?,shopee_created=?,shopee_updated=?, + result, err := q.Exec(`UPDATE catalog_import_runs SET status=?,shopee_created=?,shopee_updated=?,shopee_fields_filled=?,shopee_fields_same_source_updated=?,shopee_fields_manual_skipped=?,shopee_fields_stale_skipped=?, sku_created=?,sku_updated=?,sku_filled=?,sku_same_source_updated=?,sku_skipped=?, sku_manual_skipped=?,sku_stale_skipped=?,pdd_created=?,pdd_updated=?,association_created=?, association_unchanged=?,failure_count=?,error_summary=NULLIF(?,''),response_body=NULLIF(?,''), finished_at=? WHERE source=? AND batch_id=?`, run.Status, run.ShopeeCreated, run.ShopeeUpdated, - run.SKUCreated, run.SKUUpdated, run.SKUFilled, run.SKUSameSourceUpdated, run.SKUSkipped, + run.ShopeeFieldsFilled, run.ShopeeFieldsSameSourceUpdated, run.ShopeeFieldsManualSkipped, run.ShopeeFieldsStaleSkipped, run.SKUCreated, run.SKUUpdated, run.SKUFilled, run.SKUSameSourceUpdated, run.SKUSkipped, run.SKUManualSkipped, run.SKUStaleSkipped, run.PddCreated, run.PddUpdated, run.AssociationCreated, run.AssociationUnchanged, run.FailureCount, run.ErrorSummary, run.ResponseBody, run.FinishedAt, run.Source, run.BatchID) return catalogRunUpdateResult(result, err, "完成商品目录批次") } -// UpsertCatalogShopeeProduct 按上游观测时间更新来源字段，绝不覆盖人工 PDD 关联。 -func UpsertCatalogShopeeProduct(q Execer, goodsID, title, status, mainSKU, observedAt, now string) (created, updated bool, err error) { - var oldObserved sql.NullString - err = q.QueryRow(`SELECT source_observed_at FROM shopee_products WHERE goods_id=?`, goodsID).Scan(&oldObserved) +type CatalogShopeeProductInput struct{ GoodsID, Title, Status, MainSKU, ImageURL, ShopName, Source, ObservedAt, Now, UpdatePolicy string } +type CatalogProductOutcome struct { + Created, Updated bool + FieldsFilled, FieldsSameSourceUpdated, FieldsManualSkipped, FieldsStaleSkipped int +} + +// UpsertCatalogShopeeProduct 独立保护主图和店铺字段，绝不覆盖人工 PDD 关联。 +func UpsertCatalogShopeeProduct(q Execer, in CatalogShopeeProductInput) (out CatalogProductOutcome, err error) { + var oldObserved, imageURL, shopName, imageSource, imageObserved, shopSource, shopObserved sql.NullString + var imageManual, shopManual int + err = q.QueryRow(`SELECT source_observed_at,image_url,shopee_shop_name,image_source,image_observed_at,image_is_manual,shop_name_source,shop_name_observed_at,shop_name_is_manual FROM shopee_products WHERE goods_id=?`, in.GoodsID).Scan(&oldObserved, &imageURL, &shopName, &imageSource, &imageObserved, &imageManual, &shopSource, &shopObserved, &shopManual) if errors.Is(err, sql.ErrNoRows) { - _, err = q.Exec(`INSERT INTO shopee_products(goods_id,title,shopee_status,main_sku_code,source, - source_observed_at,created_at,updated_at) VALUES(?,?,NULLIF(?,''),NULLIF(?,''),'api',?,?,?)`, - goodsID, title, status, mainSKU, observedAt, now, now) - return err == nil, false, err + _, err = q.Exec(`INSERT INTO shopee_products(goods_id,title,shopee_status,main_sku_code,image_url,shopee_shop_name,image_source,image_observed_at,image_is_manual,shop_name_source,shop_name_observed_at,shop_name_is_manual,source,source_observed_at,created_at,updated_at) VALUES(?,?,NULLIF(?,''),NULLIF(?,''),NULLIF(?,''),NULLIF(?,''),CASE WHEN TRIM(?)='' THEN NULL ELSE ? END,CASE WHEN TRIM(?)='' THEN NULL ELSE ? END,0,CASE WHEN TRIM(?)='' THEN NULL ELSE ? END,CASE WHEN TRIM(?)='' THEN NULL ELSE ? END,0,'api',?,?,?)`, in.GoodsID, in.Title, in.Status, in.MainSKU, in.ImageURL, in.ShopName, in.ImageURL, in.Source, in.ImageURL, in.ObservedAt, in.ShopName, in.Source, in.ShopName, in.ObservedAt, in.ObservedAt, in.Now, in.Now) + out.Created = err == nil + return out, err } if err != nil { - return false, false, err + return out, err } - if oldObserved.Valid && oldObserved.String > observedAt { - return false, false, nil + baseUpdate := !oldObserved.Valid || oldObserved.String <= in.ObservedAt + newImage, newShop := imageURL.String, shopName.String + imageChanged, shopChanged := false, false + apply := func(incoming string, current *string, source, observed sql.NullString, manual int) (changed bool) { + if strings.TrimSpace(incoming) == "" || in.UpdatePolicy == "insert_only" { + return false + } + if manual != 0 { + out.FieldsManualSkipped++ + return false + } + if in.UpdatePolicy == "fill_missing" { + if *current == "" { + *current = incoming + out.FieldsFilled++ + return true + } + return false + } + if !source.Valid || source.String != in.Source { + return false + } + if observed.Valid && observed.String > in.ObservedAt { + out.FieldsStaleSkipped++ + return false + } + if *current != incoming { + *current = incoming + out.FieldsSameSourceUpdated++ + return true + } + return false } - _, err = q.Exec(`UPDATE shopee_products SET title=?,shopee_status=NULLIF(?,''),main_sku_code=NULLIF(?,''), - source='api',source_observed_at=?,updated_at=? WHERE goods_id=?`, title, status, mainSKU, observedAt, now, goodsID) - return false, err == nil, err + imageChanged = apply(in.ImageURL, &newImage, imageSource, imageObserved, imageManual) + shopChanged = apply(in.ShopName, &newShop, shopSource, shopObserved, shopManual) + if !baseUpdate && !imageChanged && !shopChanged { + return out, nil + } + _, err = q.Exec(`UPDATE shopee_products SET title=CASE WHEN ? THEN ? ELSE title END,shopee_status=CASE WHEN ? THEN NULLIF(?,'') ELSE shopee_status END,main_sku_code=CASE WHEN ? THEN NULLIF(?,'') ELSE main_sku_code END,source=CASE WHEN ? THEN 'api' ELSE source END,source_observed_at=CASE WHEN ? THEN ? ELSE source_observed_at END,image_url=NULLIF(?,''),shopee_shop_name=NULLIF(?,''),image_source=CASE WHEN ? THEN ? ELSE image_source END,image_observed_at=CASE WHEN ? THEN ? ELSE image_observed_at END,shop_name_source=CASE WHEN ? THEN ? ELSE shop_name_source END,shop_name_observed_at=CASE WHEN ? THEN ? ELSE shop_name_observed_at END,updated_at=? WHERE goods_id=?`, baseUpdate, in.Title, baseUpdate, in.Status, baseUpdate, in.MainSKU, baseUpdate, baseUpdate, in.ObservedAt, newImage, newShop, imageChanged, in.Source, imageChanged, in.ObservedAt, shopChanged, in.Source, shopChanged, in.ObservedAt, in.Now, in.GoodsID) + out.Updated = err == nil + return out, err } type CatalogSKUOutcome string diff --git a/admin/repository/catalog_import_test.go b/admin/repository/catalog_import_test.go index e21c2a7..425c121 100644 --- a/admin/repository/catalog_import_test.go +++ b/admin/repository/catalog_import_test.go @@ -20,7 +20,7 @@ func TestCatalogImportRun_登记查询重放和冲突(t *testing.T) { if _, err := db.Exec(`CREATE TABLE catalog_import_runs ( source TEXT NOT NULL,batch_id TEXT NOT NULL,request_hash TEXT NOT NULL,status TEXT NOT NULL, request_count INTEGER NOT NULL,conflict_count INTEGER NOT NULL,observed_at TEXT,update_policy TEXT NOT NULL DEFAULT 'fill_missing',last_request_at TEXT NOT NULL, - last_conflict_at TEXT,shopee_created INTEGER NOT NULL DEFAULT 0,shopee_updated INTEGER NOT NULL DEFAULT 0, + last_conflict_at TEXT,shopee_created INTEGER NOT NULL DEFAULT 0,shopee_updated INTEGER NOT NULL DEFAULT 0,shopee_fields_filled INTEGER NOT NULL DEFAULT 0,shopee_fields_same_source_updated INTEGER NOT NULL DEFAULT 0,shopee_fields_manual_skipped INTEGER NOT NULL DEFAULT 0,shopee_fields_stale_skipped INTEGER NOT NULL DEFAULT 0, sku_created INTEGER NOT NULL DEFAULT 0,sku_updated INTEGER NOT NULL DEFAULT 0,sku_filled INTEGER NOT NULL DEFAULT 0,sku_same_source_updated INTEGER NOT NULL DEFAULT 0,sku_skipped INTEGER NOT NULL DEFAULT 0,sku_manual_skipped INTEGER NOT NULL DEFAULT 0,sku_stale_skipped INTEGER NOT NULL DEFAULT 0,pdd_created INTEGER NOT NULL DEFAULT 0, pdd_updated INTEGER NOT NULL DEFAULT 0,association_created INTEGER NOT NULL DEFAULT 0, association_unchanged INTEGER NOT NULL DEFAULT 0,failure_count INTEGER NOT NULL DEFAULT 0, diff --git a/admin/repository/mysql_db.go b/admin/repository/mysql_db.go index f3ec6be..e262546 100644 --- a/admin/repository/mysql_db.go +++ b/admin/repository/mysql_db.go @@ -19,7 +19,7 @@ import ( "cmautobuy/admin/spec" ) -const mysqlSchemaVersion = 8 +const mysqlSchemaVersion = 9 // OpenMySQL 打开生产 MySQL 8 数据库。错误信息绝不包含完整 DSN 或密码。 func OpenMySQL(cfg config.DatabaseConfig) (*sql.DB, error) { @@ -519,10 +519,65 @@ func MigrateMySQL(db *sql.DB) error { if _, err := db.Exec(`INSERT INTO schema_migrations (version, applied_at) VALUES (?, ?)`, 8, time.Now().UTC().Format(time.RFC3339Nano)); err != nil { return fmt.Errorf("记录 MySQL schema v8 失败: %w", err) } + current = 8 + } + if current < 9 { + if err := migrateMySQLV9(db); err != nil { + return fmt.Errorf("执行 MySQL schema v9 失败: %w", err) + } + if err := checkMySQLV9Shape(db); err != nil { + return fmt.Errorf("MySQL schema v9 自检失败，未记录版本: %w", err) + } + if _, err := db.Exec(`INSERT INTO schema_migrations (version, applied_at) VALUES (?, ?)`, 9, time.Now().UTC().Format(time.RFC3339Nano)); err != nil { + return fmt.Errorf("记录 MySQL schema v9 失败: %w", err) + } } return CheckMySQLSchema(db) } +func migrateMySQLV9(db *sql.DB) error { + columns := []struct{ table, name, ddl string }{ + {"shopee_products", "image_url", `ALTER TABLE shopee_products ADD COLUMN image_url VARCHAR(2048) NULL AFTER main_sku_code`}, + {"shopee_products", "shopee_shop_name", `ALTER TABLE shopee_products ADD COLUMN shopee_shop_name VARCHAR(500) NULL AFTER image_url`}, + {"shopee_products", "image_source", `ALTER TABLE shopee_products ADD COLUMN image_source VARCHAR(64) COLLATE utf8mb4_bin NULL AFTER shopee_shop_name`}, + {"shopee_products", "image_observed_at", `ALTER TABLE shopee_products ADD COLUMN image_observed_at VARCHAR(35) NULL AFTER image_source`}, + {"shopee_products", "image_is_manual", `ALTER TABLE shopee_products ADD COLUMN image_is_manual TINYINT NOT NULL DEFAULT 0 AFTER image_observed_at`}, + {"shopee_products", "shop_name_source", `ALTER TABLE shopee_products ADD COLUMN shop_name_source VARCHAR(64) COLLATE utf8mb4_bin NULL AFTER image_is_manual`}, + {"shopee_products", "shop_name_observed_at", `ALTER TABLE shopee_products ADD COLUMN shop_name_observed_at VARCHAR(35) NULL AFTER shop_name_source`}, + {"shopee_products", "shop_name_is_manual", `ALTER TABLE shopee_products ADD COLUMN shop_name_is_manual TINYINT NOT NULL DEFAULT 0 AFTER shop_name_observed_at`}, + {"catalog_import_runs", "shopee_fields_filled", `ALTER TABLE catalog_import_runs ADD COLUMN shopee_fields_filled INT UNSIGNED NOT NULL DEFAULT 0 AFTER shopee_updated`}, + {"catalog_import_runs", "shopee_fields_same_source_updated", `ALTER TABLE catalog_import_runs ADD COLUMN shopee_fields_same_source_updated INT UNSIGNED NOT NULL DEFAULT 0 AFTER shopee_fields_filled`}, + {"catalog_import_runs", "shopee_fields_manual_skipped", `ALTER TABLE catalog_import_runs ADD COLUMN shopee_fields_manual_skipped INT UNSIGNED NOT NULL DEFAULT 0 AFTER shopee_fields_same_source_updated`}, + {"catalog_import_runs", "shopee_fields_stale_skipped", `ALTER TABLE catalog_import_runs ADD COLUMN shopee_fields_stale_skipped INT UNSIGNED NOT NULL DEFAULT 0 AFTER shopee_fields_manual_skipped`}, + } + for _, column := range columns { + exists, err := mysqlColumnExists(db, column.table, column.name) + if err != nil { + return err + } + if !exists { + if _, err := db.Exec(column.ddl); err != nil { + return fmt.Errorf("增加 %s.%s 失败: %w", column.table, column.name, err) + } + } + } + for _, constraint := range []struct{ name, ddl string }{ + {"chk_shopee_products_image_manual", `ALTER TABLE shopee_products ADD CONSTRAINT chk_shopee_products_image_manual CHECK (image_is_manual IN (0,1))`}, + {"chk_shopee_products_shop_manual", `ALTER TABLE shopee_products ADD CONSTRAINT chk_shopee_products_shop_manual CHECK (shop_name_is_manual IN (0,1))`}, + } { + exists, err := mysqlConstraintExists(db, "shopee_products", constraint.name) + if err != nil { + return err + } + if !exists { + if _, err := db.Exec(constraint.ddl); err != nil { + return fmt.Errorf("增加约束 %s 失败: %w", constraint.name, err) + } + } + } + return nil +} + // migrateMySQLV8 保留 sku_id 作为内部主键，并增加可空的真实蝦皮 SKU ID。 // 每个 DDL 都先检查形状，支持 MySQL 隐式提交后的中断重放。 func migrateMySQLV8(db *sql.DB) error { @@ -1056,7 +1111,48 @@ func CheckMySQLSchema(db *sql.DB) error { if err := checkMySQLV7Shape(db); err != nil { return err } - return checkMySQLV8Shape(db) + if err := checkMySQLV8Shape(db); err != nil { + return err + } + return checkMySQLV9Shape(db) +} + +func checkMySQLV9Shape(db *sql.DB) error { + for _, column := range []struct { + name string + length int64 + nullable bool + collation, def string + }{ + {"image_url", 2048, true, "utf8mb4_0900_ai_ci", ""}, {"shopee_shop_name", 500, true, "utf8mb4_0900_ai_ci", ""}, + {"image_source", 64, true, "utf8mb4_bin", ""}, {"image_observed_at", 35, true, "utf8mb4_0900_ai_ci", ""}, + {"shop_name_source", 64, true, "utf8mb4_bin", ""}, {"shop_name_observed_at", 35, true, "utf8mb4_0900_ai_ci", ""}, + } { + if err := checkMySQLVarcharColumn(db, "shopee_products", column.name, column.length, column.nullable, column.collation, column.def); err != nil { + return err + } + } + for _, name := range []string{"image_is_manual", "shop_name_is_manual"} { + var dataType, isNullable string + var defaultValue sql.NullString + err := db.QueryRow(`SELECT data_type,is_nullable,column_default FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='shopee_products' AND column_name=?`, name).Scan(&dataType, &isNullable, &defaultValue) + if err != nil || dataType != "tinyint" || isNullable != "NO" || !defaultValue.Valid || defaultValue.String != "0" { + return fmt.Errorf("蝦皮商品字段 %s 形状不正确", name) + } + } + for _, name := range []string{"chk_shopee_products_image_manual", "chk_shopee_products_shop_manual"} { + exists, err := mysqlConstraintExists(db, "shopee_products", name) + if err != nil || !exists { + return fmt.Errorf("蝦皮商品约束 %s 缺失", name) + } + } + for _, name := range []string{"shopee_fields_filled", "shopee_fields_same_source_updated", "shopee_fields_manual_skipped", "shopee_fields_stale_skipped"} { + exists, err := mysqlColumnExists(db, "catalog_import_runs", name) + if err != nil || !exists { + return fmt.Errorf("目录记录字段 %s 缺失", name) + } + } + return nil } func checkMySQLV8Shape(db *sql.DB) error { diff --git a/admin/repository/mysql_db_integration_test.go b/admin/repository/mysql_db_integration_test.go index c7d2397..578080e 100644 --- a/admin/repository/mysql_db_integration_test.go +++ b/admin/repository/mysql_db_integration_test.go @@ -429,6 +429,45 @@ func TestMySQLMigrate_V8重复规格停止且不记版本(t *testing.T) { } } +func TestMySQLMigrate_V8升级V9且断点重放(t *testing.T) { + db := openMySQLMigrationTestDB(t) + defer db.Close() + cleanMySQLTestSchema(t, db) + defer cleanMySQLTestSchema(t, db) + prepareMySQLV7(t, db) + if err := migrateMySQLV8(db); err != nil { + t.Fatal(err) + } + mustExec(t, db, `INSERT INTO schema_migrations(version,applied_at) VALUES(8,'2026-08-11T00:00:00Z')`) + if err := migrateMySQLV9(db); err != nil { + t.Fatal(err) + } + if err := MigrateMySQL(db); err != nil { + t.Fatal(err) + } + if err := MigrateMySQL(db); err != nil { + t.Fatalf("v9 重放失败: %v", err) + } + mustExec(t, db, `INSERT INTO shopee_products(goods_id,title,source,image_url,shopee_shop_name,image_is_manual,shop_name_is_manual,created_at,updated_at) VALUES('S','商品','api','https://example.com/a.jpg','店铺',0,0,'2026-08-11T00:00:00Z','2026-08-11T00:00:00Z')`) +} + +func TestMySQLMigrate_V9形状错误不记版本(t *testing.T) { + db := openMySQLMigrationTestDB(t) + defer db.Close() + cleanMySQLTestSchema(t, db) + defer cleanMySQLTestSchema(t, db) + prepareMySQLV8(t, db) + mustExec(t, db, `ALTER TABLE shopee_products ADD COLUMN image_url VARCHAR(10) NULL`) + if err := MigrateMySQL(db); err == nil { + t.Fatal("错误 image_url 形状必须阻止 v9") + } + var count int + db.QueryRow(`SELECT COUNT(*) FROM schema_migrations WHERE version=9`).Scan(&count) + if count != 0 { + t.Fatal("v9 自检失败不得记录版本") + } +} + func openMySQLMigrationTestDB(t *testing.T) *sql.DB { t.Helper() if os.Getenv("CMAUTOBUY_MYSQL_TEST") != "1" { @@ -492,6 +531,15 @@ func prepareMySQLV7(t *testing.T, db *sql.DB) { mustExec(t, db, `INSERT INTO schema_migrations(version,applied_at) VALUES (7,'2026-08-11T00:00:00Z')`) } +func prepareMySQLV8(t *testing.T, db *sql.DB) { + t.Helper() + prepareMySQLV7(t, db) + if err := migrateMySQLV8(db); err != nil { + t.Fatal(err) + } + mustExec(t, db, `INSERT INTO schema_migrations(version,applied_at) VALUES(8,'2026-08-11T00:00:00Z')`) +} + func mustExec(t *testing.T, db *sql.DB, query string, args ...any) { t.Helper() if _, err := db.Exec(query, args...); err != nil { diff --git a/admin/repository/shopee.go b/admin/repository/shopee.go index 8d91531..aea5646 100644 --- a/admin/repository/shopee.go +++ b/admin/repository/shopee.go @@ -178,7 +178,7 @@ func shopeeFilterClause(filter ShopeeFilter) (string, []any) { func ListShopeeProducts(q Execer, filter ShopeeFilter, limit, offset int) ([]ShopeeProductRow, error) { where, args := shopeeFilterClause(filter) sqlText := ` - SELECT sp.goods_id, sp.title, sp.shopee_status, sp.main_sku_code, sp.source, + SELECT sp.goods_id, sp.title, sp.shopee_status, sp.main_sku_code, sp.image_url,sp.shopee_shop_name,sp.image_source,sp.image_observed_at,sp.image_is_manual,sp.shop_name_source,sp.shop_name_observed_at,sp.shop_name_is_manual,sp.source, sp.pdd_goods_url, sp.pdd_goods_id, sp.created_at, sp.updated_at, COUNT(DISTINCT CASE WHEN sk.parse_ok = 1 THEN sk.color END) AS color_count, COUNT(DISTINCT CASE WHEN sk.parse_ok = 1 THEN sk.size END) AS size_count, @@ -201,9 +201,10 @@ func ListShopeeProducts(q Execer, filter ShopeeFilter, limit, offset int) ([]Sho var list []ShopeeProductRow for rows.Next() { var r ShopeeProductRow - var title, shopeeStatus, mainSKUCode, source, pddGoodsURL, pddGoodsID sql.NullString + var title, shopeeStatus, mainSKUCode, imageURL, shopName, imageSource, imageObserved, shopSource, shopObserved, source, pddGoodsURL, pddGoodsID sql.NullString + var imageManual, shopManual int if err := rows.Scan( - &r.GoodsID, &title, &shopeeStatus, &mainSKUCode, &source, + &r.GoodsID, &title, &shopeeStatus, &mainSKUCode, &imageURL, &shopName, &imageSource, &imageObserved, &imageManual, &shopSource, &shopObserved, &shopManual, &source, &pddGoodsURL, &pddGoodsID, &r.CreatedAt, &r.UpdatedAt, &r.ColorCount, &r.SizeCount, &r.SKUCount, &r.PendingCount, &r.CollectStatus, &r.CollectMsg, @@ -213,6 +214,14 @@ func ListShopeeProducts(q Execer, filter ShopeeFilter, limit, offset int) ([]Sho r.Title = title.String r.ShopeeStatus = shopeeStatus.String r.MainSKUCode = mainSKUCode.String + r.ImageURL = imageURL.String + r.ShopeeShopName = shopName.String + r.ImageSource = imageSource.String + r.ImageObservedAt = imageObserved.String + r.ImageIsManual = imageManual != 0 + r.ShopNameSource = shopSource.String + r.ShopNameObservedAt = shopObserved.String + r.ShopNameIsManual = shopManual != 0 r.Source = source.String r.PddGoodsURL = pddGoodsURL.String r.PddGoodsID = pddGoodsID.String @@ -240,12 +249,13 @@ func CountShopeeProductsFiltered(q Execer, filter ShopeeFilter) (int, error) { // 弹窗组装商品信息时用。查不到返回 (nil, nil)。 func GetShopeeProductByGoodsID(q Execer, goodsID string) (*model.ShopeeProduct, error) { var p model.ShopeeProduct - var title, shopeeStatus, mainSKUCode, source, pddGoodsURL, pddGoodsID sql.NullString + var title, shopeeStatus, mainSKUCode, imageURL, shopName, imageSource, imageObserved, shopSource, shopObserved, source, pddGoodsURL, pddGoodsID sql.NullString + var imageManual, shopManual int err := q.QueryRow(` - SELECT goods_id, title, shopee_status, main_sku_code, source, + SELECT goods_id, title, shopee_status, main_sku_code,image_url,shopee_shop_name,image_source,image_observed_at,image_is_manual,shop_name_source,shop_name_observed_at,shop_name_is_manual, source, pdd_goods_url, pdd_goods_id, created_at, updated_at FROM shopee_products WHERE goods_id = ?`, goodsID).Scan( - &p.GoodsID, &title, &shopeeStatus, &mainSKUCode, &source, + &p.GoodsID, &title, &shopeeStatus, &mainSKUCode, &imageURL, &shopName, &imageSource, &imageObserved, &imageManual, &shopSource, &shopObserved, &shopManual, &source, &pddGoodsURL, &pddGoodsID, &p.CreatedAt, &p.UpdatedAt) if errors.Is(err, sql.ErrNoRows) { return nil, nil @@ -256,6 +266,14 @@ func GetShopeeProductByGoodsID(q Execer, goodsID string) (*model.ShopeeProduct, p.Title = title.String p.ShopeeStatus = shopeeStatus.String p.MainSKUCode = mainSKUCode.String + p.ImageURL = imageURL.String + p.ShopeeShopName = shopName.String + p.ImageSource = imageSource.String + p.ImageObservedAt = imageObserved.String + p.ImageIsManual = imageManual != 0 + p.ShopNameSource = shopSource.String + p.ShopNameObservedAt = shopObserved.String + p.ShopNameIsManual = shopManual != 0 p.Source = source.String p.PddGoodsURL = pddGoodsURL.String p.PddGoodsID = pddGoodsID.String diff --git a/admin/service/catalog_import.go b/admin/service/catalog_import.go index 31d8c36..7263e85 100644 --- a/admin/service/catalog_import.go +++ b/admin/service/catalog_import.go @@ -9,6 +9,7 @@ import ( "errors" "fmt" "net/http" + "net/url" "strings" "time" "unicode/utf8" @@ -28,6 +29,8 @@ type CatalogShopeeProduct struct { Title string `json:"title"` Status string `json:"status"` MainSKUCode string `json:"main_sku_code"` + ImageURL string `json:"image_url"` + ShopName string `json:"shop_name"` } type CatalogShopeeSKU struct { SKUID string `json:"sku_id"` @@ -72,19 +75,23 @@ type CatalogBatchRequest struct { Associations []CatalogAssociation `json:"associations"` } type CatalogCounts struct { - ShopeeCreated int `json:"shopee_created"` - ShopeeUpdated int `json:"shopee_updated"` - SKUCreated int `json:"sku_created"` - SKUUpdated int `json:"sku_updated"` - SKUFilled int `json:"sku_filled"` - SKUSameSourceUpdated int `json:"sku_same_source_updated"` - SKUSkipped int `json:"sku_skipped"` - SKUManualSkipped int `json:"sku_manual_skipped"` - SKUStaleSkipped int `json:"sku_stale_skipped"` - PddCreated int `json:"pdd_created"` - PddUpdated int `json:"pdd_updated"` - AssociationCreated int `json:"association_created"` - AssociationUnchanged int `json:"association_unchanged"` + ShopeeCreated int `json:"shopee_created"` + ShopeeUpdated int `json:"shopee_updated"` + ShopeeFieldsFilled int `json:"shopee_fields_filled"` + ShopeeFieldsSameSourceUpdated int `json:"shopee_fields_same_source_updated"` + ShopeeFieldsManualSkipped int `json:"shopee_fields_manual_skipped"` + ShopeeFieldsStaleSkipped int `json:"shopee_fields_stale_skipped"` + SKUCreated int `json:"sku_created"` + SKUUpdated int `json:"sku_updated"` + SKUFilled int `json:"sku_filled"` + SKUSameSourceUpdated int `json:"sku_same_source_updated"` + SKUSkipped int `json:"sku_skipped"` + SKUManualSkipped int `json:"sku_manual_skipped"` + SKUStaleSkipped int `json:"sku_stale_skipped"` + PddCreated int `json:"pdd_created"` + PddUpdated int `json:"pdd_updated"` + AssociationCreated int `json:"association_created"` + AssociationUnchanged int `json:"association_unchanged"` } type CatalogBatchResponse struct { BatchID string `json:"batch_id"` @@ -132,6 +139,12 @@ func ValidateCatalogBatch(req CatalogBatchRequest) error { return catalogInvalid("INVALID_SHOPEE_PRODUCT", "蝦皮商品 ID/标题不能为空且批内不能重复", map[string]any{"index": i, "goods_id": p.GoodsID}) } seenProducts[p.GoodsID] = true + if utf8.RuneCountInString(strings.TrimSpace(p.ShopName)) > 500 { + return catalogInvalid("INVALID_SHOPEE_SHOP_NAME", "蝦皮店铺名不能超过 500 个字符", map[string]any{"index": i}) + } + if err := validateCatalogImageURL(p.ImageURL); err != nil { + return catalogInvalid("INVALID_SHOPEE_IMAGE_URL", err.Error(), map[string]any{"index": i}) + } } for i, s := range req.ShopeeSKUs { key, keyErr := spec.SpecKey(s.SpecRaw) @@ -205,16 +218,20 @@ func ImportCatalogBatch(db *sql.DB, source string, req CatalogBatchRequest, raw return CatalogBatchResponse{}, importErr } for _, p := range req.ShopeeProducts { - c, u, e := repository.UpsertCatalogShopeeProduct(tx, p.GoodsID, p.Title, p.Status, p.MainSKUCode, req.ObservedAt, now) + outcome, e := repository.UpsertCatalogShopeeProduct(tx, repository.CatalogShopeeProductInput{GoodsID: p.GoodsID, Title: p.Title, Status: p.Status, MainSKU: p.MainSKUCode, ImageURL: strings.TrimSpace(p.ImageURL), ShopName: strings.TrimSpace(p.ShopName), Source: source, ObservedAt: req.ObservedAt, Now: now, UpdatePolicy: policy}) if e != nil { return fail(e) } - if c { + if outcome.Created { counts.ShopeeCreated++ } - if u { + if outcome.Updated { counts.ShopeeUpdated++ } + counts.ShopeeFieldsFilled += outcome.FieldsFilled + counts.ShopeeFieldsSameSourceUpdated += outcome.FieldsSameSourceUpdated + counts.ShopeeFieldsManualSkipped += outcome.FieldsManualSkipped + counts.ShopeeFieldsStaleSkipped += outcome.FieldsStaleSkipped } for _, p := range req.PddProducts { var skus string @@ -278,6 +295,10 @@ func ImportCatalogBatch(db *sql.DB, source string, req CatalogBatchRequest, raw run.ResponseBody = string(body) run.ShopeeCreated = counts.ShopeeCreated run.ShopeeUpdated = counts.ShopeeUpdated + run.ShopeeFieldsFilled = counts.ShopeeFieldsFilled + run.ShopeeFieldsSameSourceUpdated = counts.ShopeeFieldsSameSourceUpdated + run.ShopeeFieldsManualSkipped = counts.ShopeeFieldsManualSkipped + run.ShopeeFieldsStaleSkipped = counts.ShopeeFieldsStaleSkipped run.SKUCreated = counts.SKUCreated run.SKUUpdated = counts.SKUUpdated run.SKUFilled = counts.SKUFilled @@ -314,6 +335,38 @@ func catalogSKURecordID(goodsID, specKey string) string { return "catalog:" + hex.EncodeToString(sum[:]) } +func validateCatalogImageURL(raw string) error { + raw = strings.TrimSpace(raw) + if raw == "" { + return nil + } + if len(raw) > 2048 { + return fmt.Errorf("蝦皮主图片 URL 不能超过 2048 字节") + } + u, err := url.ParseRequestURI(raw) + if err != nil || u.Host == "" || (u.Scheme != "http" && u.Scheme != "https") { + return fmt.Errorf("蝦皮主图片 URL 必须是完整的 HTTP/HTTPS 地址") + } + if u.User != nil { + return fmt.Errorf("蝦皮主图片 URL 不能包含用户名或密码") + } + parameters := u.Query() + if fragmentParameters, fragmentErr := url.ParseQuery(u.Fragment); fragmentErr == nil { + for key, values := range fragmentParameters { + parameters[key] = append(parameters[key], values...) + } + } + for key := range parameters { + lower := strings.ToLower(key) + for _, risky := range []string{"token", "cookie", "password", "passwd", "authorization", "credential", "secret", "session"} { + if strings.Contains(lower, risky) { + return fmt.Errorf("蝦皮主图片 URL 不能包含凭据参数") + } + } + } + return nil +} + func replayCatalogBatch(db *sql.DB, source, batchID, hash, now string) (CatalogBatchResponse, error) { run, err := repository.GetCatalogImportRun(db, source, batchID) if err != nil { diff --git a/admin/service/catalog_import_test.go b/admin/service/catalog_import_test.go index 83884b5..5ce13b4 100644 --- a/admin/service/catalog_import_test.go +++ b/admin/service/catalog_import_test.go @@ -19,10 +19,10 @@ func newCatalogTestDB(t *testing.T) *sql.DB { } db.SetMaxOpenConns(1) statements := []string{ - `CREATE TABLE shopee_products(goods_id TEXT PRIMARY KEY,title TEXT NOT NULL,shopee_status TEXT,main_sku_code TEXT,source TEXT,source_observed_at TEXT,pdd_goods_url TEXT,pdd_goods_id TEXT,created_at TEXT,updated_at TEXT)`, + `CREATE TABLE shopee_products(goods_id TEXT PRIMARY KEY,title TEXT NOT NULL,shopee_status TEXT,main_sku_code TEXT,image_url TEXT,shopee_shop_name TEXT,image_source TEXT,image_observed_at TEXT,image_is_manual INTEGER DEFAULT 0,shop_name_source TEXT,shop_name_observed_at TEXT,shop_name_is_manual INTEGER DEFAULT 0,source TEXT,source_observed_at TEXT,pdd_goods_url TEXT,pdd_goods_id TEXT,created_at TEXT,updated_at TEXT)`, `CREATE TABLE shopee_skus(sku_id TEXT PRIMARY KEY,shopee_sku_id TEXT UNIQUE,goods_id TEXT NOT NULL,spec_raw TEXT,spec_key TEXT,color TEXT,size TEXT,advice TEXT,parse_ok INTEGER,sku_code TEXT,is_manual INTEGER,source TEXT,field_sources TEXT,field_observed_at TEXT,source_observed_at TEXT,created_at TEXT,updated_at TEXT,UNIQUE(goods_id,spec_key))`, `CREATE TABLE pdd_products(id INTEGER PRIMARY KEY AUTOINCREMENT,goods_id TEXT UNIQUE,url TEXT,title TEXT,shop_name TEXT,skus_json TEXT,collect_status TEXT,collect_msg TEXT,artifact_ref TEXT,collected_at TEXT,deleted_at TEXT,source TEXT,source_observed_at TEXT,created_at TEXT,updated_at TEXT)`, - `CREATE TABLE catalog_import_runs(source TEXT,batch_id TEXT,request_hash TEXT,status TEXT,request_count INTEGER,conflict_count INTEGER,observed_at TEXT,update_policy TEXT DEFAULT 'fill_missing',last_request_at TEXT,last_conflict_at TEXT,shopee_created INTEGER DEFAULT 0,shopee_updated INTEGER DEFAULT 0,sku_created INTEGER DEFAULT 0,sku_updated INTEGER DEFAULT 0,sku_filled INTEGER DEFAULT 0,sku_same_source_updated INTEGER DEFAULT 0,sku_skipped INTEGER DEFAULT 0,sku_manual_skipped INTEGER DEFAULT 0,sku_stale_skipped INTEGER DEFAULT 0,pdd_created INTEGER DEFAULT 0,pdd_updated INTEGER DEFAULT 0,association_created INTEGER DEFAULT 0,association_unchanged INTEGER DEFAULT 0,failure_count INTEGER DEFAULT 0,error_summary TEXT,response_body TEXT,created_at TEXT,finished_at TEXT,PRIMARY KEY(source,batch_id))`, + `CREATE TABLE catalog_import_runs(source TEXT,batch_id TEXT,request_hash TEXT,status TEXT,request_count INTEGER,conflict_count INTEGER,observed_at TEXT,update_policy TEXT DEFAULT 'fill_missing',last_request_at TEXT,last_conflict_at TEXT,shopee_created INTEGER DEFAULT 0,shopee_updated INTEGER DEFAULT 0,shopee_fields_filled INTEGER DEFAULT 0,shopee_fields_same_source_updated INTEGER DEFAULT 0,shopee_fields_manual_skipped INTEGER DEFAULT 0,shopee_fields_stale_skipped INTEGER DEFAULT 0,sku_created INTEGER DEFAULT 0,sku_updated INTEGER DEFAULT 0,sku_filled INTEGER DEFAULT 0,sku_same_source_updated INTEGER DEFAULT 0,sku_skipped INTEGER DEFAULT 0,sku_manual_skipped INTEGER DEFAULT 0,sku_stale_skipped INTEGER DEFAULT 0,pdd_created INTEGER DEFAULT 0,pdd_updated INTEGER DEFAULT 0,association_created INTEGER DEFAULT 0,association_unchanged INTEGER DEFAULT 0,failure_count INTEGER DEFAULT 0,error_summary TEXT,response_body TEXT,created_at TEXT,finished_at TEXT,PRIMARY KEY(source,batch_id))`, } for _, statement := range statements { if _, err := db.Exec(statement); err != nil { @@ -260,3 +260,97 @@ func TestImportCatalogBatch_同规格不同真实SKU冲突并回滚(t *testing.T t.Fatalf("冲突批次未整体回滚：%q", title) } } + +func TestImportCatalogBatch_蝦皮图片店铺分级更新和人工保护(t *testing.T) { + db := newCatalogTestDB(t) + base := validCatalogBatch() + raw, _ := json.Marshal(base) + if _, err := ImportCatalogBatch(db, "script-a", base, raw); err != nil { + t.Fatal(err) + } + fill := validCatalogBatch() + fill.BatchID = "product-fill" + fill.ShopeeProducts[0].ImageURL = "https://img.example.com/a.jpg" + fill.ShopeeProducts[0].ShopName = "蝦皮店铺A" + raw, _ = json.Marshal(fill) + got, err := ImportCatalogBatch(db, "script-a", fill, raw) + if err != nil || got.Counts.ShopeeFieldsFilled != 2 { + t.Fatalf("补空失败：%+v %v", got, err) + } + keep := validCatalogBatch() + keep.BatchID = "product-keep" + keep.ShopeeProducts[0].ImageURL = "https://img.example.com/b.jpg" + keep.ShopeeProducts[0].ShopName = "店铺B" + raw, _ = json.Marshal(keep) + got, err = ImportCatalogBatch(db, "script-b", keep, raw) + if err != nil || got.Counts.ShopeeFieldsFilled != 0 { + t.Fatalf("默认策略不应覆盖：%+v %v", got, err) + } + cross := keep + cross.BatchID = "product-cross" + cross.UpdatePolicy = "overwrite_same_source" + cross.ObservedAt = "2026-08-12T07:00:00+08:00" + raw, _ = json.Marshal(cross) + got, err = ImportCatalogBatch(db, "script-b", cross, raw) + if err != nil || got.Counts.ShopeeFieldsSameSourceUpdated != 0 { + t.Fatalf("跨来源不应覆盖：%+v %v", got, err) + } + insertOnly := keep + insertOnly.BatchID = "product-insert-only" + insertOnly.UpdatePolicy = "insert_only" + raw, _ = json.Marshal(insertOnly) + got, err = ImportCatalogBatch(db, "script-a", insertOnly, raw) + if err != nil || got.Counts.ShopeeFieldsFilled != 0 || got.Counts.ShopeeFieldsSameSourceUpdated != 0 { + t.Fatalf("insert_only 不应修改已有商品：%+v %v", got, err) + } + overwrite := keep + overwrite.BatchID = "product-overwrite" + overwrite.UpdatePolicy = "overwrite_same_source" + overwrite.ObservedAt = "2026-08-12T08:00:00+08:00" + raw, _ = json.Marshal(overwrite) + got, err = ImportCatalogBatch(db, "script-a", overwrite, raw) + if err != nil || got.Counts.ShopeeFieldsSameSourceUpdated != 2 { + t.Fatalf("同来源更新失败：%+v %v", got, err) + } + var image, shop string + _ = db.QueryRow(`SELECT image_url,shopee_shop_name FROM shopee_products WHERE goods_id='S-1'`).Scan(&image, &shop) + if image != "https://img.example.com/b.jpg" || shop != "店铺B" { + t.Fatalf("字段未更新：%q %q", image, shop) + } + stale := overwrite + stale.BatchID = "product-stale" + stale.ObservedAt = "2026-08-11T09:00:00+08:00" + stale.ShopeeProducts[0].ImageURL = "https://img.example.com/old.jpg" + stale.ShopeeProducts[0].ShopName = "旧店铺" + raw, _ = json.Marshal(stale) + got, err = ImportCatalogBatch(db, "script-a", stale, raw) + if err != nil || got.Counts.ShopeeFieldsStaleSkipped != 2 { + t.Fatalf("旧观测保护失败：%+v %v", got, err) + } + _, _ = db.Exec(`UPDATE shopee_products SET image_is_manual=1,shop_name_is_manual=1 WHERE goods_id='S-1'`) + manual := overwrite + manual.BatchID = "product-manual" + manual.ObservedAt = "2026-08-13T08:00:00+08:00" + manual.ShopeeProducts[0].ImageURL = "https://img.example.com/c.jpg" + manual.ShopeeProducts[0].ShopName = "店铺C" + raw, _ = json.Marshal(manual) + got, err = ImportCatalogBatch(db, "script-a", manual, raw) + if err != nil || got.Counts.ShopeeFieldsManualSkipped != 2 { + t.Fatalf("人工保护失败：%+v %v", got, err) + } +} + +func TestValidateCatalogBatch_拒绝危险图片URL(t *testing.T) { + for _, rawURL := range []string{"file:///tmp/a.jpg", "data:image/png;base64,AA", "https://user:pass@example.com/a.jpg", "https://example.com/a.jpg?access_token=secret", "javascript:alert(1)"} { + req := validCatalogBatch() + req.ShopeeProducts[0].ImageURL = rawURL + if err := ValidateCatalogBatch(req); err == nil { + t.Errorf("应拒绝 %q", rawURL) + } + } + req := validCatalogBatch() + req.ShopeeProducts[0].ImageURL = "https://img.example.com/a.jpg?v=1" + if err := ValidateCatalogBatch(req); err != nil { + t.Fatalf("合法图片被拒绝：%v", err) + } +} diff --git a/admin/service/shopee_list.go b/admin/service/shopee_list.go index 09e2ab1..45db699 100644 --- a/admin/service/shopee_list.go +++ b/admin/service/shopee_list.go @@ -18,8 +18,10 @@ import ( // // 一行对应一个**商品**，不是一个 SKU——见工单 #41。 type ShopeeProductView struct { - GoodsID string - Title string + GoodsID string + Title string + ImageURL string + ShopName string // ColorCount / SizeCount 只统计 parse_ok = 1 的 SKU（`[必须]`，见 #41）。 ColorCount int @@ -107,6 +109,8 @@ func ListShopeeProducts(db *sql.DB, filter repository.ShopeeFilter, page int) (* v := ShopeeProductView{ GoodsID: r.GoodsID, Title: r.Title, + ImageURL: r.ImageURL, + ShopName: r.ShopeeShopName, ColorCount: r.ColorCount, SizeCount: r.SizeCount, SKUCount: r.SKUCount, @@ -204,10 +208,14 @@ type ShopeeSpecView struct { // ShopeeProductDetail 是双击弹窗要显示的全部内容。 type ShopeeProductDetail struct { - GoodsID string - Title string - ShopeeStatus string - MainSKUCode string + GoodsID string + Title string + ShopeeStatus string + MainSKUCode string + ImageURL string + ShopName string + ImageSourceText, ImageObservedAt string + ShopNameSourceText, ShopNameObservedAt string PddURL string PddGoodsID string @@ -238,11 +246,17 @@ func GetShopeeProductDetail(db *sql.DB, goodsID string) (*ShopeeProductDetail, e } d := &ShopeeProductDetail{ - GoodsID: p.GoodsID, - Title: p.Title, - ShopeeStatus: p.ShopeeStatus, - MainSKUCode: p.MainSKUCode, - PddGoodsID: p.PddGoodsID, + GoodsID: p.GoodsID, + Title: p.Title, + ShopeeStatus: p.ShopeeStatus, + MainSKUCode: p.MainSKUCode, + ImageURL: p.ImageURL, + ShopName: p.ShopeeShopName, + ImageSourceText: catalogFieldSourceText(p.ImageSource, p.ImageIsManual), + ImageObservedAt: formatLocalTime(p.ImageObservedAt), + ShopNameSourceText: catalogFieldSourceText(p.ShopNameSource, p.ShopNameIsManual), + ShopNameObservedAt: formatLocalTime(p.ShopNameObservedAt), + PddGoodsID: p.PddGoodsID, } if d.Title == "" { d.Title = placeholder @@ -321,3 +335,13 @@ func GetShopeeProductDetail(db *sql.DB, goodsID string) (*ShopeeProductDetail, e } return d, nil } + +func catalogFieldSourceText(source string, manual bool) string { + if manual { + return "人工维护" + } + if strings.TrimSpace(source) == "" { + return "—" + } + return source +} diff --git a/admin/static/css/app.css b/admin/static/css/app.css index af82105..fef43fe 100644 --- a/admin/static/css/app.css +++ b/admin/static/css/app.css @@ -249,6 +249,9 @@ tr.empty small { color: #aaa; } .col-title { max-width: 18%; } +.col-shop { max-width: 150px; } +.thumb-placeholder, .thumb-fallback { color: #6b7280; font-size: 12px; white-space: nowrap; } +.detail-product-image { width: 120px; max-height: 120px; object-fit: contain; border: 1px solid #ccd1d6; border-radius: 4px; } /* ── 弹窗 ─────────────────────────────── */ /* 用 hidden 属性控制显示隐藏，JS 只改这一个属性，不拼样式 */ diff --git a/admin/static/js/app.js b/admin/static/js/app.js index 64a18a5..aadfa27 100644 --- a/admin/static/js/app.js +++ b/admin/static/js/app.js @@ -342,6 +342,7 @@ title.textContent = productTitle + " · 原图"; link.href = url; image.alt = productTitle + " 原图"; + image.referrerPolicy = "no-referrer"; image.hidden = true; status.hidden = false; status.classList.remove("missing"); @@ -363,6 +364,18 @@ }); } + function setupImageThumbnails() { + document.querySelectorAll("[data-image-thumb]").forEach(function (image) { + function showFallback() { + image.hidden = true; + var fallback = image.parentElement && image.parentElement.querySelector("[data-image-thumb-fallback]"); + if (fallback) fallback.hidden = false; + } + image.addEventListener("error", showFallback); + if (image.complete && image.naturalWidth === 0) showFallback(); + }); + } + /* ── 顺运宝登录弹窗：验证码"换一张" ───────────── 图片本身、以及旁边的"换一张"按钮，点了都重新请求验证码接口。 `[必须]` 每次请求带一个新的时间戳查询参数，绕开浏览器缓存—— @@ -474,6 +487,7 @@ setupModals(); setupRowDetail(); setupImagePreview(); + setupImageThumbnails(); setupCaptchaRefresh(); setupSybSyncFeedback(); setupSybHistoryRefresh(); diff --git a/admin/templates/catalog/detail_modal.html b/admin/templates/catalog/detail_modal.html index bcd6d34..128cf67 100644 --- a/admin/templates/catalog/detail_modal.html +++ b/admin/templates/catalog/detail_modal.html @@ -1 +1 @@ -{{define "catalog/detail_modal"}}
来源
{{.Run.Source}}
批次号
{{.Run.BatchID}}
更新策略
{{.Run.UpdatePolicy}}
状态
{{.Run.StatusText}}
上游观测时间
{{.Run.ObservedAt}}
SKU 新增/补空/同源更新
{{.Run.SKUCreated}} / {{.Run.SKUFilled}} / {{.Run.SKUSameSourceUpdated}}
SKU 跳过（人工/旧数据）
{{.Run.SKUSkipped}}（{{.Run.SKUManualSkipped}} / {{.Run.SKUStaleSkipped}}）
请求/冲突次数
{{.Run.RequestCount}} / {{.Run.ConflictCount}}
失败数
{{.Run.FailureCount}}
错误码
{{if .Run.ErrorCode}}{{.Run.ErrorCode}}{{else}}—{{end}}
可重试
{{if .Run.Retryable}}是{{else}}否{{end}}
错误摘要
{{if .Run.ErrorSummary}}{{.Run.ErrorSummary}}{{else}}—{{end}}
定位信息
{{if .Run.ErrorDetails}}{{.Run.ErrorDetails}}{{else}}—{{end}}

定位信息只包含数组位置和业务 ID；这里不保存完整请求 JSON 或任何凭据。

{{end}} +{{define "catalog/detail_modal"}}
来源
{{.Run.Source}}
批次号
{{.Run.BatchID}}
更新策略
{{.Run.UpdatePolicy}}
状态
{{.Run.StatusText}}
上游观测时间
{{.Run.ObservedAt}}
商品字段 补空/同源更新
{{.Run.ShopeeFieldsFilled}} / {{.Run.ShopeeFieldsSameSourceUpdated}}
商品字段 人工/旧数据跳过
{{.Run.ShopeeFieldsManualSkipped}} / {{.Run.ShopeeFieldsStaleSkipped}}
SKU 新增/补空/同源更新
{{.Run.SKUCreated}} / {{.Run.SKUFilled}} / {{.Run.SKUSameSourceUpdated}}
SKU 跳过（人工/旧数据）
{{.Run.SKUSkipped}}（{{.Run.SKUManualSkipped}} / {{.Run.SKUStaleSkipped}}）
请求/冲突次数
{{.Run.RequestCount}} / {{.Run.ConflictCount}}
失败数
{{.Run.FailureCount}}
错误码
{{if .Run.ErrorCode}}{{.Run.ErrorCode}}{{else}}—{{end}}
可重试
{{if .Run.Retryable}}是{{else}}否{{end}}
错误摘要
{{if .Run.ErrorSummary}}{{.Run.ErrorSummary}}{{else}}—{{end}}
定位信息
{{if .Run.ErrorDetails}}{{.Run.ErrorDetails}}{{else}}—{{end}}

定位信息只包含数组位置和业务 ID；这里不保存完整请求 JSON 或任何凭据。

{{end}} diff --git a/admin/templates/catalog/list.html b/admin/templates/catalog/list.html index cbd7bed..b7f7864 100644 --- a/admin/templates/catalog/list.html +++ b/admin/templates/catalog/list.html @@ -7,8 +7,8 @@ -
-{{range .Rows}}{{else}}{{end}}
来源批次号策略状态请求冲突蝦皮 新/更SKU 新/补/同源更/跳过PDD 新/更关联 新/同首次接收完成耗时
{{.Source}}{{.BatchID}}{{.UpdatePolicy}}{{.StatusText}}{{.RequestCount}}{{.ConflictCount}}{{.ShopeeCreated}} / {{.ShopeeUpdated}}{{.SKUCreated}} / {{.SKUFilled}} / {{.SKUSameSourceUpdated}} / {{.SKUSkipped}}{{.PddCreated}} / {{.PddUpdated}}{{.AssociationCreated}} / {{.AssociationUnchanged}}{{.CreatedText}}{{.FinishedText}}{{.DurationText}}
还没有符合条件的导入记录。
+
+{{range .Rows}}{{else}}{{end}}
来源批次号策略状态请求冲突蝦皮 新/更/字段补/同源更SKU 新/补/同源更/跳过PDD 新/更关联 新/同首次接收完成耗时
{{.Source}}{{.BatchID}}{{.UpdatePolicy}}{{.StatusText}}{{.RequestCount}}{{.ConflictCount}}{{.ShopeeCreated}} / {{.ShopeeUpdated}} / {{.ShopeeFieldsFilled}} / {{.ShopeeFieldsSameSourceUpdated}}{{.SKUCreated}} / {{.SKUFilled}} / {{.SKUSameSourceUpdated}} / {{.SKUSkipped}}{{.PddCreated}} / {{.PddUpdated}}{{.AssociationCreated}} / {{.AssociationUnchanged}}{{.CreatedText}}{{.FinishedText}}{{.DurationText}}
还没有符合条件的导入记录。

双击一行查看批次摘要；系统不会保存或展示 Token 和完整请求体。

diff --git a/admin/templates/shopee/detail_modal.html b/admin/templates/shopee/detail_modal.html index 18d4da7..39383f2 100644 --- a/admin/templates/shopee/detail_modal.html +++ b/admin/templates/shopee/detail_modal.html @@ -10,6 +10,10 @@
商品名称
{{.Title}}
蝦皮状态
{{.ShopeeStatus}}
主商品货号
{{.MainSKUCode}}
+
蝦皮店铺
{{if .ShopName}}{{.ShopName}}{{else}}—{{end}}
+
店铺来源 / 观测时间
{{.ShopNameSourceText}} / {{if .ShopNameObservedAt}}{{.ShopNameObservedAt}}{{else}}—{{end}}
+
蝦皮主图
{{if .ImageURL}}{{.Title}} 主图{{else}}无图{{end}}
+
图片来源 / 观测时间
{{.ImageSourceText}} / {{if .ImageObservedAt}}{{.ImageObservedAt}}{{else}}—{{end}}
PDD 商品 ID
{{if .PddGoodsID}}{{.PddGoodsID}}{{else}}未关联{{end}}
采集状态
{{.StatusText}}{{if .CollectMsg}}：{{.CollectMsg}}{{end}}
diff --git a/admin/templates/shopee/list.html b/admin/templates/shopee/list.html index 0863598..0c5f606 100644 --- a/admin/templates/shopee/list.html +++ b/admin/templates/shopee/list.html @@ -35,7 +35,9 @@ 商品 ID + 图片 商品名称 + 蝦皮店铺 颜色 尺码 {{/* SKU 数是这个商品报表里实际出现过的规格条数。 @@ -57,10 +59,12 @@ {{.GoodsID}} + {{if .ImageURL}}{{else}}无图{{end}} {{/* 商品名称列收窄，用独立的 .col-title 类设 max-width（具体数值见 app.css）， 不用 flex——表格单元格和工具条的 .search-narrow 那套不一样，见 #41。 title 属性让悬停能看完整标题，收窄之后必须留着。 */}} {{.Title}} + {{if .ShopName}}{{.ShopName}}{{else}}—{{end}} {{.ColorCount}} {{.SizeCount}} {{.SKUCount}} @@ -72,7 +76,7 @@ {{else}} - + {{if .IsFiltered}} 没有匹配的数据，换个商品 ID 或商品名称试试。 {{else}} @@ -86,6 +90,8 @@ + +

双击任意一行可以查看这个商品的完整规格表。

diff --git a/docs/admin/03-data-model.md b/docs/admin/03-data-model.md index 7aa5bff..7db929b 100644 --- a/docs/admin/03-data-model.md +++ b/docs/admin/03-data-model.md @@ -438,6 +438,12 @@ MySQL schema v8 将 `shopee_skus.sku_id` 保留为系统内部记录主键（兼 来源表；`fill_missing` 补字段时分别登记，`overwrite_same_source` 只更新来源属于本次 调用方且观测时间不旧的字段，避免不同脚本各补一部分后互相覆盖。 +MySQL schema v9 为 `shopee_products` 增加 `image_url` 和 `shopee_shop_name`。两者分别 +使用 `image_source/image_observed_at/image_is_manual` 与 +`shop_name_source/shop_name_observed_at/shop_name_is_manual` 记录来源边界。目录接口只 +能补空或更新同来源的新观测，空值、跨来源、旧观测和人工字段均不覆盖。该图片是蝦皮 +商品主图，与 `syb_orders.image_url` 的历史货运单观测图片是两个独立概念。 + 蝦皮详情把 `syb_orders` 按 `(shopee_goods_id, spec_key)` 聚合为“顺运宝观测规格”： 订单数按唯一 `syb_id` 行计数，累计数量求和，最近一行提供历史台币售价和图片。 该读模型不写入 `shopee_skus`。只有同一商品下恰好一条正式 SKU 的 `spec_raw` diff --git a/docs/admin/05-ui-specification.md b/docs/admin/05-ui-specification.md index c66b036..fef4a3f 100644 --- a/docs/admin/05-ui-specification.md +++ b/docs/admin/05-ui-specification.md @@ -819,3 +819,9 @@ placeholder 写「任务编号 / 订单号 / 商品 ID」，**不要写全「PDD 商品详情在正式 SKU 表之后显示“顺运宝观测规格”。该区域必须明确标注它不是正式 蝦皮 SKU，价格是最近货运单台币售价、不是 PDD 人民币采购价；展示规格原文、订单 数、累计数量、最近图片、最后出现时间及唯一正式 SKU 匹配结果，多条匹配交给人工。 + +蝦皮商品列表在商品 ID 后显示 32×32 懒加载主图，在标题后显示“蝦皮店铺”。主图可 +打开通用原图弹窗和新窗口，加载失败显示文字占位；无图不打开空弹窗。店铺列最大约 +150px并省略，完整值放在 `title` 和详情中。商品标题继续使用 `.col-title` 的 18%， +不得因新增列再次缩窄；1366×768 下通过表格横向滚动保留可读性。详情同时显示图片、 +店铺、各自来源和观测时间，顺运宝观测图仍只出现在观测区域。 diff --git a/docs/admin/10-商品目录接入接口.md b/docs/admin/10-商品目录接入接口.md index 0b77365..ab1dd4f 100644 --- a/docs/admin/10-商品目录接入接口.md +++ b/docs/admin/10-商品目录接入接口.md @@ -21,7 +21,7 @@ Token 通过 `CMAUTOBUY_CATALOG_TOKEN` 或未提交的 `config.yaml` 配置。 "observed_at": "2026-08-11T10:00:00+08:00", "update_policy": "fill_missing", "shopee_products": [ - {"goods_id": "S-1", "title": "蝦皮上衣", "status": "NORMAL", "main_sku_code": "A01"} + {"goods_id": "S-1", "title": "蝦皮上衣", "status": "NORMAL", "main_sku_code": "A01", "image_url": "https://img.example.com/S-1.jpg", "shop_name": "蝦皮示例店铺"} ], "shopee_skus": [ {"sku_id": null, "goods_id": "S-1", "spec_raw": "黑色,M", "color": "黑色", "size": "M", "parse_ok": true, "sku_code": "A01-B-M"} @@ -47,6 +47,10 @@ Token 通过 `CMAUTOBUY_CATALOG_TOKEN` 或未提交的 `config.yaml` 配置。 不得自行生成。系统用内部主键和 `goods_id + spec_key` 保持记录身份，后续取得真实 ID 会补到原记录，不会重复新增。 +`image_url` 和 `shop_name` 可选。图片只接受不含用户信息和明显凭据参数的完整 +HTTP/HTTPS URL，最长 2048 字节；店铺名最长 500 个字符。Admin 只保存地址并由浏览器 +懒加载，不会在服务端下载或代理图片。 + ## 3. 写入与幂等规则 - 整个批次在一个事务中写入：实体、SKU、关联任一步失败就全部回滚。 @@ -57,6 +61,8 @@ Token 通过 `CMAUTOBUY_CATALOG_TOKEN` 或未提交的 `config.yaml` 配置。 - `overwrite_same_source`：只有来源相同且 `observed_at` 更新时才覆盖来源字段。 - 较旧的 `observed_at` 不覆盖较新的接口数据，任何策略都不能覆盖 `is_manual=1`。 - `spec_raw` 和由它生成的规格身份不被更新；同商品同规格出现不同真实 SKU ID 返回 409。 +- 蝦皮主图和店铺名也遵循本批次策略，但各自独立记录来源、观测时间和人工保护； + 空值永不清除现有值。顺运宝观测图片不参与蝦皮主图更新。 - 蝦皮 upsert 不覆盖采购员维护的 PDD 链接；SKU 的 `is_manual` 不被接口改写。 - 空关联可以建立、相同关联不重复写；已有不同 PDD 关联返回 409，绝不静默替换。 - 批次缺少某条记录不表示删除，接口没有“全量覆盖”语义。 @@ -83,7 +89,7 @@ Token 通过 `CMAUTOBUY_CATALOG_TOKEN` 或未提交的 `config.yaml` 配置。 ## 5. schema v8 发布与回退 -发布前先备份生产库，并在 MySQL 8.4、库名以 `_test` 结尾的测试库演练 v7→v8。 +发布前先备份生产库，并在 MySQL 8.4、库名以 `_test` 结尾的测试库演练 v7→v8→v9。 迁移只增加列和唯一索引，既有 `sku_id` 继续作为内部主键，因此历史引用不变；若检测 到同商品重复 `spec_key`，迁移会停止且不记录 v8，必须人工确认，不能自动合并。