suncheng/EmailBill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 31s
Details
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Details
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Details
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
Details

Browse Source
This commit is contained in:
SunCheng
2026-02-01 10:27:04 +08:00
parent 704f58b1a1
commit 61916dc6da
7 changed files with 810 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
Service/Budget/BudgetStatsService.cs
View File

@@ -525,7 +525,9 @@ public class BudgetStatsService(
logger.LogDebug("获取到 {Count} 个当前有效预算", currentBudgetsDict.Count);
// 用于跟踪已处理的预算ID，避免重复
// 对于年度预算，只添加一次；对于月度预算，跟踪 (Id, Month) 组合
var processedBudgetIds = new HashSet<long>();
var processedMonthlyBudgetKeys = new HashSet<(long Id, int Month)>();
// 1. 处理历史归档月份（1月到当前月-1）
if (referenceDate.Year == now.Year && now.Month > 1)
@@ -544,6 +546,9 @@ public class BudgetStatsService(
// 对于月度预算，每个月都添加一个归档项
if (item.Type == BudgetPeriodType.Month)
{
// 记录已处理的月度预算
processedMonthlyBudgetKeys.Add((item.Id, m));
result.Add(new BudgetStatsItem
{
Id = item.Id,
@@ -612,30 +617,40 @@ public class BudgetStatsService(
logger.LogInformation("添加当前年度预算: {BudgetName} - 预算金额: {Limit}, 实际金额: {Current}",
budget.Name, budget.Limit, currentAmount);
}
// 对于月度预算，仅添加当前月的预算项
// 对于月度预算，仅添加当前月的预算项（如果还没有从归档中添加）
else if (budget.Type == BudgetPeriodType.Month)
{
// 只计算当前月的实际值
var currentAmount = await CalculateCurrentAmountAsync(budget, BudgetPeriodType.Month, referenceDate);
result.Add(new BudgetStatsItem
// 检查当前月是否已经从归档中添加过
if (!processedMonthlyBudgetKeys.Contains((budget.Id, now.Month)))
{
Id = budget.Id,
Name = budget.Name,
Type = budget.Type,
Limit = budget.Limit, // 月度预算的原始限额
Current = currentAmount, // 当前月的实际值
Category = budget.Category,
SelectedCategories = string.IsNullOrEmpty(budget.SelectedCategories)
? []
: budget.SelectedCategories.Split(',', StringSplitOptions.RemoveEmptyEntries),
NoLimit = budget.NoLimit,
IsMandatoryExpense = budget.IsMandatoryExpense,
IsArchive = false,
// 标记这是当前月的月度预算，用于年度限额计算
IsCurrentMonth = true
});
logger.LogInformation("添加当前月的月度预算: {BudgetName} - 月度限额: {Limit}, 当前月实际值: {Current}",
budget.Name, budget.Limit, currentAmount);
// 只计算当前月的实际值（使用真实的当前月日期，而不是referenceDate）
var currentMonthDate = new DateTime(now.Year, now.Month, 1);
var currentAmount = await CalculateCurrentAmountAsync(budget, BudgetPeriodType.Month, currentMonthDate);
result.Add(new BudgetStatsItem
{
Id = budget.Id,
Name = budget.Name,
Type = budget.Type,
Limit = budget.Limit, // 月度预算的原始限额
Current = currentAmount, // 当前月的实际值
Category = budget.Category,
SelectedCategories = string.IsNullOrEmpty(budget.SelectedCategories)
? []
: budget.SelectedCategories.Split(',', StringSplitOptions.RemoveEmptyEntries),
NoLimit = budget.NoLimit,
IsMandatoryExpense = budget.IsMandatoryExpense,
IsArchive = false,
// 标记这是当前月的月度预算，用于年度限额计算
IsCurrentMonth = true
});
logger.LogInformation("添加当前月的月度预算: {BudgetName} - 月度限额: {Limit}, 当前月实际值: {Current}, 计算日期: {CalculateDate:yyyy-MM}",
budget.Name, budget.Limit, currentAmount, currentMonthDate);
}
else
{
logger.LogInformation("跳过已从归档添加的当前月月度预算: {BudgetName} - {Month}月",
budget.Name, now.Month);
}
// 如果还有剩余月份（未来月份），再添加一项作为未来的预算占位
var remainingMonths = 12 - now.Month;
@@ -1138,9 +1153,10 @@ public class BudgetStatsService(
{
var budgetLimit = CalculateBudgetLimit(budget, BudgetPeriodType.Year, referenceDate);
var typeStr = budget.IsCurrentMonth ? "当前月" : "未来月";
// 修正：当前月是1个月，未来月是剩余月份数量
var calcStr = budget.IsCurrentMonth
? $"1月×{budget.Limit:N0}"
: $"{budget.RemainingMonths}月×{budget.Limit:N0}";
? $"1个月×{budget.Limit:N0}"
: $"{budget.RemainingMonths}个月×{budget.Limit:N0}";
description.AppendLine($"""
<tr>
@@ -1211,11 +1227,11 @@ public class BudgetStatsService(
var budgetLimit = CalculateBudgetLimit(budget, BudgetPeriodType.Year, referenceDate);
if (budget.IsCurrentMonth)
{
limitParts.Add($"{budget.Name}(当前月×{budget.Limit:N0}={budgetLimit:N0})");
limitParts.Add($"{budget.Name}(当前月1个月×{budget.Limit:N0}={budgetLimit:N0})");
}
else
{
limitParts.Add($"{budget.Name}(剩余{budget.RemainingMonths}月×{budget.Limit:N0}={budgetLimit:N0})");
limitParts.Add($"{budget.Name}(未来{budget.RemainingMonths}个月×{budget.Limit:N0}={budgetLimit:N0})");
}
}