feat(listings): 足迹与收藏改为账号同步并新增后端表与接口

2026-10-30 18:12:00 +08:00
parent 82352444d5
commit 82abc05b21
8 changed files with 641 additions and 44 deletions
@@ -0,0 +1,24 @@
+package model
+
+import "time"
+
+const (
+	ListingCollectionKindHistory  = "history"
+	ListingCollectionKindFavorite = "favorite"
+)
+
+// ListingCollection 记录用户对商品的浏览足迹或收藏关系。
+// 同一用户 + 商品 + 类型唯一，重复浏览只更新时间，不新增行。
+type ListingCollection struct {
+	ID         uint64    `gorm:"primaryKey" json:"id"`
+	UserID     uint64    `gorm:"not null;uniqueIndex:uk_listing_collections_user_listing_kind,priority:1;index:idx_listing_collections_user_kind_time,priority:1" json:"user_id"`
+	ListingID  uint64    `gorm:"not null;uniqueIndex:uk_listing_collections_user_listing_kind,priority:2;index:idx_listing_collections_user_kind_time,priority:3;index:idx_listing_collections_listing" json:"listing_id"`
+	Kind       string    `gorm:"size:16;not null;uniqueIndex:uk_listing_collections_user_listing_kind,priority:3;index:idx_listing_collections_user_kind_time,priority:2" json:"kind"`
+	OccurredAt time.Time `gorm:"not null;index:idx_listing_collections_user_kind_time,priority:4" json:"occurred_at"`
+	CreatedAt  time.Time `json:"created_at"`
+	UpdatedAt  time.Time `json:"updated_at"`
+}
+
+func (ListingCollection) TableName() string {
+	return "listing_collections"
+}
@@ -0,0 +1,233 @@
+package listing
+
+import (
+	"context"
+	"errors"
+	"time"
+
+	"hfb_sys/backend/internal/model"
+
+	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
+)
+
+const (
+	// CollectionKindHistory 浏览记录；CollectionKindFavorite 收藏。
+	CollectionKindHistory  = "history"
+	CollectionKindFavorite = "favorite"
+
+	maxCollectionItems = 100
+)
+
+var ErrCollectionKindInvalid = errors.New("invalid collection kind")
+
+type collectionEntry struct {
+	ListingID  uint64
+	OccurredAt time.Time
+}
+
+// CollectionItem 返回给前端的足迹项：商品快照 + 发生时间。
+type CollectionItem struct {
+	Listing    ListingDTO `json:"listing"`
+	OccurredAt time.Time  `json:"occurred_at"`
+}
+
+type CollectionCounts struct {
+	History  int64 `json:"history"`
+	Favorite int64 `json:"favorite"`
+}
+
+type CollectionList struct {
+	Items  []CollectionItem `json:"items"`
+	Counts CollectionCounts `json:"counts"`
+}
+
+func validCollectionKind(kind string) bool {
+	return kind == CollectionKindHistory || kind == CollectionKindFavorite
+}
+
+// UpsertCollection 写入浏览或收藏记录；同一用户+商品+类型只更新时间。
+func (r *Repository) UpsertCollection(ctx context.Context, userID, listingID uint64, kind string) error {
+	now := time.Now()
+	entry := model.ListingCollection{
+		UserID:     userID,
+		ListingID:  listingID,
+		Kind:       kind,
+		OccurredAt: now,
+	}
+	return r.db.WithContext(ctx).Clauses(clause.OnConflict{
+		Columns: []clause.Column{{Name: "user_id"}, {Name: "listing_id"}, {Name: "kind"}},
+		DoUpdates: clause.Assignments(map[string]any{
+			"occurred_at": now,
+			"updated_at":  now,
+		}),
+	}).Create(&entry).Error
+}
+
+func (r *Repository) DeleteCollection(ctx context.Context, userID, listingID uint64, kind string) error {
+	return r.db.WithContext(ctx).
+		Where("user_id = ? AND listing_id = ? AND kind = ?", userID, listingID, kind).
+		Delete(&model.ListingCollection{}).Error
+}
+
+func (r *Repository) ClearCollection(ctx context.Context, userID uint64, kind string) error {
+	return r.db.WithContext(ctx).
+		Where("user_id = ? AND kind = ?", userID, kind).
+		Delete(&model.ListingCollection{}).Error
+}
+
+func (r *Repository) ListCollectionEntries(ctx context.Context, userID uint64, kind string, limit int) ([]collectionEntry, error) {
+	if limit <= 0 || limit > maxCollectionItems {
+		limit = maxCollectionItems
+	}
+	var rows []model.ListingCollection
+	if err := r.db.WithContext(ctx).
+		Select("listing_id, occurred_at").
+		Where("user_id = ? AND kind = ?", userID, kind).
+		Order("occurred_at DESC, id DESC").
+		Limit(limit).
+		Find(&rows).Error; err != nil {
+		return nil, err
+	}
+	entries := make([]collectionEntry, 0, len(rows))
+	for _, row := range rows {
+		entries = append(entries, collectionEntry{ListingID: row.ListingID, OccurredAt: row.OccurredAt})
+	}
+	return entries, nil
+}
+
+func (r *Repository) CountCollections(ctx context.Context, userID uint64) (CollectionCounts, error) {
+	var rows []struct {
+		Kind  string
+		Total int64
+	}
+	if err := r.db.WithContext(ctx).
+		Model(&model.ListingCollection{}).
+		Select("kind, COUNT(*) AS total").
+		Where("user_id = ?", userID).
+		Group("kind").
+		Scan(&rows).Error; err != nil {
+		return CollectionCounts{}, err
+	}
+	counts := CollectionCounts{}
+	for _, row := range rows {
+		switch row.Kind {
+		case CollectionKindHistory:
+			counts.History = row.Total
+		case CollectionKindFavorite:
+			counts.Favorite = row.Total
+		}
+	}
+	return counts, nil
+}
+
+func (r *Repository) ListingExists(ctx context.Context, listingID uint64) (bool, error) {
+	var count int64
+	if err := r.db.WithContext(ctx).
+		Model(&model.RentalListing{}).
+		Where("id = ?", listingID).
+		Count(&count).Error; err != nil {
+		return false, err
+	}
+	return count > 0, nil
+}
+
+// listingsByIDs 复用公开列表的联表与出图逻辑，保证足迹页展示与详情页一致。
+func (r *Repository) listingsByIDs(ctx context.Context, ids []uint64) (map[uint64]ListingDTO, error) {
+	result := make(map[uint64]ListingDTO, len(ids))
+	if len(ids) == 0 {
+		return result, nil
+	}
+	var rows []listingRow
+	if err := r.baseQuery(ctx).Where("l.id IN ?", ids).Scan(&rows).Error; err != nil {
+		return nil, err
+	}
+	for _, item := range publicListings(rowsToDTO(rows)) {
+		result[item.ID] = item
+	}
+	return result, nil
+}
+
+func (s *Service) RecordCollectionView(ctx context.Context, userID, listingID uint64) error {
+	if s.repo == nil {
+		return ErrDependencyUnavailable
+	}
+	exists, err := s.repo.ListingExists(ctx, listingID)
+	if err != nil {
+		return err
+	}
+	if !exists {
+		return gorm.ErrRecordNotFound
+	}
+	return s.repo.UpsertCollection(ctx, userID, listingID, CollectionKindHistory)
+}
+
+func (s *Service) AddCollectionFavorite(ctx context.Context, userID, listingID uint64) error {
+	if s.repo == nil {
+		return ErrDependencyUnavailable
+	}
+	exists, err := s.repo.ListingExists(ctx, listingID)
+	if err != nil {
+		return err
+	}
+	if !exists {
+		return gorm.ErrRecordNotFound
+	}
+	return s.repo.UpsertCollection(ctx, userID, listingID, CollectionKindFavorite)
+}
+
+func (s *Service) RemoveCollectionFavorite(ctx context.Context, userID, listingID uint64) error {
+	if s.repo == nil {
+		return ErrDependencyUnavailable
+	}
+	return s.repo.DeleteCollection(ctx, userID, listingID, CollectionKindFavorite)
+}
+
+func (s *Service) RemoveCollectionHistory(ctx context.Context, userID, listingID uint64) error {
+	if s.repo == nil {
+		return ErrDependencyUnavailable
+	}
+	return s.repo.DeleteCollection(ctx, userID, listingID, CollectionKindHistory)
+}
+
+func (s *Service) ClearCollectionHistory(ctx context.Context, userID uint64) error {
+	if s.repo == nil {
+		return ErrDependencyUnavailable
+	}
+	return s.repo.ClearCollection(ctx, userID, CollectionKindHistory)
+}
+
+func (s *Service) ListCollections(ctx context.Context, userID uint64, kind string) (*CollectionList, error) {
+	if s.repo == nil {
+		return nil, ErrDependencyUnavailable
+	}
+	if !validCollectionKind(kind) {
+		return nil, ErrCollectionKindInvalid
+	}
+	entries, err := s.repo.ListCollectionEntries(ctx, userID, kind, maxCollectionItems)
+	if err != nil {
+		return nil, err
+	}
+	ids := make([]uint64, 0, len(entries))
+	for _, entry := range entries {
+		ids = append(ids, entry.ListingID)
+	}
+	listings, err := s.repo.listingsByIDs(ctx, ids)
+	if err != nil {
+		return nil, err
+	}
+	items := make([]CollectionItem, 0, len(entries))
+	for _, entry := range entries {
+		listing, ok := listings[entry.ListingID]
+		if !ok {
+			// 商品被物理删除时跳过，避免整页 500。
+			continue
+		}
+		items = append(items, CollectionItem{Listing: listing, OccurredAt: entry.OccurredAt})
+	}
+	counts, err := s.repo.CountCollections(ctx, userID)
+	if err != nil {
+		return nil, err
+	}
+	return &CollectionList{Items: items, Counts: counts}, nil
+}
@@ -0,0 +1,133 @@
+package listing
+
+import (
+	"errors"
+	"strconv"
+
+	"hfb_sys/backend/pkg/response"
+
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+)
+
+func parseListingIDParam(c *gin.Context) (uint64, bool) {
+	id, err := strconv.ParseUint(c.Param("listingId"), 10, 64)
+	if err != nil || id == 0 {
+		response.BadRequest(c, "商品 ID 不正确")
+		return 0, false
+	}
+	return id, true
+}
+
+func writeCollectionError(c *gin.Context, err error) {
+	switch {
+	case errors.Is(err, ErrCollectionKindInvalid):
+		response.BadRequest(c, "足迹类型不正确")
+	case errors.Is(err, gorm.ErrRecordNotFound):
+		response.NotFound(c, "商品不存在或已删除")
+	default:
+		writeListingError(c, err)
+	}
+}
+
+func (h *Handler) ListCollections(c *gin.Context) {
+	userID, ok := currentUserID(c)
+	if !ok {
+		response.Unauthorized(c, "缺少用户上下文")
+		return
+	}
+	kind := c.DefaultQuery("kind", CollectionKindHistory)
+	result, err := h.service.ListCollections(c.Request.Context(), userID, kind)
+	if err != nil {
+		writeCollectionError(c, err)
+		return
+	}
+	response.OK(c, result)
+}
+
+type collectionBody struct {
+	ListingID uint64 `json:"listing_id" binding:"required"`
+}
+
+func (h *Handler) RecordCollectionView(c *gin.Context) {
+	userID, ok := currentUserID(c)
+	if !ok {
+		response.Unauthorized(c, "缺少用户上下文")
+		return
+	}
+	var req collectionBody
+	if err := c.ShouldBindJSON(&req); err != nil {
+		response.BadRequest(c, "商品 ID 不正确")
+		return
+	}
+	if err := h.service.RecordCollectionView(c.Request.Context(), userID, req.ListingID); err != nil {
+		writeCollectionError(c, err)
+		return
+	}
+	response.OK(c, gin.H{"recorded": true})
+}
+
+func (h *Handler) AddCollectionFavorite(c *gin.Context) {
+	userID, ok := currentUserID(c)
+	if !ok {
+		response.Unauthorized(c, "缺少用户上下文")
+		return
+	}
+	var req collectionBody
+	if err := c.ShouldBindJSON(&req); err != nil {
+		response.BadRequest(c, "商品 ID 不正确")
+		return
+	}
+	if err := h.service.AddCollectionFavorite(c.Request.Context(), userID, req.ListingID); err != nil {
+		writeCollectionError(c, err)
+		return
+	}
+	response.OK(c, gin.H{"favorited": true})
+}
+
+func (h *Handler) RemoveCollectionFavorite(c *gin.Context) {
+	userID, ok := currentUserID(c)
+	if !ok {
+		response.Unauthorized(c, "缺少用户上下文")
+		return
+	}
+	listingID, ok := parseListingIDParam(c)
+	if !ok {
+		return
+	}
+	if err := h.service.RemoveCollectionFavorite(c.Request.Context(), userID, listingID); err != nil {
+		writeCollectionError(c, err)
+		return
+	}
+	response.OK(c, gin.H{"deleted": true})
+}
+
+func (h *Handler) RemoveCollectionHistory(c *gin.Context) {
+	userID, ok := currentUserID(c)
+	if !ok {
+		response.Unauthorized(c, "缺少用户上下文")
+		return
+	}
+	listingID, ok := parseListingIDParam(c)
+	if !ok {
+		return
+	}
+	if err := h.service.RemoveCollectionHistory(c.Request.Context(), userID, listingID); err != nil {
+		writeCollectionError(c, err)
+		return
+	}
+	response.OK(c, gin.H{"deleted": true})
+}
+
+func (h *Handler) ClearCollectionHistory(c *gin.Context) {
+	userID, ok := currentUserID(c)
+	if !ok {
+		response.Unauthorized(c, "缺少用户上下文")
+		return
+	}
+	if err := h.service.ClearCollectionHistory(c.Request.Context(), userID); err != nil {
+		writeCollectionError(c, err)
+		return
+	}
+	response.OK(c, gin.H{"cleared": true})
+}
@@ -502,6 +502,17 @@ func New(cfg config.Config, deps Dependencies, logger *zap.Logger) *gin.Engine {
 			listingRoutes.DELETE("/:id", requireAuth, requireRealname, listingHandler.Offline)
 		}

+		// 我的足迹与收藏：跟账号走，登录后跨设备同步；未登录时前端回落本地存储。
+		collectionRoutes := api.Group("/me/listing-collections", requireAuth)
+		{
+			collectionRoutes.GET("", listingHandler.ListCollections)
+			collectionRoutes.POST("/view", listingHandler.RecordCollectionView)
+			collectionRoutes.POST("/favorites", listingHandler.AddCollectionFavorite)
+			collectionRoutes.DELETE("/favorites/:listingId", listingHandler.RemoveCollectionFavorite)
+			collectionRoutes.DELETE("/history", listingHandler.ClearCollectionHistory)
+			collectionRoutes.DELETE("/history/:listingId", listingHandler.RemoveCollectionHistory)
+		}
+
 		sellerRoutes := api.Group("/seller", requireAuth, requireRealname)
 		{
 			sellerRoutes.GET("/listings", listingHandler.ListMine)
@@ -0,0 +1,21 @@
+-- +goose Up
+
+-- 用户足迹与收藏：跟账号走，不再只存在浏览器本地。
+-- kind=history 由商品详情页浏览上报，kind=favorite 由收藏按钮切换。
+CREATE TABLE IF NOT EXISTS listing_collections (
+  id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+  user_id BIGINT UNSIGNED NOT NULL,
+  listing_id BIGINT UNSIGNED NOT NULL,
+  kind VARCHAR(16) NOT NULL COMMENT 'history=浏览记录, favorite=收藏',
+  occurred_at DATETIME NOT NULL COMMENT '最近一次浏览或收藏时间',
+  created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (id),
+  UNIQUE KEY uk_listing_collections_user_listing_kind (user_id, listing_id, kind),
+  KEY idx_listing_collections_user_kind_time (user_id, kind, occurred_at),
+  KEY idx_listing_collections_listing (listing_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户浏览足迹与收藏';
+
+-- +goose Down
+
+DROP TABLE IF EXISTS listing_collections;