统计页面 修改 增加统计Border。优化部分统计DataGrid的列展示

This commit is contained in:
chfei committed 2026-08-07 10:07:02 +08:00
1 parent f2d619eafb
commit b6b72e6bc3
9 files changed
+883 -687

No files matched your search

@@ -108,9 +108,12 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
var valid = list.Where(IsValidOrder).ToList();
var refunded = list.Where(IsRefunded).ToList();
decimal salesAmount = valid.Sum(r => (decimal)r.OrderPrice) / 100m;
decimal profit = valid.Sum(r => (decimal)r.Profit) / 100m;
decimal refundAmount = refunded.Sum(r => (decimal)r.OrderPrice) / 100m;
decimal salesAmount = valid.Sum(r => (decimal)(r.OrderPrice)) / 100m;
decimal profit = valid.Sum(r => (decimal)(r.Profit )) / 100m;
decimal refundAmount = refunded.Sum(r => (decimal)(r.OrderPrice)) / 100m;
decimal platformFeeTotal = valid.Sum(r => (decimal)(r.PredictCommissionFee)) / 100m;
decimal commission = valid.Sum(r => (decimal)(r.CommissionAmount)) / 100m;
decimal purchaseAmount = valid.Sum(r => (decimal)(r.PurchasePrice)) / 100m;
int validOrderCount = valid.Select(r => r.OrderId).Distinct().Count();
// 总订单数(退款率分母)= 已付款订单 + 已退款订单(含售后取消 200),不含未付款的 10/250
int totalOrderCount = list.Where(r => IsPaidOrder(r) || IsRefunded(r)).Select(r => r.OrderId).Distinct().Count();
@@ -123,9 +126,11 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
Profit = profit,
RefundAmount = refundAmount,
ProductSalesVolume = valid.Count,
CustomerCount = validOrderCount,
PlatformFeeTotal = platformFeeTotal,
Commission = commission,
AvgOrderAmount = validOrderCount == 0 ? 0m : salesAmount / validOrderCount,
RefundRate = totalOrderCount == 0 ? 0m : (decimal)refundOrderCount * 100m / totalOrderCount
RefundRate = totalOrderCount == 0 ? 0m : (decimal)refundOrderCount * 100m / totalOrderCount,
AverageProfitRate = purchaseAmount == 0m ? 0m : profit / purchaseAmount * 100m
};
}
@@ -140,7 +145,7 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
g => new RevenueTrendPoint
{
Date = g.Key,
SalesAmount = g.Sum(r => (decimal)r.OrderPrice) / 100m,
SalesAmount = g.Sum(r => (decimal)(r.OrderPrice)) / 100m,
OrderCount = g.Select(r => r.OrderId).Distinct().Count()
});
@@ -159,15 +164,15 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
public static List<ShopSalesProportionItem> GetShopSalesProportion(IEnumerable<ShopRevenueStatisticsRow> rows)
{
var list = (rows ?? new List<ShopRevenueStatisticsRow>()).Where(IsValidOrder).ToList();
decimal total = list.Sum(r => (decimal)r.OrderPrice) / 100m;
decimal total = list.Sum(r => (decimal)(r.OrderPrice )) / 100m;
return list
.GroupBy(r => r.ShopName)
.Select(g => new ShopSalesProportionItem
{
ShopName = string.IsNullOrEmpty(g.Key) ? "未知店铺" : g.Key,
SalesAmount = g.Sum(r => (decimal)r.OrderPrice) / 100m,
Percentage = total == 0m ? 0d : (double)(g.Sum(r => (decimal)r.OrderPrice) / 100m / total * 100m)
SalesAmount = g.Sum(r => (decimal)(r.OrderPrice )) / 100m,
Percentage = total == 0m ? 0d : (double)(g.Sum(r => (decimal)(r.OrderPrice)) / 100m / total * 100m)
})
.OrderByDescending(i => i.SalesAmount)
.ToList();
@@ -184,17 +189,21 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
{
var valid = g.Where(IsValidOrder).ToList();
var refunded = g.Where(IsRefunded).ToList();
decimal salesAmount = valid.Sum(r => (decimal)r.OrderPrice) / 100m;
decimal salesAmount = valid.Sum(r => (decimal)(r.OrderPrice)) / 100m;
int orderCount = valid.Select(r => r.OrderId).Distinct().Count();
decimal profit = valid.Sum(r => (decimal)(r.Profit)) / 100m;
decimal purchaseAmount = valid.Sum(r => (decimal)(r.PurchasePrice)) / 100m;
return new ShopStatisticsItem
{
ShopName = string.IsNullOrEmpty(g.Key) ? "未知店铺" : g.Key,
OrderCount = orderCount,
SalesAmount = salesAmount,
Profit = valid.Sum(r => (decimal)r.Profit) / 100m,
RefundAmount = refunded.Sum(r => (decimal)r.OrderPrice) / 100m,
CustomerCount = orderCount,
AvgOrderAmount = orderCount == 0 ? 0m : salesAmount / orderCount
Profit = profit,
RefundAmount = refunded.Sum(r => (decimal)(r.OrderPrice)) / 100m,
PlatformFeeTotal = valid.Sum(r => (decimal)(r.PredictCommissionFee)) / 100m,
Commission = valid.Sum(r => (decimal)(r.CommissionAmount)) / 100m,
AvgOrderAmount = orderCount == 0 ? 0m : salesAmount / orderCount,
AverageProfitRate = purchaseAmount == 0m ? 0m : profit / purchaseAmount * 100m
};
})
.OrderByDescending(i => i.SalesAmount)
@@ -215,7 +224,9 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
{
var valid = g.Where(IsValidOrder).ToList();
var refunded = g.Where(IsRefunded).ToList();
decimal salesAmount = valid.Sum(r => (decimal)r.OrderPrice) / 100m;
decimal salesAmount = valid.Sum(r => (decimal)(r.OrderPrice)) / 100m;
decimal profit = valid.Sum(r => (decimal)(r.Profit)) / 100m;
decimal purchaseAmount = valid.Sum(r => (decimal)(r.PurchasePrice)) / 100m;
int orderCount = valid.Select(r => r.OrderId).Distinct().Count();
return new ShopPeriodStatisticsItem
{
@@ -223,8 +234,11 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
Period = GetPeriodText(g.Key, periodType),
OrderCount = orderCount,
SalesAmount = salesAmount,
Profit = valid.Sum(r => (decimal)r.Profit) / 100m,
RefundAmount = refunded.Sum(r => (decimal)r.OrderPrice) / 100m,
Profit = profit,
RefundAmount = refunded.Sum(r => (decimal)(r.OrderPrice)) / 100m,
PlatformFeeTotal = valid.Sum(r => (decimal)(r.PredictCommissionFee)) / 100m,
Commission = valid.Sum(r => (decimal)(r.CommissionAmount)) / 100m,
AverageProfitRate = purchaseAmount == 0m ? 0m : profit / purchaseAmount * 100m,
CustomerCount = orderCount,
AvgOrderAmount = orderCount == 0 ? 0m : salesAmount / orderCount
};
@@ -245,6 +259,9 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
SalesAmount = 0m,
Profit = 0m,
RefundAmount = 0m,
PlatformFeeTotal = 0m,
Commission = 0m,
AverageProfitRate = 0m,
CustomerCount = 0,
AvgOrderAmount = 0m
});
@@ -310,19 +327,22 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
}
/// <summary>
/// 默认实现:返回模拟数据,用于页面演示/联调。
/// 接入真实接口时,新建实现类并注入即可(见 IShopRevenueStatisticsService 注释)。
/// 默认实现:请求真实接口(shop_revenue_statistics/get_shop_order_amount)。
/// 接入其他数据源时,新建实现类并注入即可(见 IShopRevenueStatisticsService 注释)。
/// </summary>
public class ShopRevenueStatisticsService : IShopRevenueStatisticsService
{
/// <summary>缓存有效期:订单/退款数据会持续变化,超过该时长后缓存自动失效并重新请求。</summary>
private static readonly TimeSpan CacheDuration = TimeSpan.FromSeconds(60);
/// <summary>
/// 明细数据缓存。
/// key = 店铺id|yyyyMMdd(店铺 × 天),value = 该店铺当天的明细行。
/// 查询按“店铺 × 日期”命中;完全未命中时所有店铺 + 整个时间范围一次请求,
/// 部分命中时只请求缺失的店铺/日期段。
/// 明细数据缓存(按天缓存,纯时间维度,不含店铺)。
/// key = 日期(yyyyMMdd),value = 该天全部店铺的明细 + 缓存时间。
/// 查询时按天命中:未命中的天合并成连续段一次请求,返回后按天拆分写入;
/// 前台选某一个或某多个店铺时,按所选店铺(ShopName)过滤,复用同一批时间数据。
/// </summary>
private readonly Dictionary<string, List<ShopRevenueStatisticsRow>> _rowCache =
new Dictionary<string, List<ShopRevenueStatisticsRow>>();
private readonly Dictionary<string, CacheEntry> _rowCache =
new Dictionary<string, CacheEntry>();
private readonly object _cacheLock = new object();
private sealed class DateRange
@@ -331,91 +351,161 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
public DateTime End;
}
private static string CacheKey(string shopId, DateTime day)
private sealed class CacheEntry
{
return shopId + "|" + day.ToString("yyyyMMdd");
public List<ShopRevenueStatisticsRow> Rows;
public DateTime CachedAt;
}
private static string CacheKey(DateTime day)
{
return day.Date.ToString("yyyyMMdd");
}
/// <summary>枚举 startDate ~ endDate 之间的每一天(含首尾)</summary>
private static IEnumerable<DateTime> EnumerateDays(DateTime startDate, DateTime endDate)
{
for (var d = startDate.Date; d <= endDate.Date; d = d.AddDays(1))
yield return d;
}
/// <summary>该天缓存是否有效(存在且未过期);调用方需持有 _cacheLock</summary>
private bool IsValidLocked(DateTime day)
{
return _rowCache.TryGetValue(CacheKey(day), out var entry)
&& DateTime.Now - entry.CachedAt <= CacheDuration;
}
/// <summary>把缺失日期合并为连续日期段(每段一次请求)</summary>
private static List<DateRange> BuildRuns(List<DateTime> missingDays)
{
var sorted = missingDays.OrderBy(d => d).ToList();
var runs = new List<DateRange>();
int i = 0;
while (i < sorted.Count)
{
var start = sorted[i];
var end = start;
i++;
while (i < sorted.Count && sorted[i] == end.AddDays(1))
{
end = sorted[i];
i++;
}
runs.Add(new DateRange { Start = start, End = end });
}
return runs;
}
public async Task<List<ShopRevenueStatisticsRow>> QueryRowsAsync(ShopRevenueStatisticsQuery query)
{
// 1. 展开本次查询涉及的店铺(ShopKey 为空 = 全部店铺)
List<string> shopIds;
if (string.IsNullOrEmpty(query.ShopKey))
shopIds = (await GetShopOptionsAsync()).Select(a => a.AppKey).ToList();
else
shopIds = new List<string> { query.ShopKey };
if (shopIds.Count == 0)
return new List<ShopRevenueStatisticsRow>();
var startDay = query.StartDate.Date;
var endDay = query.EndDate.Date;
int totalDays = (int)(endDay - startDay).Days + 1;
if (startDay > endDay)
{
var tmp = startDay;
startDay = endDay;
endDay = tmp;
}
// 2. 命中检测:按 店铺 × 天 找出缺失项
var missingByShop = new Dictionary<string, List<DateTime>>();
int missingCount = 0;
// 1. 找出未命中或已过期的天
List<DateTime> missingDays;
lock (_cacheLock)
{
foreach (var shopId in shopIds)
missingDays = EnumerateDays(startDay, endDay)
.Where(d => !IsValidLocked(d))
.ToList();
}
// 2. 有缺失:按连续段请求整个时间范围的全部店铺明细,并按天写入缓存
if (missingDays.Count > 0)
{
var shopIds = GetShopOptions().Select(a => a.ShopId).ToList();
if (shopIds.Count == 0)
return new List<ShopRevenueStatisticsRow>();
foreach (var run in BuildRuns(missingDays))
{
var missingDays = new List<DateTime>();
for (var d = startDay; d <= endDay; d = d.AddDays(1))
{
if (!_rowCache.ContainsKey(CacheKey(shopId, d)))
missingDays.Add(d);
}
missingCount += missingDays.Count;
missingByShop[shopId] = missingDays;
var rows = await RequestRowsAsync(shopIds, run.Start, run.End);
CacheResponse(run.Start, run.End, rows);
}
}
// 3. 全部命中:直接从缓存拼装返回
if (missingCount == 0)
return GetCachedRows(shopIds, startDay, endDay);
// 4. 完全未命中:所有店铺 + 整个时间范围一次请求
if (missingCount == shopIds.Count * totalDays)
{
var allRows = await RequestRowsAsync(shopIds, startDay, endDay);
CacheResponse(shopIds, startDay, endDay, allRows, null);
var cached = GetCachedRows(shopIds, startDay, endDay);
// 若接口行内未返回 app_key 导致无法入库,则直接返回本次请求结果
return cached.Count > 0 ? cached : allRows;
}
// 5. 部分命中:只请求未命中的(店铺 × 连续缺失日期段)
foreach (var pair in missingByShop)
{
if (pair.Value.Count == 0)
continue;
foreach (var run in BuildRuns(pair.Value))
{
var rows = await RequestRowsAsync(new List<string> { pair.Key }, run.Start, run.End);
CacheResponse(new List<string> { pair.Key }, run.Start, run.End, rows, pair.Key);
}
}
return GetCachedRows(shopIds, startDay, endDay);
// 3. 按天从缓存拼装完整范围,再按所选店铺过滤(ShopKey 为空 = 全部店铺)
return FilterByShop(GetCachedRows(startDay, endDay), query.ShopKey);
}
/// <summary>按 店铺 × 日期 从缓存拼装结果</summary>
private List<ShopRevenueStatisticsRow> GetCachedRows(List<string> shopIds, DateTime startDate, DateTime endDate)
/// <summary>
/// 把一次请求的结果按天写入缓存。
/// 本次请求覆盖的每一天都以返回数据为准整体替换(无数据的天记为空的已缓存,
/// 避免“该天无数据”被反复判定为未命中而重复请求)。
/// </summary>
private void CacheResponse(DateTime startDate, DateTime endDate, List<ShopRevenueStatisticsRow> rows)
{
if (rows == null)
rows = new List<ShopRevenueStatisticsRow>();
lock (_cacheLock)
{
RemoveExpiredEntriesLocked();
var byDay = rows
.Where(r => r.CreateTime.Date >= startDate.Date && r.CreateTime.Date <= endDate.Date)
.GroupBy(r => r.CreateTime.Date)
.ToDictionary(g => g.Key, g => g.ToList());
foreach (var day in EnumerateDays(startDate, endDate))
{
byDay.TryGetValue(day, out var dayRows);
_rowCache[CacheKey(day)] = new CacheEntry { Rows = dayRows ?? new List<ShopRevenueStatisticsRow>(), CachedAt = DateTime.Now };
}
}
}
/// <summary>按天从缓存拼装某时间范围的明细(返回新列表,避免外部修改污染缓存)</summary>
private List<ShopRevenueStatisticsRow> GetCachedRows(DateTime startDate, DateTime endDate)
{
var result = new List<ShopRevenueStatisticsRow>();
lock (_cacheLock)
{
for (var d = startDate.Date; d <= endDate.Date; d = d.AddDays(1))
foreach (var day in EnumerateDays(startDate, endDate))
{
foreach (var shopId in shopIds)
{
if (_rowCache.TryGetValue(CacheKey(shopId, d), out var list))
result.AddRange(list);
}
if (_rowCache.TryGetValue(CacheKey(day), out var entry))
result.AddRange(entry.Rows);
}
}
return result;
}
/// <summary>按所选店铺过滤明细:ShopKey 为空返回全部;否则按店铺名(ShopName)精确匹配。</summary>
private static List<ShopRevenueStatisticsRow> FilterByShop(List<ShopRevenueStatisticsRow> rows, string shopKey)
{
if (rows == null)
return new List<ShopRevenueStatisticsRow>();
if (string.IsNullOrEmpty(shopKey))
return new List<ShopRevenueStatisticsRow>(rows);
var shop = GetShopOptions().FirstOrDefault(a => a.AppKey == shopKey);
if (shop == null || string.IsNullOrEmpty(shop.ShopName))
return new List<ShopRevenueStatisticsRow>();
return rows
.Where(r => string.Equals(r.ShopName, shop.ShopName, StringComparison.OrdinalIgnoreCase))
.ToList();
}
/// <summary>清理已过期的缓存条目(调用方需持有 _cacheLock)</summary>
private void RemoveExpiredEntriesLocked()
{
var expiredKeys = _rowCache
.Where(p => DateTime.Now - p.Value.CachedAt > CacheDuration)
.Select(p => p.Key)
.ToList();
foreach (var key in expiredKeys)
_rowCache.Remove(key);
}
/// <summary>请求接口一次(可传多个店铺),返回原始明细行</summary>
private async Task<List<ShopRevenueStatisticsRow>> RequestRowsAsync(List<string> shopIds, DateTime startDate, DateTime endDate)
{
@@ -447,81 +537,6 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
}
/// <summary>
/// 把一次请求的结果写入缓存(按 店铺id|日期 分桶)。
/// 除有数据的 店铺×天 外,会把本次请求覆盖但无数据的 店铺×天 也标记为已缓存(空列表),
/// 避免“该店铺当天无数据”被反复判定为未命中而重复请求数据库。
/// </summary>
private void CacheResponse(List<string> shopIds, DateTime startDate, DateTime endDate, List<ShopRevenueStatisticsRow> rows, string fallbackShopId)
{
if (rows == null)
rows = new List<ShopRevenueStatisticsRow>();
// 能否按 店铺×天 归属:
// 单店铺请求一定可以(用请求的店铺兜底);多店铺请求要求行内带 app_key;
// 响应为空时也视为可归属(说明覆盖的 店铺×天 都无数据)。
bool canAttribute = shopIds.Count == 1
|| rows.Count == 0
|| rows.Any(r => !string.IsNullOrEmpty(r.AppKey));
lock (_cacheLock)
{
if (canAttribute)
{
// 覆盖的 店铺×天 全部落缓存键(无数据的天记为空的已缓存)
for (var d = startDate.Date; d <= endDate.Date; d = d.AddDays(1))
{
foreach (var shopId in shopIds)
{
var key = CacheKey(shopId, d);
if (!_rowCache.TryGetValue(key, out var list))
{
list = new List<ShopRevenueStatisticsRow>();
_rowCache[key] = list;
}
}
}
}
// 有数据的行按 店铺×天 追加
foreach (var row in rows)
{
// 行内未带 app_key 时,用本次请求的店铺兜底
var shopId = string.IsNullOrEmpty(row.AppKey) ? fallbackShopId : row.AppKey;
if (string.IsNullOrEmpty(shopId))
continue;
var key = CacheKey(shopId, row.CreateTime.Date);
if (!_rowCache.TryGetValue(key, out var list))
{
list = new List<ShopRevenueStatisticsRow>();
_rowCache[key] = list;
}
list.Add(row);
}
}
}
/// <summary>把缺失日期合并为连续日期段(每段一次请求)</summary>
private static List<DateRange> BuildRuns(List<DateTime> missingDays)
{
var sorted = missingDays.OrderBy(d => d).ToList();
var runs = new List<DateRange>();
int i = 0;
while (i < sorted.Count)
{
var start = sorted[i];
var end = start;
i++;
while (i < sorted.Count && sorted[i] == end.AddDays(1))
{
end = sorted[i];
i++;
}
runs.Add(new DateRange { Start = start, End = end });
}
return runs;
}
public async Task<ShopRevenueSummary> GetSummaryAsync(ShopRevenueStatisticsQuery query)
{
var rows = await QueryRowsAsync(query);
@@ -553,16 +568,21 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
return RevenueStatisticsAggregator.GetPeriodStatistics(rows, query.StartDate, query.EndDate, periodType);
}
public Task<List<ShopOption>> GetShopOptionsAsync()
/// <summary>店铺下拉列表(同步读取,供查询与过滤使用)</summary>
private static List<ShopOption> GetShopOptions()
{
var list = GlobalConfig.ShopLoginList.Select(a =>
return GlobalConfig.ShopLoginList.Select(a =>
new ShopOption()
{
AppKey = a.ShopId,
ShopId = a.ErpShopId,
ShopName = a.ShopAccount
}).ToList();
}
return Task.FromResult(list);
public Task<List<ShopOption>> GetShopOptionsAsync()
{
return Task.FromResult(GetShopOptions());
}
}