feat: add global system notices and Beijing order time display

2026-10-22 21:56:07 +08:00
parent 9bb479b506
commit 8ce67648b1
22 changed files with 581 additions and 121 deletions
@@ -22,7 +22,7 @@ type Repository interface {
 	PublishedContent(context.Context, int64, string) (*store.Content, error)
 	ActiveMemberLevels(context.Context, int64) ([]store.MemberLevel, error)
 	ActiveMemberNotices(context.Context, int64, int64, int) ([]store.MemberNotice, error)
-	LatestPopupNotice(context.Context, int64, int64) (*store.MemberNotice, error)
+	NextUnreadMemberNotice(context.Context, int64, int64) (*store.MemberNotice, error)
 	MarkMemberNoticeRead(context.Context, int64, int64, int64) error
 	MemberNotices(context.Context, int64, int64, int, int) (*store.MemberNoticePage, error)
 	MemberTaskSummary(context.Context, int64, int64) (*store.TaskSummary, error)
@@ -220,6 +220,16 @@ func (s *Service) PopupNotice(ctx context.Context, tenantID, memberID int64) (*N
 		SourceType: "managed_content", CreatedAt: row.PublishedAt}, nil
 }

+func (s *Service) PendingNotice(ctx context.Context, tenantID, memberID int64) (*Notice, error) {
+	row, err := s.repository.NextUnreadMemberNotice(ctx, tenantID, memberID)
+	if err != nil || row == nil {
+		return nil, err
+	}
+	return &Notice{ID: row.ID, Title: row.Title, Content: row.Content,
+		SourceType: noticeSourceName(row.SourceType), StartAt: row.StartAt,
+		EndAt: row.EndAt, CreatedAt: row.CreatedAt}, nil
+}
+
 func (s *Service) MarkNoticeRead(ctx context.Context, tenantID, memberID, noticeID int64) error {
 	return s.repository.MarkMemberNoticeRead(ctx, tenantID, memberID, noticeID)
 }