修改统计功能 使用新API接口
This commit is contained in:
1 parent
03f71a5d64
commit
8431a8f6b0
6 files changed
+1117
-708
No files matched your search
@@ -1,14 +1,10 @@
|
||||
using _29WxOrderWpf.Ctrls.Statistics.Models;
|
||||
using _29WxOrderWpf.Ctrls.Statistics.Models;
|
||||
using AllBase;
|
||||
using AllBase.Helper;
|
||||
using Newtonsoft.Json;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using Newtonsoft.Json.Serialization;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using Work;
|
||||
using WxOrder.Framework.Commons;
|
||||
@@ -17,127 +13,99 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
|
||||
{
|
||||
/// <summary>
|
||||
/// 店铺营收统计 - 数据服务调用接口。
|
||||
/// 页面只依赖此接口,接入真实数据源时新建实现类(如对接 HTTP 接口 / SQL 查询),
|
||||
/// 并通过 ShopRevenueStatisticsViewModel 构造函数注入即可,无需改动页面。
|
||||
/// 页面只依赖此接口,接入其他数据源时新建实现类,
|
||||
/// 并通过 ViewModel 构造函数注入即可,无需改动页面。
|
||||
/// </summary>
|
||||
public interface IShopRevenueStatisticsService
|
||||
{
|
||||
/// <summary>
|
||||
/// 查询原始统计明细(接口返回的 A.* / B.* / c.* 原始字段)。
|
||||
/// 真实实现通常通过 SQL / HTTP 一次性返回这些行,再由聚合器计算。
|
||||
/// 综合统计查询:返回汇总卡片、销售趋势(按天)、店铺销售占比、店铺统计表格。
|
||||
/// 用 GroupType=Day 一次请求取回按店铺按天的记录,再由客户端汇总,无缓存。
|
||||
/// </summary>
|
||||
Task<List<ShopRevenueStatisticsRow>> QueryRowsAsync(ShopRevenueStatisticsQuery query);
|
||||
Task<ShopRevenueStatisticsResult> QueryAsync(ShopRevenueStatisticsQuery query);
|
||||
|
||||
/// <summary>获取顶部汇总卡片数据</summary>
|
||||
Task<ShopRevenueSummary> GetSummaryAsync(ShopRevenueStatisticsQuery query);
|
||||
|
||||
/// <summary>获取销售趋势(按天)</summary>
|
||||
Task<List<RevenueTrendPoint>> GetSalesTrendAsync(ShopRevenueStatisticsQuery query);
|
||||
|
||||
/// <summary>获取店铺销售占比(饼图)</summary>
|
||||
Task<List<ShopSalesProportionItem>> GetShopSalesProportionAsync(ShopRevenueStatisticsQuery query);
|
||||
|
||||
/// <summary>获取店铺统计表格</summary>
|
||||
Task<List<ShopStatisticsItem>> GetShopStatisticsAsync(ShopRevenueStatisticsQuery query);
|
||||
|
||||
/// <summary>获取天/周/月周期统计表格(每天/每周/每月各一行,按所选店铺或全部店铺统计)</summary>
|
||||
Task<List<ShopPeriodStatisticsItem>> GetPeriodStatisticsAsync(ShopRevenueStatisticsQuery query, PeriodStatisticType periodType);
|
||||
/// <summary>
|
||||
/// 天/周/月周期统计查询:返回汇总卡片 + 按周期(天/周/月)聚合的表格数据。
|
||||
/// 接口不返回整段汇总,Summary 由返回的周期记录在客户端合计。
|
||||
/// </summary>
|
||||
Task<ShopPeriodStatisticsResult> QueryPeriodStatisticsAsync(ShopRevenueStatisticsQuery query, PeriodStatisticType periodType);
|
||||
|
||||
/// <summary>获取店铺下拉列表(用于查询条件)</summary>
|
||||
Task<List<ShopOption>> GetShopOptionsAsync();
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 订单明细列表(有效订单 / 退款订单 / 买手未退回金额的订单),供订单列表弹窗使用。
|
||||
/// </summary>
|
||||
Task<List<ShopOrderDetailResponse>> QueryOrderRowsAsync(ShopRevenueStatisticsQuery query, ShopOrderDetailType detailType);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 统计聚合器:把接口返回的原始明细行聚合成页面所需的汇总/趋势/占比/表格数据。
|
||||
/// 聚合口径说明(依据接口字段描述):
|
||||
/// - 订单状态 status:10-待付款;20-待发货;21-部分发货;30-待收货;100-完成;
|
||||
/// 200-全部商品售后之后订单取消;250-未付款用户主动取消或超时未付款订单自动取消。
|
||||
/// - 有效订单:已付款(20/21/30/100)且未退款;10/250 未付款不计入销售额。
|
||||
/// - 已退款:c.refund_status 为 4/11,或订单状态为 200(全部商品售后后取消)。
|
||||
/// 统计聚合器:把接口返回的 <see cref="ShopStatsResponse"/> 聚合成页面所需的汇总/趋势/占比/表格数据。
|
||||
/// 数据来源:shop_revenue_statistics/GetShopStats(GroupType = Day/Week/Month),
|
||||
/// 接口只返回“按周期聚合的记录”,页面上所有汇总口径都在这里由客户端合计。
|
||||
/// 口径说明(依据接口字段含义):
|
||||
/// - OrderCount 为“有效订单数”,已不含退款订单;因此退款率分母 = OrderCount + RefundOrderCount。
|
||||
/// - 店铺端退款:RefundDone(已成功)+ RefundPending(处理中)→ 退款金额。
|
||||
/// - 买手端(采购)退款:TotalRefund = DoneRefund + PendingRefund + RejectedRefund → 售后采购金额;
|
||||
/// DoneRefund → 已退回采购金额;剩余(待退回)= TotalRefund - DoneRefund。
|
||||
/// - 接口无“达人佣金”字段,Commission 固定为 0(保留属性与页面展示,待后端补字段)。
|
||||
/// - 金额字段单位均为“分”,除以 100 转为元。
|
||||
/// </summary>
|
||||
public static class RevenueStatisticsAggregator
|
||||
public static class ShopStatsAggregator
|
||||
{
|
||||
/// <summary>订单状态 - 待付款</summary>
|
||||
public const int StatusPendingPay = 10;
|
||||
/// <summary>金额换算:分 → 元</summary>
|
||||
private const decimal FenPerYuan = 100m;
|
||||
|
||||
/// <summary>订单状态 - 待发货</summary>
|
||||
public const int StatusWaitSend = 20;
|
||||
|
||||
/// <summary>订单状态 - 部分发货</summary>
|
||||
public const int StatusPartSend = 21;
|
||||
|
||||
/// <summary>订单状态 - 待收货</summary>
|
||||
public const int StatusWaitReceive = 30;
|
||||
|
||||
/// <summary>订单状态 - 完成</summary>
|
||||
public const int StatusFinished = 100;
|
||||
|
||||
/// <summary>订单状态 - 全部商品售后之后订单取消</summary>
|
||||
public const int StatusCancelAfterAfterSale = 200;
|
||||
|
||||
/// <summary>订单状态 - 未付款用户主动取消/超时未付款自动取消</summary>
|
||||
public const int StatusCancelNotPay = 250;
|
||||
|
||||
/// <summary>是否已付款的订单(20/21/30/100;10 待付款、250 未付款取消不计入)</summary>
|
||||
public static bool IsPaidOrder(ShopRevenueStatisticsRow row)
|
||||
/// <summary>分转元</summary>
|
||||
public static decimal ToYuan(long fen)
|
||||
{
|
||||
if (row == null) return false;
|
||||
return row.Status == StatusWaitSend
|
||||
|| row.Status == StatusPartSend
|
||||
|| row.Status == StatusWaitReceive
|
||||
|| row.Status == StatusFinished;
|
||||
return fen / FenPerYuan;
|
||||
}
|
||||
|
||||
/// <summary>是否已退款(c.refund_status 为 4/11,或订单状态为 200 全部商品售后后取消)</summary>
|
||||
public static bool IsRefunded(ShopRevenueStatisticsRow row)
|
||||
private static List<ShopStatsResponse> ToList(IEnumerable<ShopStatsResponse> stats)
|
||||
{
|
||||
if (row == null) return false;
|
||||
return row.RefundStatus > 1 || row.RefundStatusString == "MERCHANT_REFUND_SUCCESS" || row.RefundStatusString == "MERCHANT_RETURN_SUCCESS";
|
||||
return (stats ?? Enumerable.Empty<ShopStatsResponse>())
|
||||
.Where(a => a != null)
|
||||
.ToList();
|
||||
}
|
||||
|
||||
/// <summary>是否有效订单(已付款且未退款)</summary>
|
||||
public static bool IsValidOrder(ShopRevenueStatisticsRow row)
|
||||
private static IEnumerable<IGrouping<string, ShopStatsResponse>> GroupByShop(IEnumerable<ShopStatsResponse> stats)
|
||||
{
|
||||
return !IsRefunded(row);
|
||||
return ToList(stats).GroupBy(a => a.ShopId ?? string.Empty);
|
||||
}
|
||||
/// <summary>买手号退款成功</summary>
|
||||
public static bool IsBuyerRefundSuccessful(ShopRevenueStatisticsRow row)
|
||||
|
||||
/// <summary>店铺显示名:优先按 ERP 店铺ID匹配,其次按平台店铺ID匹配,都匹配不到时退回店铺ID</summary>
|
||||
public static string ResolveShopName(string shopId)
|
||||
{
|
||||
return row.BuyerRefundStatus == "退款成功";
|
||||
if (string.IsNullOrEmpty(shopId))
|
||||
return "未知店铺";
|
||||
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(a => a.ErpShopId == shopId)
|
||||
?? GlobalConfig.ShopLoginList.FirstOrDefault(a => a.ShopId == shopId);
|
||||
|
||||
if (shop == null || string.IsNullOrEmpty(shop.ShopAccount))
|
||||
return shopId;
|
||||
|
||||
return shop.ShopAccount;
|
||||
}
|
||||
private static List<ShopRevenueStatisticsRow> GetPaymentOrderList(IEnumerable<ShopRevenueStatisticsRow> rows)
|
||||
|
||||
/// <summary>汇总卡片(整个查询时间段,所有选中店铺合计)</summary>
|
||||
public static ShopRevenueSummary GetSummary(IEnumerable<ShopStatsResponse> stats)
|
||||
{
|
||||
return (rows ?? new List<ShopRevenueStatisticsRow>()).Where(a => a.OutAmount > 0).ToList(); //买手付钱后的订单数量
|
||||
}
|
||||
/// <summary>汇总卡片</summary>
|
||||
public static ShopRevenueSummary GetSummary(IEnumerable<ShopRevenueStatisticsRow> rows)
|
||||
{
|
||||
var list = GetPaymentOrderList(rows); //买手付钱后的订单数量
|
||||
var valid = list.Where(IsValidOrder).ToList();
|
||||
var refunded = list.Where(IsRefunded).ToList();
|
||||
var list = ToList(stats);
|
||||
|
||||
decimal salesAmount = valid.Sum(r => (decimal)(r.OrderPrice)) / 100m;//有效订单总金额
|
||||
decimal profit = valid.Concat(refunded).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.OutAmount)) / 100m;
|
||||
decimal buyerPaymentAmount = valid.Sum(r => (decimal)(r.OutAmount)) / 100m; //买手号付款金额(采购金额)
|
||||
decimal buyerRefundAmount = refunded.Sum(r => (decimal)(r.OutAmount)) / 100m; //买手号退款金额(采购退款金额)
|
||||
decimal buyerRefundSuccessedAmount = refunded.Where(IsBuyerRefundSuccessful).Sum(r => (decimal)(r.BuyerRefundAmount)) / 100m; //买手号退款成功金额
|
||||
decimal salesAmount = ToYuan(list.Sum(a => a.SalesAmount));
|
||||
decimal profit = ToYuan(list.Sum(a => a.ProfitAmount));
|
||||
decimal platformFeeTotal = ToYuan(list.Sum(a => a.PlatformFee));
|
||||
decimal refundAmount = ToYuan(list.Sum(a => a.RefundDone) + list.Sum(a => a.RefundPending));
|
||||
decimal buyerPaymentAmount = ToYuan(list.Sum(a => a.TotalPurchase));
|
||||
decimal buyerRefundAmount = ToYuan(list.Sum(a => a.TotalRefund));
|
||||
decimal buyerRefundSuccessedAmount = ToYuan(list.Sum(a => a.DoneRefund));
|
||||
|
||||
int validOrderCount = valid.Select(r => r.OrderId).Distinct().Count();
|
||||
int validOrderCount = list.Sum(a => a.OrderCount); // 新接口 OrderCount 不含退款订单
|
||||
int refundOrderCount = list.Sum(a => a.RefundOrderCount);
|
||||
int totalOrderCount = validOrderCount + refundOrderCount;
|
||||
|
||||
// 总订单数(退款率分母)= 已付款订单 + 已退款订单,不含未付款的 10/250
|
||||
int totalOrderCount = list.Count();
|
||||
int refundOrderCount = refunded.Select(r => r.OrderId).Distinct().Count();
|
||||
Debug.WriteLine($"计算利润:{(salesAmount - buyerPaymentAmount - platformFeeTotal)}");
|
||||
Debug.WriteLine($"正常订单利润:{valid.Sum(r => (decimal)(r.Profit)) / 100}");
|
||||
Debug.WriteLine($"售后订单利润:{refunded.Sum(r => (decimal)(r.Profit)) / 100}");
|
||||
return new ShopRevenueSummary
|
||||
{
|
||||
SalesAmount = salesAmount,
|
||||
@@ -146,65 +114,65 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
|
||||
RefundAmount = refundAmount,
|
||||
RefundOrderCount = refundOrderCount,
|
||||
PlatformFeeTotal = platformFeeTotal,
|
||||
Commission = commission,
|
||||
Commission = 0m, // 新接口无“达人佣金”字段,保留占位
|
||||
AvgOrderAmount = validOrderCount == 0 ? 0m : salesAmount / validOrderCount,
|
||||
RefundRate = totalOrderCount == 0 ? 0m : (decimal)refundOrderCount * 100m / totalOrderCount,
|
||||
AverageProfitRate = purchaseAmount == 0m ? 0m : profit / purchaseAmount * 100m,
|
||||
AverageProfitRate = buyerPaymentAmount == 0m ? 0m : profit / buyerPaymentAmount * 100m,
|
||||
BuyerPaymentAmount = buyerPaymentAmount,
|
||||
BuyerRefundAmount = buyerRefundAmount,
|
||||
BuyerRefundSuccessedAmount = buyerRefundSuccessedAmount,
|
||||
};
|
||||
}
|
||||
/// <summary>
|
||||
/// 获取有效订单
|
||||
/// </summary>
|
||||
/// <param name="rows"></param>
|
||||
/// <returns></returns>
|
||||
public static List<ShopRevenueStatisticsRow> GetValidOrder(IEnumerable<ShopRevenueStatisticsRow> rows)
|
||||
{
|
||||
var list = GetPaymentOrderList(rows); //买手付钱后的订单数量
|
||||
return list.Where(IsValidOrder).ToList();
|
||||
}
|
||||
/// <summary>
|
||||
/// 获取退款订单
|
||||
/// </summary>
|
||||
/// <param name="rows"></param>
|
||||
/// <returns></returns>
|
||||
public static List<ShopRevenueStatisticsRow> GetRefundOrder(IEnumerable<ShopRevenueStatisticsRow> rows)
|
||||
{
|
||||
var list = GetPaymentOrderList(rows); //买手付钱后的订单数量
|
||||
return list.Where(IsRefunded).ToList();
|
||||
}
|
||||
/// <summary>
|
||||
/// 获取退款订单
|
||||
/// </summary>
|
||||
/// <param name="rows"></param>
|
||||
/// <returns></returns>
|
||||
public static List<ShopRevenueStatisticsRow> GetBuyerRefundRemainingOrder(IEnumerable<ShopRevenueStatisticsRow> rows)
|
||||
{
|
||||
var list = GetPaymentOrderList(rows); //买手付钱后的订单数量
|
||||
var refunded = list.Where(IsRefunded).ToList();
|
||||
|
||||
decimal buyerRefundAmount = refunded.Sum(r => (decimal)(r.OutAmount)) / 100m; //买手号退款金额(采购退款金额)
|
||||
decimal buyerRefundSuccessedAmount = refunded.Where(a => IsBuyerRefundSuccessful(a) == false).Sum(r => (decimal)(r.BuyerRefundAmount)) / 100m; //买手号退款成功金额
|
||||
|
||||
return refunded.Where(a => IsBuyerRefundSuccessful(a) == false).ToList();
|
||||
/// <summary>店铺统计表格(按店铺汇总,销售额倒序)</summary>
|
||||
public static List<ShopStatisticsItem> GetShopStatistics(IEnumerable<ShopStatsResponse> stats)
|
||||
{
|
||||
return GroupByShop(stats)
|
||||
.Select(g => BuildShopStatisticsItem(g.Key, g))
|
||||
.OrderByDescending(i => i.SalesAmount)
|
||||
.ToList();
|
||||
}
|
||||
|
||||
/// <summary>销售趋势(按天,缺失日期补 0,仅统计有效订单)</summary>
|
||||
public static List<RevenueTrendPoint> GetSalesTrend(IEnumerable<ShopRevenueStatisticsRow> rows, DateTime startDate, DateTime endDate)
|
||||
/// <summary>店铺销售占比(饼图,按店铺汇总,销售额倒序)</summary>
|
||||
public static List<ShopSalesProportionItem> GetShopSalesProportion(IEnumerable<ShopStatsResponse> stats)
|
||||
{
|
||||
var list = GetPaymentOrderList(rows);
|
||||
list = list.Where(IsValidOrder).ToList();
|
||||
var items = GroupByShop(stats)
|
||||
.Select(g => new ShopSalesProportionItem
|
||||
{
|
||||
ShopName = ResolveShopName(g.Key),
|
||||
SalesAmount = ToYuan(g.Sum(a => a.SalesAmount))
|
||||
})
|
||||
.OrderByDescending(i => i.SalesAmount)
|
||||
.ToList();
|
||||
|
||||
decimal total = items.Sum(i => i.SalesAmount);
|
||||
foreach (var item in items)
|
||||
{
|
||||
item.Percentage = total == 0m ? 0d : (double)(item.SalesAmount / total * 100m);
|
||||
}
|
||||
return items;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 销售趋势(按天,缺失日期补 0)。
|
||||
/// 数据来自 GetShopStatsTrend:服务端已经跨店铺合计,这里只做日期规整与补零。
|
||||
/// </summary>
|
||||
public static List<RevenueTrendPoint> GetSalesTrend(IEnumerable<ShopStatsTrendResponse> trend, DateTime startDate, DateTime endDate)
|
||||
{
|
||||
var list = (trend ?? Enumerable.Empty<ShopStatsTrendResponse>())
|
||||
.Where(a => a != null && a.StatDate != default(DateTime))
|
||||
.ToList();
|
||||
|
||||
var map = list
|
||||
.GroupBy(r => r.CreateTime.Date)
|
||||
.Where(a => a.StatDate.Date >= startDate.Date && a.StatDate.Date <= endDate.Date)
|
||||
.GroupBy(a => a.StatDate.Date)
|
||||
.ToDictionary(
|
||||
g => g.Key,
|
||||
g => new RevenueTrendPoint
|
||||
{
|
||||
Date = g.Key,
|
||||
SalesAmount = g.Sum(r => (decimal)(r.OrderPrice)) / 100m,
|
||||
OrderCount = g.Select(r => r.OrderId).Distinct().Count()
|
||||
SalesAmount = ToYuan(g.Sum(a => a.SalesAmount)),
|
||||
OrderCount = g.Sum(a => a.OrderCount)
|
||||
});
|
||||
|
||||
var result = new List<RevenueTrendPoint>();
|
||||
@@ -218,95 +186,23 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <summary>店铺销售占比(饼图,仅统计有效订单)</summary>
|
||||
public static List<ShopSalesProportionItem> GetShopSalesProportion(IEnumerable<ShopRevenueStatisticsRow> rows)
|
||||
/// <summary>
|
||||
/// 天/周/月周期统计表格(每天/每周/每月各一行,无数据的周期也补一行,金额单位:元)。
|
||||
/// 结果按周期倒序(最新的周期在最上面)。
|
||||
/// 说明:接口按“自然周期”聚合(周从周一起、月从 1 号起),所以筛选也按周期起点比较,
|
||||
/// 否则区间从周三开始时,那一周(周一起)的数据会被误判为越界而丢掉。
|
||||
/// </summary>
|
||||
public static List<ShopPeriodStatisticsItem> GetPeriodStatistics(IEnumerable<ShopStatsResponse> stats, DateTime startDate, DateTime endDate, PeriodStatisticType periodType)
|
||||
{
|
||||
var list = GetPaymentOrderList(rows);
|
||||
list = list.Where(IsValidOrder).ToList();
|
||||
decimal total = list.Sum(r => (decimal)(r.OrderPrice)) / 100m;
|
||||
var startPeriod = GetPeriodStart(startDate, periodType);
|
||||
var endPeriod = GetPeriodStart(endDate, periodType);
|
||||
|
||||
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)
|
||||
})
|
||||
.OrderByDescending(i => i.SalesAmount)
|
||||
.ToList();
|
||||
}
|
||||
|
||||
/// <summary>店铺统计表格</summary>
|
||||
public static List<ShopStatisticsItem> GetShopStatistics(IEnumerable<ShopRevenueStatisticsRow> rows)
|
||||
{
|
||||
var list = GetPaymentOrderList(rows); //买手付钱后的订单
|
||||
|
||||
return list
|
||||
.GroupBy(r => r.ShopName)
|
||||
.Select(g =>
|
||||
{
|
||||
var valid = g.Where(IsValidOrder).ToList();
|
||||
var refunded = g.Where(IsRefunded).ToList();
|
||||
decimal salesAmount = valid.Sum(r => (decimal)(r.OrderPrice)) / 100m; //与 GetSummary 一致:不含已退款订单的销售额
|
||||
int orderCount = valid.Select(r => r.OrderId).Distinct().Count();
|
||||
decimal profit = valid.Concat(refunded).Sum(r => (decimal)(r.Profit)) / 100m; //与 GetSummary 一致:有效+退款订单利润
|
||||
decimal purchaseAmount = valid.Sum(r => (decimal)(r.OutAmount)) / 100m; //与 GetSummary 一致:买手付款金额(采购金额)
|
||||
decimal buyerPaymentAmount = valid.Sum(r => (decimal)(r.OutAmount)) / 100m; //买手号付款金额(采购金额)
|
||||
return new ShopStatisticsItem
|
||||
{
|
||||
ShopName = string.IsNullOrEmpty(g.Key) ? "未知店铺" : g.Key,
|
||||
OrderCount = orderCount,
|
||||
SalesAmount = salesAmount,
|
||||
BuyerPaymentAmount = buyerPaymentAmount,
|
||||
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)
|
||||
.ToList();
|
||||
}
|
||||
|
||||
/// <summary>天/周/月周期统计表格(每天/每周/每月各一行,无数据的周期也补一行,金额单位:元)</summary>
|
||||
public static List<ShopPeriodStatisticsItem> GetPeriodStatistics(IEnumerable<ShopRevenueStatisticsRow> rows, DateTime startDate, DateTime endDate, PeriodStatisticType periodType)
|
||||
{
|
||||
var list = (rows ?? new List<ShopRevenueStatisticsRow>()).Where(a => a.OutAmount > 0).ToList(); //买手付钱后的订单
|
||||
|
||||
// 有数据的周期
|
||||
var map = list
|
||||
.GroupBy(r => GetPeriodStart(r.CreateTime, periodType))
|
||||
.ToDictionary(
|
||||
g => g.Key,
|
||||
g =>
|
||||
{
|
||||
var valid = g.Where(IsValidOrder).ToList();
|
||||
var refunded = g.Where(IsRefunded).ToList();
|
||||
decimal salesAmount = valid.Sum(r => (decimal)(r.OrderPrice)) / 100m; //与 GetSummary 一致:不含已退款订单的销售额
|
||||
decimal profit = valid.Concat(refunded).Sum(r => (decimal)(r.Profit)) / 100m; //与 GetSummary 一致:有效+退款订单利润
|
||||
decimal purchaseAmount = valid.Sum(r => (decimal)(r.OutAmount)) / 100m; //与 GetSummary 一致:买手付款金额(采购金额)
|
||||
int orderCount = valid.Select(r => r.OrderId).Distinct().Count();
|
||||
decimal buyerPaymentAmount = valid.Sum(r => (decimal)(r.OutAmount)) / 100m; //买手号付款金额(采购金额)
|
||||
|
||||
return new ShopPeriodStatisticsItem
|
||||
{
|
||||
PeriodStart = g.Key,
|
||||
Period = GetPeriodText(g.Key, periodType),
|
||||
OrderCount = orderCount,
|
||||
SalesAmount = salesAmount,
|
||||
BuyerPaymentAmount = buyerPaymentAmount,
|
||||
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
|
||||
};
|
||||
});
|
||||
var map = ToList(stats)
|
||||
.Where(a => a.StatDate != default(DateTime))
|
||||
.Select(a => new { Stat = a, PeriodStart = GetPeriodStart(a.StatDate, periodType) })
|
||||
.Where(a => a.PeriodStart >= startPeriod && a.PeriodStart <= endPeriod)
|
||||
.GroupBy(a => a.PeriodStart)
|
||||
.ToDictionary(g => g.Key, g => BuildPeriodStatisticsItem(g.Key, g.Select(a => a.Stat), periodType));
|
||||
|
||||
// 按周期补齐整段时间:无数据的周期也生成一行(全 0)
|
||||
var result = new List<ShopPeriodStatisticsItem>();
|
||||
@@ -321,6 +217,7 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
|
||||
Period = GetPeriodText(periodStart, periodType),
|
||||
OrderCount = 0,
|
||||
SalesAmount = 0m,
|
||||
BuyerPaymentAmount = 0m,
|
||||
Profit = 0m,
|
||||
RefundAmount = 0m,
|
||||
PlatformFeeTotal = 0m,
|
||||
@@ -336,6 +233,56 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <summary>店铺统计行(金额单位:元)</summary>
|
||||
private static ShopStatisticsItem BuildShopStatisticsItem(string shopId, IEnumerable<ShopStatsResponse> shopStats)
|
||||
{
|
||||
var list = ToList(shopStats);
|
||||
decimal salesAmount = ToYuan(list.Sum(a => a.SalesAmount));
|
||||
decimal profit = ToYuan(list.Sum(a => a.ProfitAmount));
|
||||
decimal buyerPaymentAmount = ToYuan(list.Sum(a => a.TotalPurchase));
|
||||
int orderCount = list.Sum(a => a.OrderCount);
|
||||
|
||||
return new ShopStatisticsItem
|
||||
{
|
||||
ShopName = ResolveShopName(shopId),
|
||||
OrderCount = orderCount,
|
||||
SalesAmount = salesAmount,
|
||||
BuyerPaymentAmount = buyerPaymentAmount,
|
||||
Profit = profit,
|
||||
RefundAmount = ToYuan(list.Sum(a => a.RefundDone) + list.Sum(a => a.RefundPending)),
|
||||
PlatformFeeTotal = ToYuan(list.Sum(a => a.PlatformFee)),
|
||||
Commission = 0m, // 新接口无“达人佣金”字段,保留占位
|
||||
AvgOrderAmount = orderCount == 0 ? 0m : salesAmount / orderCount,
|
||||
AverageProfitRate = buyerPaymentAmount == 0m ? 0m : profit / buyerPaymentAmount * 100m
|
||||
};
|
||||
}
|
||||
|
||||
/// <summary>周期统计行(金额单位:元)</summary>
|
||||
private static ShopPeriodStatisticsItem BuildPeriodStatisticsItem(DateTime periodStart, IEnumerable<ShopStatsResponse> periodStats, PeriodStatisticType periodType)
|
||||
{
|
||||
var list = ToList(periodStats);
|
||||
decimal salesAmount = ToYuan(list.Sum(a => a.SalesAmount));
|
||||
decimal profit = ToYuan(list.Sum(a => a.ProfitAmount));
|
||||
decimal buyerPaymentAmount = ToYuan(list.Sum(a => a.TotalPurchase));
|
||||
int orderCount = list.Sum(a => a.OrderCount);
|
||||
|
||||
return new ShopPeriodStatisticsItem
|
||||
{
|
||||
PeriodStart = periodStart,
|
||||
Period = GetPeriodText(periodStart, periodType),
|
||||
OrderCount = orderCount,
|
||||
SalesAmount = salesAmount,
|
||||
BuyerPaymentAmount = buyerPaymentAmount,
|
||||
Profit = profit,
|
||||
RefundAmount = ToYuan(list.Sum(a => a.RefundDone) + list.Sum(a => a.RefundPending)),
|
||||
PlatformFeeTotal = ToYuan(list.Sum(a => a.PlatformFee)),
|
||||
Commission = 0m, // 新接口无“达人佣金”字段,保留占位
|
||||
AverageProfitRate = buyerPaymentAmount == 0m ? 0m : profit / buyerPaymentAmount * 100m,
|
||||
CustomerCount = orderCount,
|
||||
AvgOrderAmount = orderCount == 0 ? 0m : salesAmount / orderCount
|
||||
};
|
||||
}
|
||||
|
||||
/// <summary>枚举 startDate~endDate 覆盖的所有周期开始日期(天/周/月)</summary>
|
||||
private static IEnumerable<DateTime> EnumeratePeriods(DateTime startDate, DateTime endDate, PeriodStatisticType periodType)
|
||||
{
|
||||
@@ -387,252 +334,261 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
|
||||
return periodStart.ToString("yyyy-MM-dd");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 默认实现:请求真实接口(shop_revenue_statistics/get_shop_order_amount)。
|
||||
/// 默认实现:请求新接口(无缓存,每次查询实时获取)。
|
||||
/// shop_revenue_statistics/GetShopStats
|
||||
/// -> Result<Dictionary<店铺ID, List<ShopStatsResponse>>>
|
||||
/// 请求体:UserLogin.GetSignPostData(new { StartDate, EndDate, ShopIds, GroupType });
|
||||
/// GroupType 决定聚合粒度(0=汇总 1=天 2=周 3=月),汇总时每个店铺只有一条。
|
||||
/// shop_revenue_statistics/GetShopStatsTrend
|
||||
/// -> Result<List<ShopStatsTrendResponse>>
|
||||
/// 请求体:UserLogin.GetSignPostData(new { StartDate, EndDate, ShopIds });
|
||||
/// 服务端跨店铺合计,固定按天返回,用于销售趋势折线图。
|
||||
/// shop_revenue_statistics/GetShopOrderDetails
|
||||
/// -> Result<List<ShopOrderDetailResponse>>
|
||||
/// 请求体:UserLogin.GetSignPostData(new { StartDate, EndDate, ShopIds, OrderType });
|
||||
/// 订单列表弹窗的明细数据(OrderType 见 ShopOrderDetailType)。
|
||||
/// 接口不返回“整段汇总”,页面上的汇总卡片一律由客户端对返回记录合计。
|
||||
/// 接入其他数据源时,新建实现类并注入即可(见 IShopRevenueStatisticsService 注释)。
|
||||
/// </summary>
|
||||
public class ShopRevenueStatisticsService : IShopRevenueStatisticsService
|
||||
{
|
||||
/// <summary>缓存有效期:订单/退款数据会持续变化,超过该时长后缓存自动失效并重新请求。</summary>
|
||||
private static readonly TimeSpan CacheDuration = TimeSpan.FromSeconds(60);
|
||||
/// <summary>统计接口地址(聚合粒度由请求参数 GroupType 决定)</summary>
|
||||
private const string GetShopStatsApi = "shop_revenue_statistics/GetShopStats";
|
||||
|
||||
/// <summary>
|
||||
/// 明细数据缓存(按天缓存,纯时间维度,不含店铺)。
|
||||
/// key = 日期(yyyyMMdd),value = 该天全部店铺的明细 + 缓存时间。
|
||||
/// 查询时按天命中:未命中的天合并成连续段一次请求,返回后按天拆分写入;
|
||||
/// 前台选某一个或某多个店铺时,按所选店铺(ShopName)过滤,复用同一批时间数据。
|
||||
/// </summary>
|
||||
private static readonly Dictionary<string, CacheEntry> _rowCache =
|
||||
new Dictionary<string, CacheEntry>();
|
||||
private readonly object _cacheLock = new object();
|
||||
/// <summary>销售趋势接口地址(服务端跨店铺合计,固定按天)</summary>
|
||||
private const string GetShopStatsTrendApi = "shop_revenue_statistics/GetShopStatsTrend";
|
||||
|
||||
private sealed class DateRange
|
||||
/// <summary>订单明细接口地址(订单列表弹窗用)</summary>
|
||||
private const string GetShopOrderDetailsApi = "shop_revenue_statistics/GetShopOrderDetails";
|
||||
|
||||
/// <summary>Unix 纪元(本地时区),用于解析以时间戳作为 Key 的返回数据</summary>
|
||||
private static readonly DateTime UnixEpoch = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1));
|
||||
|
||||
public async Task<ShopRevenueStatisticsResult> QueryAsync(ShopRevenueStatisticsQuery query)
|
||||
{
|
||||
public DateTime Start;
|
||||
public DateTime End;
|
||||
}
|
||||
// 综合统计页分两次取数,各取所需:
|
||||
// 1) Summary:每店铺一条(与区间长度无关),作为卡片/店铺统计表/销售占比的权威合计
|
||||
// 2) Trend :跨店铺合计的按天序列,只给趋势折线图用(数据量只与天数有关,不随店铺数膨胀)
|
||||
// 顺序请求:签名中的 time/code 由当前时间生成,并发请求有被判重复签名的风险。
|
||||
var summaryStats = await RequestStatsAsync(query, ShopStatsGroupType.Summary);
|
||||
var trend = await RequestTrendAsync(query);
|
||||
|
||||
private sealed class CacheEntry
|
||||
{
|
||||
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)
|
||||
return new ShopRevenueStatisticsResult
|
||||
{
|
||||
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;
|
||||
Summary = ShopStatsAggregator.GetSummary(summaryStats),
|
||||
Trend = ShopStatsAggregator.GetSalesTrend(trend, query.StartDate, query.EndDate),
|
||||
ShopProportions = ShopStatsAggregator.GetShopSalesProportion(summaryStats),
|
||||
ShopStatistics = ShopStatsAggregator.GetShopStatistics(summaryStats),
|
||||
};
|
||||
}
|
||||
|
||||
public async Task<List<ShopRevenueStatisticsRow>> QueryRowsAsync(ShopRevenueStatisticsQuery query)
|
||||
public async Task<ShopPeriodStatisticsResult> QueryPeriodStatisticsAsync(ShopRevenueStatisticsQuery query, PeriodStatisticType periodType)
|
||||
{
|
||||
var startDay = query.StartDate.Date;
|
||||
var endDay = query.EndDate.Date;
|
||||
if (startDay > endDay)
|
||||
// 按天/周/月粒度取数;接口不返回整段汇总,卡片由返回的周期记录在客户端合计
|
||||
var stats = await RequestStatsAsync(query, ToGroupType(periodType));
|
||||
|
||||
return new ShopPeriodStatisticsResult
|
||||
{
|
||||
var tmp = startDay;
|
||||
startDay = endDay;
|
||||
endDay = tmp;
|
||||
}
|
||||
Summary = ShopStatsAggregator.GetSummary(stats),
|
||||
Items = ShopStatsAggregator.GetPeriodStatistics(stats, query.StartDate, query.EndDate, periodType),
|
||||
};
|
||||
}
|
||||
|
||||
// 1. 找出未命中或已过期的天
|
||||
List<DateTime> missingDays;
|
||||
lock (_cacheLock)
|
||||
/// <summary>页面统计周期 → 接口聚合方式</summary>
|
||||
private static ShopStatsGroupType ToGroupType(PeriodStatisticType periodType)
|
||||
{
|
||||
switch (periodType)
|
||||
{
|
||||
missingDays = EnumerateDays(startDay, endDay)
|
||||
.Where(d => !IsValidLocked(d))
|
||||
.ToList();
|
||||
case PeriodStatisticType.Week:
|
||||
return ShopStatsGroupType.Week;
|
||||
case PeriodStatisticType.Month:
|
||||
return ShopStatsGroupType.Month;
|
||||
default:
|
||||
return ShopStatsGroupType.Day;
|
||||
}
|
||||
|
||||
// 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 rows = await RequestRowsAsync(shopIds, run.Start, run.End);
|
||||
CacheResponse(run.Start, run.End, rows);
|
||||
}
|
||||
}
|
||||
|
||||
// 3. 按天从缓存拼装完整范围,再按所选店铺过滤(ShopKeys 为空 = 全部店铺)
|
||||
return FilterByShop(GetCachedRows(startDay, endDay), query.ShopKeys);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 把一次请求的结果按天写入缓存。
|
||||
/// 本次请求覆盖的每一天都以返回数据为准整体替换(无数据的天记为空的已缓存,
|
||||
/// 避免“该天无数据”被反复判定为未命中而重复请求)。
|
||||
/// 请求 GetShopStats:返回按 GroupType 聚合的记录
|
||||
/// (汇总时每店铺一条;天/周/月时每店铺每个自然日/自然周/自然月一条)。
|
||||
/// </summary>
|
||||
private void CacheResponse(DateTime startDate, DateTime endDate, List<ShopRevenueStatisticsRow> rows)
|
||||
private static async Task<List<ShopStatsResponse>> RequestStatsAsync(ShopRevenueStatisticsQuery query, ShopStatsGroupType groupType)
|
||||
{
|
||||
if (rows == null)
|
||||
rows = new List<ShopRevenueStatisticsRow>();
|
||||
var shopIds = BuildShopIds(query);
|
||||
if (shopIds.Count == 0)
|
||||
return new List<ShopStatsResponse>();
|
||||
|
||||
lock (_cacheLock)
|
||||
var url = BaseClass.Build29WxObjString(GetShopStatsApi);
|
||||
var html = await GetHtml.PostJsonAsync(url, BuildPostData(query, shopIds, groupType));
|
||||
|
||||
var ret = Deserialize<Result<Dictionary<string, List<ShopStatsResponse>>>>(html);
|
||||
EnsureSuccess(ret);
|
||||
|
||||
var result = new List<ShopStatsResponse>();
|
||||
if (ret.Data == null)
|
||||
return result;
|
||||
|
||||
foreach (var kv in ret.Data)
|
||||
result.AddRange(Normalize(kv.Key, kv.Value));
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 请求 GetShopStatsTrend:跨店铺合计的按天销售趋势(服务端已合计,不需要 GroupType)。
|
||||
/// </summary>
|
||||
private static async Task<List<ShopStatsTrendResponse>> RequestTrendAsync(ShopRevenueStatisticsQuery query)
|
||||
{
|
||||
var shopIds = BuildShopIds(query);
|
||||
if (shopIds.Count == 0)
|
||||
return new List<ShopStatsTrendResponse>();
|
||||
|
||||
var url = BaseClass.Build29WxObjString(GetShopStatsTrendApi);
|
||||
var html = await GetHtml.PostJsonAsync(url, BuildTrendPostData(query, shopIds));
|
||||
|
||||
var ret = Deserialize<Result<List<ShopStatsTrendResponse>>>(html);
|
||||
EnsureSuccess(ret);
|
||||
return ret.Data ?? new List<ShopStatsTrendResponse>();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 组装请求体:StartDate / EndDate 传日期,ShopIds 传 ERP 店铺ID 列表,
|
||||
/// GroupType 传枚举数字(0=汇总 1=天 2=周 3=月)。
|
||||
/// </summary>
|
||||
private static object BuildPostData(ShopRevenueStatisticsQuery query, List<string> shopIds, ShopStatsGroupType groupType)
|
||||
{
|
||||
return UserLogin.GetSignPostData(new
|
||||
{
|
||||
RemoveExpiredEntriesLocked();
|
||||
StartDate = query.StartDate.Date,
|
||||
EndDate = query.EndDate.Date,
|
||||
ShopIds = shopIds,
|
||||
GroupType = (int)groupType,
|
||||
});
|
||||
}
|
||||
|
||||
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());
|
||||
/// <summary>组装趋势接口请求体:StartDate / EndDate + ShopIds(无 GroupType)</summary>
|
||||
private static object BuildTrendPostData(ShopRevenueStatisticsQuery query, List<string> shopIds)
|
||||
{
|
||||
return UserLogin.GetSignPostData(new
|
||||
{
|
||||
StartDate = query.StartDate.Date,
|
||||
EndDate = query.EndDate.Date,
|
||||
ShopIds = shopIds,
|
||||
});
|
||||
}
|
||||
|
||||
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>
|
||||
/// 组装订单明细请求体:StartDate / EndDate + ShopIds + OrderType
|
||||
/// (OrderType 传枚举数字:1=有效订单 2=退款订单 3=买手未退回金额的订单)。
|
||||
/// </summary>
|
||||
private static object BuildOrderDetailPostData(ShopRevenueStatisticsQuery query, List<string> shopIds, ShopOrderDetailType detailType)
|
||||
{
|
||||
return UserLogin.GetSignPostData(new
|
||||
{
|
||||
StartDate = query.StartDate,
|
||||
EndDate = query.EndDate,
|
||||
ShopIds = shopIds,
|
||||
OrderType = (int)detailType,
|
||||
});
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 查询店铺范围:query.ShopIds 为空表示全部店铺(取全部店铺的 ERP 店铺ID)。
|
||||
/// 接口的 ShopIds 使用 ShopLoginInfo.ErpShopId。
|
||||
/// </summary>
|
||||
private static List<string> BuildShopIds(ShopRevenueStatisticsQuery query)
|
||||
{
|
||||
var selected = (query == null || query.ShopIds == null)
|
||||
? new List<string>()
|
||||
: query.ShopIds.Where(a => !string.IsNullOrEmpty(a)).Distinct().ToList();
|
||||
|
||||
if (selected.Count > 0)
|
||||
return selected;
|
||||
|
||||
return GetShopOptions()
|
||||
.Select(a => a.ErpShopId)
|
||||
.Where(a => !string.IsNullOrEmpty(a))
|
||||
.Distinct()
|
||||
.ToList();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 反序列化接口返回;失败时统一抛出可读异常。
|
||||
/// 说明:Newtonsoft 默认按属性名匹配(忽略大小写),因此 PascalCase / camelCase 均可解析。
|
||||
/// </summary>
|
||||
private static T Deserialize<T>(string html)
|
||||
{
|
||||
try
|
||||
{
|
||||
return JsonConvert.DeserializeObject<T>(html);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
throw new Exception("查询失败:接口返回数据解析异常", ex);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>按天从缓存拼装某时间范围的明细(返回新列表,避免外部修改污染缓存)</summary>
|
||||
private List<ShopRevenueStatisticsRow> GetCachedRows(DateTime startDate, DateTime endDate)
|
||||
/// <summary>校验接口返回码</summary>
|
||||
private static void EnsureSuccess(Result result)
|
||||
{
|
||||
var result = new List<ShopRevenueStatisticsRow>();
|
||||
lock (_cacheLock)
|
||||
if (result == null)
|
||||
throw new Exception("查询失败:接口无返回数据");
|
||||
if (result.Code != 200)
|
||||
throw new Exception(string.IsNullOrEmpty(result.Msg) ? "查询失败" : result.Msg);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 摊平某个 Key(店铺ID)下的记录,并用 Key 兜底补齐缺失的 ShopId / StatDate。
|
||||
/// </summary>
|
||||
private static List<ShopStatsResponse> Normalize(string key, List<ShopStatsResponse> items)
|
||||
{
|
||||
var result = new List<ShopStatsResponse>();
|
||||
if (items == null)
|
||||
return result;
|
||||
|
||||
foreach (var item in items)
|
||||
{
|
||||
foreach (var day in EnumerateDays(startDate, endDate))
|
||||
if (item == null)
|
||||
continue;
|
||||
|
||||
if (string.IsNullOrEmpty(item.ShopId))
|
||||
item.ShopId = key;
|
||||
|
||||
if (item.StatDate == default(DateTime))
|
||||
{
|
||||
if (_rowCache.TryGetValue(CacheKey(day), out var entry))
|
||||
result.AddRange(entry.Rows);
|
||||
var date = ParseDateFromKey(key);
|
||||
if (date.HasValue)
|
||||
item.StatDate = date.Value;
|
||||
}
|
||||
|
||||
result.Add(item);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <summary>按所选店铺过滤明细:ShopKeys 为空/Null 返回全部;否则按店铺名(ShopName)精确匹配。</summary>
|
||||
private static List<ShopRevenueStatisticsRow> FilterByShop(List<ShopRevenueStatisticsRow> rows, List<string> shopKeys)
|
||||
/// <summary>尝试把返回数据的 Key 解析为日期(支持 yyyy-MM-dd / yyyyMMdd / 秒或毫秒时间戳)</summary>
|
||||
private static DateTime? ParseDateFromKey(string key)
|
||||
{
|
||||
if (rows == null)
|
||||
return new List<ShopRevenueStatisticsRow>();
|
||||
if (string.IsNullOrEmpty(key))
|
||||
return null;
|
||||
|
||||
if (shopKeys == null || shopKeys.Count == 0)
|
||||
return new List<ShopRevenueStatisticsRow>(rows);
|
||||
if (DateTime.TryParse(key, out var date))
|
||||
return date;
|
||||
|
||||
var shops = GetShopOptions()
|
||||
.Where(a => shopKeys.Contains(a.AppKey))
|
||||
.Where(a => !string.IsNullOrEmpty(a.ShopName))
|
||||
.ToList();
|
||||
if (shops.Count == 0)
|
||||
return new List<ShopRevenueStatisticsRow>();
|
||||
if (DateTime.TryParseExact(key, "yyyyMMdd", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None, out date))
|
||||
return date;
|
||||
|
||||
return rows
|
||||
.Where(r => shops.Any(s => string.Equals(r.ShopName, s.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)
|
||||
{
|
||||
var url = BaseClass.Build29WxObjString("shop_revenue_statistics/get_shop_order_amount");
|
||||
var sb = new StringBuilder();
|
||||
sb.Append(UserLogin.GetSignaturex());
|
||||
sb.Append("&shop_ids=").Append(string.Join(",", shopIds));
|
||||
sb.Append("&start_time=").Append(BaseClass.ConvertDateTimeLong(startDate.Date));
|
||||
sb.Append("&end_time=").Append(BaseClass.ConvertDateTimeLong(endDate.Date.AddDays(1).AddTicks(-1)));
|
||||
var html = await GetHtml.PostUtf8Async(url, sb.ToString());
|
||||
|
||||
try
|
||||
if (long.TryParse(key, out var timestamp))
|
||||
{
|
||||
var ret = JsonConvert.DeserializeObject<Result<List<ShopRevenueStatisticsRow>>>(html, new JsonSerializerSettings
|
||||
{
|
||||
ContractResolver = new CamelCasePropertyNamesContractResolver()
|
||||
});
|
||||
if (ret.Code != 200)
|
||||
{
|
||||
throw new Exception(ret.Msg);
|
||||
}
|
||||
return ret.Data ?? new List<ShopRevenueStatisticsRow>();
|
||||
|
||||
}
|
||||
catch
|
||||
{
|
||||
throw new Exception("查询失败");
|
||||
return timestamp.ToString().Length == 13
|
||||
? UnixEpoch.AddMilliseconds(timestamp)
|
||||
: UnixEpoch.AddSeconds(timestamp);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public async Task<ShopRevenueSummary> GetSummaryAsync(ShopRevenueStatisticsQuery query)
|
||||
{
|
||||
var rows = await QueryRowsAsync(query);
|
||||
return RevenueStatisticsAggregator.GetSummary(rows);
|
||||
}
|
||||
|
||||
public async Task<List<RevenueTrendPoint>> GetSalesTrendAsync(ShopRevenueStatisticsQuery query)
|
||||
{
|
||||
var rows = await QueryRowsAsync(query);
|
||||
return RevenueStatisticsAggregator.GetSalesTrend(rows, query.StartDate, query.EndDate);
|
||||
}
|
||||
|
||||
public async Task<List<ShopSalesProportionItem>> GetShopSalesProportionAsync(ShopRevenueStatisticsQuery query)
|
||||
{
|
||||
var rows = await QueryRowsAsync(query);
|
||||
return RevenueStatisticsAggregator.GetShopSalesProportion(rows);
|
||||
}
|
||||
|
||||
public async Task<List<ShopStatisticsItem>> GetShopStatisticsAsync(ShopRevenueStatisticsQuery query)
|
||||
{
|
||||
var rows = await QueryRowsAsync(query);
|
||||
return RevenueStatisticsAggregator.GetShopStatistics(rows);
|
||||
}
|
||||
|
||||
/// <summary>获取天/周/月周期统计表格</summary>
|
||||
public async Task<List<ShopPeriodStatisticsItem>> GetPeriodStatisticsAsync(ShopRevenueStatisticsQuery query, PeriodStatisticType periodType)
|
||||
{
|
||||
var rows = await QueryRowsAsync(query);
|
||||
return RevenueStatisticsAggregator.GetPeriodStatistics(rows, query.StartDate, query.EndDate, periodType);
|
||||
return null;
|
||||
}
|
||||
|
||||
/// <summary>店铺下拉列表(同步读取,供查询与过滤使用)</summary>
|
||||
@@ -641,8 +597,8 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
|
||||
return GlobalConfig.ShopLoginList.Select(a =>
|
||||
new ShopOption()
|
||||
{
|
||||
AppKey = a.ShopId,
|
||||
ShopId = a.ErpShopId,
|
||||
ShopId = a.ShopId,
|
||||
ErpShopId = a.ErpShopId,
|
||||
ShopName = a.ShopAccount
|
||||
}).ToList();
|
||||
}
|
||||
@@ -652,5 +608,23 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
|
||||
return Task.FromResult(GetShopOptions());
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 订单明细列表(有效订单 / 退款订单 / 买手未退回金额的订单),供订单列表弹窗使用。
|
||||
/// 请求 shop_revenue_statistics/GetShopOrderDetails:
|
||||
/// StartDate / EndDate / ShopIds / OrderType(OrderType 由 detailType 决定,按数字传值)。
|
||||
/// </summary>
|
||||
public async Task<List<ShopOrderDetailResponse>> QueryOrderRowsAsync(ShopRevenueStatisticsQuery query, ShopOrderDetailType detailType)
|
||||
{
|
||||
var shopIds = BuildShopIds(query);
|
||||
if (shopIds.Count == 0)
|
||||
return new List<ShopOrderDetailResponse>();
|
||||
|
||||
var url = BaseClass.Build29WxObjString(GetShopOrderDetailsApi);
|
||||
var html = await GetHtml.PostJsonAsync(url, BuildOrderDetailPostData(query, shopIds, detailType));
|
||||
|
||||
var ret = Deserialize<Result<List<ShopOrderDetailResponse>>>(html);
|
||||
EnsureSuccess(ret);
|
||||
return ret.Data ?? new List<ShopOrderDetailResponse>();
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user