feat: 完善移动端会员业务流程

internal/portal/service.go

@@ -7,8 +7,8 @@ import (
 	"regexp"
 	"strings"
 
-	"git.118im.com/im_team/im_workbench/internal/accounts"
-	"git.118im.com/im_team/im_workbench/internal/store"
+	"git.118im.com/im_team/olons_server/internal/accounts"
+	"git.118im.com/im_team/olons_server/internal/store"
 )
 
 var (
@@ -22,6 +22,8 @@ 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)
+	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)
 	TaskLeaderboard(context.Context, int64, int) ([]store.LeaderboardMember, error)
@@ -203,6 +205,20 @@ func (s *Service) Notices(ctx context.Context, tenantID, memberID int64, page, p
 	return &NoticePage{Items: items, Page: page, PageSize: pageSize, Total: rows.Total}, nil
 }
 
+func (s *Service) PopupNotice(ctx context.Context, tenantID, memberID int64) (*Notice, error) {
+	row, err := s.repository.LatestPopupNotice(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)
+}
+
 func (s *Service) Content(ctx context.Context, tenantID int64, key string) (*Content, error) {
 	key = strings.ToLower(strings.TrimSpace(key))
 	if !contentKeyPattern.MatchString(key) {