From 3b60e6fdeac7ae5c893aacc6da9df5df0987b423 Mon Sep 17 00:00:00 2001 From: toom1996 <23cm.cn@gmail.com> Date: Mon, 21 Sep 2026 22:36:07 +0800 Subject: [PATCH] =?UTF-8?q?style(street):=20gofmt=20=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E5=8C=96=E8=A1=97=E6=8B=8D=E4=B8=BB=E5=89=AF=E5=9B=BE=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/dto/street_snap.go | 12 +++++----- internal/model/street_snap.go | 16 +++++++------- internal/model/street_snap_draft.go | 16 +++++++------- internal/repository/review_repository.go | 28 ++++++++++++------------ internal/service/review_service.go | 2 +- 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/internal/dto/street_snap.go b/internal/dto/street_snap.go index b73bb88..d99d4bc 100644 --- a/internal/dto/street_snap.go +++ b/internal/dto/street_snap.go @@ -62,12 +62,12 @@ type PublicStreetSnap struct { // PublicStreetSnapDetail 对外只读街拍详情：含完整图片集与主副图分组。 type PublicStreetSnapDetail struct { - UID string `json:"id"` - Title string `json:"title"` - Cover string `json:"cover"` - Images []PublicArticleImage `json:"images"` // 扁平图片集（保持不变，向后兼容） - Groups []PublicStreetSnapGroup `json:"groups,omitempty"` // 按主副图分组（主图→其副图），与 Images 同源同序 - Favorited bool `json:"favorited,omitempty"` // 已登录时该图集是否被当前用户收藏（gallery 级） + UID string `json:"id"` + Title string `json:"title"` + Cover string `json:"cover"` + Images []PublicArticleImage `json:"images"` // 扁平图片集（保持不变，向后兼容） + Groups []PublicStreetSnapGroup `json:"groups,omitempty"` // 按主副图分组（主图→其副图），与 Images 同源同序 + Favorited bool `json:"favorited,omitempty"` // 已登录时该图集是否被当前用户收藏（gallery 级） } // PublicStreetSnapGroup 一张主图及其副图，供前端按组折叠展示。 diff --git a/internal/model/street_snap.go b/internal/model/street_snap.go index 2ce3ccb..3f113f5 100644 --- a/internal/model/street_snap.go +++ b/internal/model/street_snap.go @@ -25,14 +25,14 @@ func (StreetSnap) TableName() string { return "street_snaps" } // // 仿 brand_runway_images，但把 runway_id 改名为 snap_id，去掉 brand_id（街拍无品牌关联）。 type StreetSnapImage struct { - ID uint32 `gorm:"primaryKey;column:id" json:"id"` - SnapID uint32 `gorm:"column:snap_id" json:"snap_id"` - Image string `gorm:"column:image" json:"image"` - Name string `gorm:"column:name" json:"name"` - SortOrder uint32 `gorm:"column:sort_order" json:"sort_order"` - IsDeleted uint8 `gorm:"column:is_deleted" json:"is_deleted"` - CreatedAt uint32 `gorm:"column:created_at" json:"created_at"` - UpdatedAt uint32 `gorm:"column:updated_at" json:"updated_at"` + ID uint32 `gorm:"primaryKey;column:id" json:"id"` + SnapID uint32 `gorm:"column:snap_id" json:"snap_id"` + Image string `gorm:"column:image" json:"image"` + Name string `gorm:"column:name" json:"name"` + SortOrder uint32 `gorm:"column:sort_order" json:"sort_order"` + IsDeleted uint8 `gorm:"column:is_deleted" json:"is_deleted"` + CreatedAt uint32 `gorm:"column:created_at" json:"created_at"` + UpdatedAt uint32 `gorm:"column:updated_at" json:"updated_at"` // 去重字段：见 BrandRunwayImage 注释。phash 为 vector(64) 二进制向量（NULL=无法解码）。 Phash sql.NullString `gorm:"column:phash;type:vector(64)" json:"phash"` diff --git a/internal/model/street_snap_draft.go b/internal/model/street_snap_draft.go index ee999a0..29ec8d8 100644 --- a/internal/model/street_snap_draft.go +++ b/internal/model/street_snap_draft.go @@ -30,14 +30,14 @@ func (StreetSnapDraft) TableName() string { return "street_snap_drafts" } // StreetSnapDraftImage 街拍草稿图片（对应 street_snap_draft_images）。 type StreetSnapDraftImage struct { - ID uint32 `gorm:"primaryKey;column:id" json:"id"` - DraftID uint32 `gorm:"column:draft_id" json:"draft_id"` - Image string `gorm:"column:image" json:"image"` - Name string `gorm:"column:name" json:"name"` - SortOrder uint32 `gorm:"column:sort_order" json:"sort_order"` - IsDeleted uint8 `gorm:"column:is_deleted" json:"is_deleted"` - CreatedAt uint32 `gorm:"column:created_at" json:"created_at"` - UpdatedAt uint32 `gorm:"column:updated_at" json:"updated_at"` + ID uint32 `gorm:"primaryKey;column:id" json:"id"` + DraftID uint32 `gorm:"column:draft_id" json:"draft_id"` + Image string `gorm:"column:image" json:"image"` + Name string `gorm:"column:name" json:"name"` + SortOrder uint32 `gorm:"column:sort_order" json:"sort_order"` + IsDeleted uint8 `gorm:"column:is_deleted" json:"is_deleted"` + CreatedAt uint32 `gorm:"column:created_at" json:"created_at"` + UpdatedAt uint32 `gorm:"column:updated_at" json:"updated_at"` // 去重字段：见 BrandRunwayImage 注释。phash 为 vector(64) 二进制向量（NULL=无法解码）。 Phash sql.NullString `gorm:"column:phash;type:vector(64)" json:"phash"` diff --git a/internal/repository/review_repository.go b/internal/repository/review_repository.go index f579d25..e56c57e 100644 --- a/internal/repository/review_repository.go +++ b/internal/repository/review_repository.go @@ -256,20 +256,20 @@ func (r *reviewRepository) SaveRunwayFromDraft(ctx context.Context, draftID uint if len(imgs) > 0 { rows := make([]model.BrandRunwayImage, 0, len(imgs)) for i, im := range imgs { - rows = append(rows, model.BrandRunwayImage{ - RunwayID: runwayID, - BrandID: draft.BrandID, - Image: im.Image, - Name: im.Name, - SortOrder: uint32(i + 1), - LookIndex: im.LookIndex, - IsDetail: im.IsDetail, - Phash: im.Phash, - IsDuplicate: im.IsDuplicate, - DupOf: im.DupOf, - CreatedAt: now, - UpdatedAt: now, - }) + rows = append(rows, model.BrandRunwayImage{ + RunwayID: runwayID, + BrandID: draft.BrandID, + Image: im.Image, + Name: im.Name, + SortOrder: uint32(i + 1), + LookIndex: im.LookIndex, + IsDetail: im.IsDetail, + Phash: im.Phash, + IsDuplicate: im.IsDuplicate, + DupOf: im.DupOf, + CreatedAt: now, + UpdatedAt: now, + }) } if cErr := tx.Create(&rows).Error; cErr != nil { return cErr diff --git a/internal/service/review_service.go b/internal/service/review_service.go index 26187d0..88b42c0 100644 --- a/internal/service/review_service.go +++ b/internal/service/review_service.go @@ -37,7 +37,7 @@ type DraftImageRef struct { SortOrder uint32 `json:"sort_order"` IsDetail uint8 `json:"is_detail"` // 1=副图（挂在 ParentImageID 指向的主图下）；0=主图 ParentImageID uint32 `json:"parent_image_id"` // 副图所属主图的行 id；主图为 0 - DetailCount int `json:"detail_count"` // 仅主图有意义：名下（存活）副图数量 + DetailCount int `json:"detail_count"` // 仅主图有意义：名下（存活）副图数量 } // EditField 审核详情页里可编辑字段的通用描述；详情页按此循环渲染输入框，