优化发布群租客清退与历史消息

backend/internal/modules/chat/listing_group.go

@@ -150,7 +150,8 @@ func AddRenterToListingConversation(tx *gorm.DB, listingID uint64, renterID uint
 		ParticipantType: "user",
 		ParticipantID:   renterID,
 		Role:            "renter",
-		JoinedAt:        now, // 关键: 记录加入时间,用于消息可见性过滤
+		JoinedAt:        now,
+		LastReadAt:      &now,
 	}
 
 	if err := tx.Clauses(clause.OnConflict{DoNothing: true}).Create(&participant).Error; err != nil {
@@ -183,17 +184,17 @@ func AddRenterToListingConversation(tx *gorm.DB, listingID uint64, renterID uint
 	return sendSystemMessage(tx, conv.ID, message)
 }
 
-// RemoveRenterFromListingConversation 移出租客
-func RemoveRenterFromListingConversation(tx *gorm.DB, listingID uint64, renterID uint64) error {
+// RemoveRenterFromListingConversation 移出租客，返回是否真的删除了租客成员记录。
+func RemoveRenterFromListingConversation(tx *gorm.DB, listingID uint64, renterID uint64) (bool, error) {
 	// 1. 查找发布群
 	var conv model.ChatConversation
 	err := tx.Where("listing_id = ?", listingID).First(&conv).Error
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			// 无发布群,跳过
-			return nil
+			return false, nil
 		}
-		return err
+		return false, err
 	}
 
 	// 2. 删除租客参与者记录
@@ -202,16 +203,19 @@ func RemoveRenterFromListingConversation(tx *gorm.DB, listingID uint64, renterID
 		Delete(&model.ChatParticipant{})
 
 	if result.Error != nil {
-		return result.Error
+		return false, result.Error
 	}
 
 	// 3. 发系统消息(如果确实删除了)
 	if result.RowsAffected > 0 {
 		message := "订单已结束，租客已退出群聊"
-		return sendSystemMessage(tx, conv.ID, message)
+		if err := sendSystemMessage(tx, conv.ID, message); err != nil {
+			return false, err
+		}
+		return true, nil
 	}
 
-	return nil
+	return false, nil
 }
 
 // 辅助函数

backend/internal/modules/chat/message.go

@@ -14,15 +14,11 @@ func (r *Repository) Messages(ctx context.Context, principal Principal, conversa
 	page, pageSize = normalizePagination(page, pageSize)
 	db := r.db.WithContext(ctx)
 
-	var participant *model.ChatParticipant
-
 	// 管理员可以查看任意会话的消息，普通用户需要是 participant
 	if principal.Type != "admin" {
-		p, err := r.findParticipant(db, principal, conversationID, false)
-		if err != nil {
+		if _, err := r.findParticipant(db, principal, conversationID, false); err != nil {
 			return nil, err
 		}
-		participant = p
 	} else {
 		// 管理员需要验证会话存在
 		var count int64
@@ -37,11 +33,6 @@ func (r *Repository) Messages(ctx context.Context, principal Principal, conversa
 	// 构建查询
 	query := db.Model(&model.ChatMessage{}).Where("conversation_id = ?", conversationID)
 
-	// 租客只能看到加入时间之后的消息
-	if principal.Type == "user" && participant != nil && participant.Role == "renter" {
-		query = query.Where("created_at >= ?", participant.JoinedAt)
-	}
-
 	var total int64
 	if err := query.Count(&total).Error; err != nil {
 		return nil, err

backend/internal/modules/order/checkout_finalize.go

@@ -4,7 +4,6 @@ import (
 	"time"
 
 	"hfb_sys/backend/internal/model"
-	"hfb_sys/backend/internal/modules/chat"
 	"hfb_sys/backend/internal/modules/notification"
 	"hfb_sys/backend/internal/modules/wallet"
 
@@ -40,12 +39,6 @@ func (r *Repository) finalizeCheckout(tx *gorm.DB, order *model.RentalOrder, che
 		return nil, err
 	}
 
-	// 订单完成,移出租客
-	if err := chat.RemoveRenterFromListingConversation(tx, listing.ID, order.RenterID); err != nil {
-		// 移出失败不阻塞订单完成,仅记录日志
-		// TODO: 添加日志
-	}
-
 	return refund, nil
 }
 

backend/internal/modules/order/lifecycle.go

@@ -244,8 +244,10 @@ func (r *Repository) Cancel(ctx context.Context, userID uint64, orderID uint64)
 		}
 
 		beforeStatus := order.Status
+		now := time.Now()
 		order.Status = orderStatusCancelled
 		order.HandoffStatus = handoffStatusCancelled
+		order.SettledAt = &now
 		orderID := order.ID
 		if beforeStatus == orderStatusPendingHandoff {
 			totalCent := order.RentAmountCent + order.DepositAmountCent
@@ -280,13 +282,6 @@ func (r *Repository) Cancel(ctx context.Context, userID uint64, orderID uint64)
 			return err
 		}
 
-		// 订单取消,移出租客(仅付款后取消需要移出)
-		if beforeStatus == orderStatusPendingHandoff {
-			if err := chat.RemoveRenterFromListingConversation(tx, listing.ID, order.RenterID); err != nil {
-				// 移出失败不阻塞订单取消
-			}
-		}
-
 		if err := tx.Save(&order).Error; err != nil {
 			return err
 		}

backend/internal/modules/systemconfig/repository.go

@@ -38,6 +38,7 @@ var defaultConfigs = []defaultConfig{
 	{Key: "chat.default_support_admin_id", Value: "2", Description: "默认客服 ID（必须是启用状态的客服角色）"},
 	{Key: "chat.auto_welcome_message", Value: "欢迎加入订单群聊！如有任何问题，请随时沟通。", Description: "建群后自动发送的欢迎话术"},
 	{Key: "chat.listing_group_welcome", Value: "欢迎加入账号群！请号主扫描下方二维码加入企业微信群，方便客服与您及时联系。", Description: "发布群创建后自动发送的欢迎语"},
+	{Key: "chat.renter_retention_days_after_order_end", Value: "5", Description: "订单结束后租客保留在发布群的天数（3-7）"},
 	{Key: homeAnnouncementsConfigKey, Value: defaultHomeAnnouncementsConfigValue(), Description: "移动端首页公告 JSON 数组"},
 	{Key: homeBannersConfigKey, Value: defaultHomeBannersConfigValue(), Description: "移动端首页轮播图 JSON 数组"},
 	{Key: publishOptionsConfigKey, Value: defaultPublishOptionsConfigValue(), Description: "发布页选项配置 JSON"},
@@ -48,6 +49,7 @@ var adminVisibleConfigKeys = []string{
 	"chat.auto_welcome_message",
 	"chat.default_support_admin_id",
 	"chat.listing_group_welcome",
+	"chat.renter_retention_days_after_order_end",
 	"handoff.owner_return_confirm_timeout_minutes",
 	"handoff.owner_submit_timeout_minutes",
 	"handoff.renter_confirm_timeout_minutes",