无数据 / No data.
" + } + + var rows strings.Builder + for _, line := range stmt.Lines { + billingMode := billingStatementBillingModeLabel(line.BillingMode) + groupStr := "-" + if strings.TrimSpace(line.GroupName) != "" { + groupStr = strings.TrimSpace(line.GroupName) + } else if line.GroupID != nil { + groupStr = fmt.Sprintf("#%d", *line.GroupID) + } + subStr := "-" + if line.Subscription != nil { + subStr = fmt.Sprintf("#%d", *line.Subscription) + } + _, _ = rows.WriteString(fmt.Sprintf( + "致 %s：
To %s:
时间段 / Period: %s ~ %s (%s)
+| 模型 / Model | 计费模式 / Billing Mode | 分组 / Group | 订阅 / Subscription | 请求数 / Requests | Token 数 / Tokens | 标准价格 / Standard Price | 实际价格 / Actual Price | 优惠差额 / Discount |
|---|
标准总价 / Total Cost: $%.4f
+实际总价 / Actual Cost: $%.4f
+优惠总额 / Total Discount: $%.4f
+账户余额 / Balance: $%.4f
+无数据 / No data.
" { + t.Errorf("expected no-data HTML for nil statement") + } +} + +func TestBuildBillingStatementEmailHTML_Basic(t *testing.T) { + gid := int64(1) + stmt := &BillingStatement{ + UserID: 1, + UserEmail: "test@example.com", + PeriodName: "日账单", + Start: time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC), + End: time.Date(2025, 1, 2, 0, 0, 0, 0, time.UTC), + Lines: []BillingStatementLine{ + { + Model: "claude-sonnet-4-20250514", + BillingMode: "token", + GroupID: &gid, + Requests: 10, + TotalTokens: 50000, + TotalCost: 1.5, + ActualCost: 1.2, + Discount: 0.3, + }, + }, + TotalCost: 1.5, + ActualCost: 1.2, + Discount: 0.3, + Balance: 8.5, + } + html := buildBillingStatementEmailHTML(stmt) + if html == "" { + t.Error("expected non-empty HTML") + } + // Check key content is present + if !containsStr(html, "日账单") { + t.Error("expected period name in HTML") + } + if !containsStr(html, "致 test@example.com") || !containsStr(html, "To test@example.com") { + t.Error("expected recipient greeting in HTML") + } + if !containsStr(html, "claude-sonnet-4-20250514") { + t.Error("expected model name in HTML") + } + if !containsStr(html, "$1.5000") { + t.Error("expected total cost in HTML") + } + if !containsStr(html, "$8.5000") { + t.Error("expected balance in HTML") + } +} + +func containsStr(s, substr string) bool { + return len(s) > 0 && len(substr) > 0 && (s == substr || len(s) > len(substr) && findSubstr(s, substr)) +} + +func findSubstr(s, substr string) bool { + for i := 0; i <= len(s)-len(substr); i++ { + if s[i:i+len(substr)] == substr { + return true + } + } + return false +} diff --git a/backend/internal/service/domain_constants.go b/backend/internal/service/domain_constants.go index 8eb90a6ba24..a921facb1f0 100644 --- a/backend/internal/service/domain_constants.go +++ b/backend/internal/service/domain_constants.go @@ -382,6 +382,15 @@ const ( // Web Search Emulation SettingKeyWebSearchEmulationConfig = "web_search_emulation_config" // JSON 配置 + + // User Timezone Preference (用户时区偏好) + SettingKeyUserTimezonePrefix = "user_timezone:" // + userID + + // Billing Statement Email (账单邮件) + SettingKeyBillingStatementEmailConfig = "billing_statement_email_config" // JSON 配置 + + // Billing Statement User Preference (用户账单邮件偏好) + SettingKeyBillingStatementUserPreferencePrefix = "billing_statement_user_pref:" // + userID ) // AdminAPIKeyPrefix is the prefix for admin API keys (distinct from user "sk-" keys). diff --git a/backend/internal/service/setting_service.go b/backend/internal/service/setting_service.go index 283a239b8d1..8e6cc376dc2 100644 --- a/backend/internal/service/setting_service.go +++ b/backend/internal/service/setting_service.go @@ -19,6 +19,7 @@ import ( "github.com/Wei-Shaw/sub2api/internal/config" infraerrors "github.com/Wei-Shaw/sub2api/internal/pkg/errors" + "github.com/Wei-Shaw/sub2api/internal/pkg/timezone" "github.com/imroc/req/v3" "golang.org/x/sync/singleflight" ) @@ -627,6 +628,7 @@ func (s *SettingService) GetPublicSettings(ctx context.Context) (*PublicSettings SettingKeyAvailableChannelsEnabled, SettingKeyAffiliateEnabled, SettingKeyRiskControlEnabled, + SettingKeyBillingStatementEmailConfig, } settings, err := s.settingRepo.GetMultiple(ctx, keys) @@ -677,6 +679,8 @@ func (s *SettingService) GetPublicSettings(ctx context.Context) (*PublicSettings if v, err := strconv.ParseFloat(settings[SettingKeyBalanceLowNotifyThreshold], 64); err == nil && v >= 0 { balanceLowNotifyThreshold = v } + billingStatementCfg := ParseBillingStatementEmailConfig(settings[SettingKeyBillingStatementEmailConfig]) + billingStatementEnabled := billingStatementCfg.Enabled return &PublicSettings{ RegistrationEnabled: settings[SettingKeyRegistrationEnabled] == "true", @@ -728,13 +732,29 @@ func (s *SettingService) GetPublicSettings(ctx context.Context) (*PublicSettings ChannelMonitorDefaultIntervalSeconds: parseChannelMonitorInterval(settings[SettingKeyChannelMonitorDefaultIntervalSeconds]), AvailableChannelsEnabled: settings[SettingKeyAvailableChannelsEnabled] == "true", - - AffiliateEnabled: settings[SettingKeyAffiliateEnabled] == "true", - - RiskControlEnabled: settings[SettingKeyRiskControlEnabled] == "true", + AffiliateEnabled: settings[SettingKeyAffiliateEnabled] == "true", + RiskControlEnabled: settings[SettingKeyRiskControlEnabled] == "true", + + BillingStatementEmailEnabled: billingStatementEnabled, + BillingStatementDailyEnabled: billingStatementEnabled && billingStatementCfg.DailyEnabled, + BillingStatementWeeklyEnabled: billingStatementEnabled && billingStatementCfg.WeeklyEnabled, + BillingStatementMonthlyEnabled: billingStatementEnabled && billingStatementCfg.MonthlyEnabled, + ServerTimezone: defaultPublicServerTimezone(), }, nil } +func defaultPublicServerTimezone() string { + if name := strings.TrimSpace(timezone.Name()); name != "" && name != "Local" { + return name + } + if loc := timezone.Location(); loc != nil { + if name := strings.TrimSpace(loc.String()); name != "" && name != "Local" { + return name + } + } + return "UTC" +} + // channelMonitorIntervalMin / channelMonitorIntervalMax bound the default interval // (mirrors the monitor-level constraint but lives here so setting_service stays decoupled). const ( @@ -882,11 +902,16 @@ type PublicSettingsInjectionPayload struct { // Feature flags — MUST match the opt-in/opt-out registry in // frontend/src/utils/featureFlags.ts. Missing a field here is the bug // that hid the "可用渠道" menu on page refresh. - ChannelMonitorEnabled bool `json:"channel_monitor_enabled"` - ChannelMonitorDefaultIntervalSeconds int `json:"channel_monitor_default_interval_seconds"` - AvailableChannelsEnabled bool `json:"available_channels_enabled"` - AffiliateEnabled bool `json:"affiliate_enabled"` - RiskControlEnabled bool `json:"risk_control_enabled"` + ChannelMonitorEnabled bool `json:"channel_monitor_enabled"` + ChannelMonitorDefaultIntervalSeconds int `json:"channel_monitor_default_interval_seconds"` + AvailableChannelsEnabled bool `json:"available_channels_enabled"` + AffiliateEnabled bool `json:"affiliate_enabled"` + RiskControlEnabled bool `json:"risk_control_enabled"` + BillingStatementEmailEnabled bool `json:"billing_statement_email_enabled"` + BillingStatementDailyEnabled bool `json:"billing_statement_daily_enabled"` + BillingStatementWeeklyEnabled bool `json:"billing_statement_weekly_enabled"` + BillingStatementMonthlyEnabled bool `json:"billing_statement_monthly_enabled"` + ServerTimezone string `json:"server_timezone"` } // GetPublicSettingsForInjection returns public settings in a format suitable for HTML injection. @@ -948,6 +973,11 @@ func (s *SettingService) GetPublicSettingsForInjection(ctx context.Context) (any AvailableChannelsEnabled: settings.AvailableChannelsEnabled, AffiliateEnabled: settings.AffiliateEnabled, RiskControlEnabled: settings.RiskControlEnabled, + BillingStatementEmailEnabled: settings.BillingStatementEmailEnabled, + BillingStatementDailyEnabled: settings.BillingStatementDailyEnabled, + BillingStatementWeeklyEnabled: settings.BillingStatementWeeklyEnabled, + BillingStatementMonthlyEnabled: settings.BillingStatementMonthlyEnabled, + ServerTimezone: settings.ServerTimezone, }, nil } @@ -1597,6 +1627,10 @@ func (s *SettingService) buildSystemSettingsUpdates(ctx context.Context, setting updates[SettingKeyAccountQuotaNotifyEnabled] = strconv.FormatBool(settings.AccountQuotaNotifyEnabled) updates[SettingKeyAccountQuotaNotifyEmails] = MarshalNotifyEmails(settings.AccountQuotaNotifyEmails) + if settings.BillingStatementEmailConfig != "" { + updates[SettingKeyBillingStatementEmailConfig] = settings.BillingStatementEmailConfig + } + return updates, nil } @@ -2764,6 +2798,8 @@ func (s *SettingService) parseSettings(settings map[string]string) *SystemSettin result.AccountQuotaNotifyEmails = []NotifyEmailEntry{} } + result.BillingStatementEmailConfig = settings[SettingKeyBillingStatementEmailConfig] + return result } diff --git a/backend/internal/service/settings_view.go b/backend/internal/service/settings_view.go index 80b8b32a901..a02be6febf1 100644 --- a/backend/internal/service/settings_view.go +++ b/backend/internal/service/settings_view.go @@ -193,6 +193,9 @@ type SystemSettings struct { // Account quota notification AccountQuotaNotifyEnabled bool AccountQuotaNotifyEmails []NotifyEmailEntry + + // Billing statement email config (JSON) + BillingStatementEmailConfig string } type DefaultSubscriptionSetting struct { @@ -262,6 +265,14 @@ type PublicSettings struct { // 风控中心功能开关 RiskControlEnabled bool `json:"risk_control_enabled"` + + // User-facing billing statement email availability. These expose only whether + // each period is globally available, not the admin cron schedule. + BillingStatementEmailEnabled bool `json:"billing_statement_email_enabled"` + BillingStatementDailyEnabled bool `json:"billing_statement_daily_enabled"` + BillingStatementWeeklyEnabled bool `json:"billing_statement_weekly_enabled"` + BillingStatementMonthlyEnabled bool `json:"billing_statement_monthly_enabled"` + ServerTimezone string `json:"server_timezone"` } type LoginAgreementDocument struct { diff --git a/backend/internal/service/user.go b/backend/internal/service/user.go index f98336111ba..d3a523976fd 100644 --- a/backend/internal/service/user.go +++ b/backend/internal/service/user.go @@ -58,6 +58,12 @@ type User struct { // 避免每请求查 DB。字段不持久化到数据库。 UserGroupRPMOverride *int + // 账单邮件偏好（不持久化到 users 表，从 setting 表 hydrate） + BillingStatementDailyEnabled bool + BillingStatementWeeklyEnabled bool + BillingStatementMonthlyEnabled bool + Timezone string + APIKeys []APIKey Subscriptions []UserSubscription } diff --git a/backend/internal/service/user_service.go b/backend/internal/service/user_service.go index f84e6f0ab06..f22ed9c3346 100644 --- a/backend/internal/service/user_service.go +++ b/backend/internal/service/user_service.go @@ -7,6 +7,7 @@ import ( "crypto/subtle" "encoding/base64" "encoding/hex" + "encoding/json" "fmt" infraerrors "github.com/Wei-Shaw/sub2api/internal/pkg/errors" "github.com/Wei-Shaw/sub2api/internal/pkg/pagination" @@ -24,6 +25,7 @@ import ( "sync" "time" + "github.com/Wei-Shaw/sub2api/internal/pkg/timezone" xdraw "golang.org/x/image/draw" "golang.org/x/sync/singleflight" ) @@ -173,6 +175,12 @@ type UpdateProfileRequest struct { Concurrency *int `json:"concurrency"` BalanceNotifyEnabled *bool `json:"balance_notify_enabled"` BalanceNotifyThreshold *float64 `json:"balance_notify_threshold"` + Timezone *string `json:"timezone"` + + // Billing statement email preferences + BillingStatementDailyEnabled *bool `json:"billing_statement_daily_enabled"` + BillingStatementWeeklyEnabled *bool `json:"billing_statement_weekly_enabled"` + BillingStatementMonthlyEnabled *bool `json:"billing_statement_monthly_enabled"` } type UserAvatar struct { @@ -242,6 +250,8 @@ func (s *UserService) GetProfile(ctx context.Context, userID int64) (*User, erro if err := s.hydrateUserAvatar(ctx, user); err != nil { return nil, fmt.Errorf("get user avatar: %w", err) } + s.hydrateBillingStatementPreference(ctx, user) + s.hydrateUserTimezone(ctx, user) return user, nil } @@ -454,10 +464,147 @@ func (s *UserService) updateProfile(ctx context.Context, userID int64, req Updat if err := s.userRepo.Update(ctx, user); err != nil { return nil, oldConcurrency, fmt.Errorf("update user: %w", err) } + if req.Timezone != nil { + if err := s.updateUserTimezone(ctx, userID, *req.Timezone); err != nil { + return nil, oldConcurrency, fmt.Errorf("update user timezone: %w", err) + } + } + + // Update billing statement preferences if any field is provided + if req.BillingStatementDailyEnabled != nil || req.BillingStatementWeeklyEnabled != nil || req.BillingStatementMonthlyEnabled != nil { + if err := s.updateBillingStatementPreference(ctx, userID, req); err != nil { + return nil, oldConcurrency, fmt.Errorf("update billing statement preference: %w", err) + } + } + s.hydrateBillingStatementPreference(ctx, user) + s.hydrateUserTimezone(ctx, user) return user, oldConcurrency, nil } +// hydrateBillingStatementPreference reads the user's billing statement preference from settings +// and populates the User struct fields. Defaults to all-disabled if not found. +func (s *UserService) hydrateBillingStatementPreference(ctx context.Context, user *User) { + if user == nil || s.settingRepo == nil { + return + } + key := SettingKeyBillingStatementUserPreferencePrefix + strconv.FormatInt(user.ID, 10) + raw, err := s.settingRepo.GetValue(ctx, key) + if err != nil || strings.TrimSpace(raw) == "" { + pref := DefaultBillingStatementUserPreference() + user.BillingStatementDailyEnabled = pref.DailyEnabled + user.BillingStatementWeeklyEnabled = pref.WeeklyEnabled + user.BillingStatementMonthlyEnabled = pref.MonthlyEnabled + return + } + pref := ParseBillingStatementUserPreference(raw) + user.BillingStatementDailyEnabled = pref.DailyEnabled + user.BillingStatementWeeklyEnabled = pref.WeeklyEnabled + user.BillingStatementMonthlyEnabled = pref.MonthlyEnabled +} + +// updateBillingStatementPreference updates the user's billing statement preference in settings. +func (s *UserService) updateBillingStatementPreference(ctx context.Context, userID int64, req UpdateProfileRequest) error { + if s.settingRepo == nil { + return nil + } + key := SettingKeyBillingStatementUserPreferencePrefix + strconv.FormatInt(userID, 10) + adminCfg, err := s.settingRepo.GetValue(ctx, SettingKeyBillingStatementEmailConfig) + if err == nil { + cfg := ParseBillingStatementEmailConfig(adminCfg) + if !cfg.Enabled { + // Global feature disabled: keep stored user preference untouched. + return nil + } + if req.BillingStatementDailyEnabled != nil && !cfg.DailyEnabled { + req.BillingStatementDailyEnabled = nil + } + if req.BillingStatementWeeklyEnabled != nil && !cfg.WeeklyEnabled { + req.BillingStatementWeeklyEnabled = nil + } + if req.BillingStatementMonthlyEnabled != nil && !cfg.MonthlyEnabled { + req.BillingStatementMonthlyEnabled = nil + } + } + + // Read existing preference + raw, _ := s.settingRepo.GetValue(ctx, key) + pref := ParseBillingStatementUserPreference(raw) + + // Apply updates + if req.BillingStatementDailyEnabled != nil { + pref.DailyEnabled = *req.BillingStatementDailyEnabled + } + if req.BillingStatementWeeklyEnabled != nil { + pref.WeeklyEnabled = *req.BillingStatementWeeklyEnabled + } + if req.BillingStatementMonthlyEnabled != nil { + pref.MonthlyEnabled = *req.BillingStatementMonthlyEnabled + } + + // Serialize and save + data, err := json.Marshal(pref) + if err != nil { + return fmt.Errorf("marshal billing statement preference: %w", err) + } + return s.settingRepo.Set(ctx, key, string(data)) +} + +func userTimezoneSettingKey(userID int64) string { + return SettingKeyUserTimezonePrefix + strconv.FormatInt(userID, 10) +} + +func defaultUserTimezone() string { + if name := strings.TrimSpace(timezone.Name()); name != "" && name != "Local" { + return name + } + if loc := timezone.Location(); loc != nil { + if name := strings.TrimSpace(loc.String()); name != "" && name != "Local" { + return name + } + } + return "UTC" +} + +func normalizeUserTimezone(value string) (string, error) { + tz := strings.TrimSpace(value) + if tz == "" { + return defaultUserTimezone(), nil + } + if _, err := time.LoadLocation(tz); err != nil { + return "", infraerrors.BadRequest("USER_TIMEZONE_INVALID", "timezone must be a valid IANA timezone name") + } + return tz, nil +} + +func (s *UserService) hydrateUserTimezone(ctx context.Context, user *User) { + if user == nil { + return + } + user.Timezone = defaultUserTimezone() + if s.settingRepo == nil { + return + } + raw, err := s.settingRepo.GetValue(ctx, userTimezoneSettingKey(user.ID)) + if err != nil || strings.TrimSpace(raw) == "" { + return + } + if tz, err := normalizeUserTimezone(raw); err == nil { + user.Timezone = tz + } +} + +func (s *UserService) updateUserTimezone(ctx context.Context, userID int64, value string) error { + if s.settingRepo == nil { + return nil + } + tz, err := normalizeUserTimezone(value) + if err != nil { + return err + } + return s.settingRepo.Set(ctx, userTimezoneSettingKey(userID), tz) +} + func (s *UserService) SetAvatar(ctx context.Context, userID int64, raw string) (*UserAvatar, error) { avatarValue := strings.TrimSpace(raw) if avatarValue == "" { @@ -951,6 +1098,8 @@ func (s *UserService) GetByID(ctx context.Context, id int64) (*User, error) { if err := s.hydrateUserAvatar(ctx, user); err != nil { return nil, fmt.Errorf("get user avatar: %w", err) } + s.hydrateBillingStatementPreference(ctx, user) + s.hydrateUserTimezone(ctx, user) return user, nil } diff --git a/backend/internal/service/wire.go b/backend/internal/service/wire.go index dc96be0c063..f98b4b4c15e 100644 --- a/backend/internal/service/wire.go +++ b/backend/internal/service/wire.go @@ -515,6 +515,7 @@ var ProviderSet = wire.NewSet( NewPaymentService, ProvidePaymentOrderExpiryService, ProvideBalanceNotifyService, + ProvideBillingStatementEmailService, ProvideChannelMonitorService, ProvideChannelMonitorRunner, NewChannelMonitorRequestTemplateService, @@ -547,6 +548,60 @@ func ProvideChannelMonitorService( return NewChannelMonitorService(repo, encryptor) } +// ProvideBillingStatementEmailService creates and starts BillingStatementEmailService. +func ProvideBillingStatementEmailService( + settingRepo SettingRepository, + userRepo UserRepository, + groupRepo GroupRepository, + usageRepo UsageLogRepository, + emailService *EmailService, + redisClient *redis.Client, + cfg *config.Config, +) *BillingStatementEmailService { + svc := NewBillingStatementEmailService(settingRepo, userRepo, groupRepo, usageRepo, emailService, billingStatementRedisAdapter{client: redisClient}, cfg) + svc.Start() + return svc +} + +type billingStatementRedisAdapter struct { + client *redis.Client +} + +var billingStatementReleaseScript = redis.NewScript(` +if redis.call("GET", KEYS[1]) == ARGV[1] then + return redis.call("DEL", KEYS[1]) +end +return 0 +`) + +func (a billingStatementRedisAdapter) SetNX(ctx context.Context, key string, value any, expiration time.Duration) (bool, error) { + if a.client == nil { + return false, nil + } + return a.client.SetNX(ctx, key, value, expiration).Result() +} + +func (a billingStatementRedisAdapter) Get(ctx context.Context, key string) (string, error) { + if a.client == nil { + return "", nil + } + return a.client.Get(ctx, key).Result() +} + +func (a billingStatementRedisAdapter) Set(ctx context.Context, key string, value any, expiration time.Duration) error { + if a.client == nil { + return nil + } + return a.client.Set(ctx, key, value, expiration).Err() +} + +func (a billingStatementRedisAdapter) ReleaseIfValue(ctx context.Context, key string, value string) error { + if a.client == nil { + return nil + } + return billingStatementReleaseScript.Run(ctx, a.client, []string{key}, value).Err() +} + // ProvideChannelMonitorRunner 创建并启动渠道监控调度器。 // 通过 SetScheduler 注入回 service 后再 Start，确保启动时加载所有 enabled monitor， // 后续 CRUD 也能即时同步任务表。Runner.Stop 由 cleanup function 调用。 diff --git a/frontend/src/api/admin/settings.ts b/frontend/src/api/admin/settings.ts index 01d6969db5b..43a66db4143 100644 --- a/frontend/src/api/admin/settings.ts +++ b/frontend/src/api/admin/settings.ts @@ -526,6 +526,9 @@ export interface SystemSettings { // OpenAI fast/flex policy openai_fast_policy_settings?: OpenAIFastPolicySettings; + + // Billing statement email config + billing_statement_email_config?: string; } export interface UpdateSettingsRequest { @@ -719,6 +722,9 @@ export interface UpdateSettingsRequest { // OpenAI fast/flex policy openai_fast_policy_settings?: OpenAIFastPolicySettings; + + // Billing statement email config + billing_statement_email_config?: string; } /** diff --git a/frontend/src/api/user.ts b/frontend/src/api/user.ts index da7a91eb46c..07b44cc6854 100644 --- a/frontend/src/api/user.ts +++ b/frontend/src/api/user.ts @@ -38,6 +38,10 @@ export async function updateProfile(profile: { balance_notify_enabled?: boolean balance_notify_threshold?: number | null balance_notify_extra_emails?: NotifyEmailEntry[] + timezone?: string + billing_statement_daily_enabled?: boolean + billing_statement_weekly_enabled?: boolean + billing_statement_monthly_enabled?: boolean }): Promise+ {{ t('profile.billingStatement.description') }} +
++ {{ t('profile.timezoneHelp', { timezone: serverTimezone || 'UTC' }) }} +
+