diff --git a/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs b/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs index 95d04a5..0e22894 100644 --- a/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs +++ b/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs @@ -97,7 +97,7 @@ namespace Hncore.Pass.Vpn.Controllers [HttpGet] public ApiResult Statistics([FromQuery]OrderQueryRequest request) { - var ret = m_ProductOrderService.Statistics(request.BTime, request.ETime); + var ret = m_ProductOrderService.Statistics(request.BTime, request.ETime, Convert.ToInt32(request.ProductId)); return Success(ret); } @@ -105,7 +105,7 @@ namespace Hncore.Pass.Vpn.Controllers [HttpGet] public ApiResult SellerStatistics([FromQuery]OrderQueryRequest request) { - var ret = m_ProductOrderService.SellerStatistics(request.BTime, request.ETime); + var ret = m_ProductOrderService.SellerStatistics(request.BTime, request.ETime,request.Channel); return Success(ret); } diff --git a/Services/Hncore.Pass.Vpn/Request/Product/OrderQueryRequest.cs b/Services/Hncore.Pass.Vpn/Request/Product/OrderQueryRequest.cs index aa7aa02..f0ef14b 100644 --- a/Services/Hncore.Pass.Vpn/Request/Product/OrderQueryRequest.cs +++ b/Services/Hncore.Pass.Vpn/Request/Product/OrderQueryRequest.cs @@ -16,6 +16,7 @@ namespace Hncore.Pass.Vpn.Request.Product public int? ProductId { get; set; } public int? PackageId { get; set; } + public string Channel { get; set; } public List ProductIds { get; set; } diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs index d855ad7..a41f045 100644 --- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs +++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs @@ -114,7 +114,7 @@ FROM product_order where OrderState=20 or OrderState=90 or OrderState=40 or Orde return m_DbContext.ExecSqlQuery(sql).ToList(); } - public List Statistics(DateTime? bTime, DateTime? eTime) + public List Statistics(DateTime? bTime, DateTime? eTime, int ProductId) { string where = $" (OrderState=20 or OrderState=90 or OrderState=40 or OrderState=50 or OrderState=30) "; if (bTime.HasValue && eTime.HasValue) @@ -122,6 +122,10 @@ FROM product_order where OrderState=20 or OrderState=90 or OrderState=40 or Orde where += $"and UpdateTime>'{bTime.Value.ToString("yyyy-MM-dd")}' and UpdateTime<'{eTime.Value.ToString("yyyy-MM-dd")}'"; } + if (ProductId!=0){ + where += $"and ProductId='{ProductId}'"; + } + string sql = $@"SELECT ProductName, PackageName, sum( @@ -162,13 +166,19 @@ FROM product_order where {where} GROUP BY ProductName, PackageName order by Prod return m_DbContext.ExecSqlQuery(sql).ToList(); } - public List SellerStatistics(DateTime? bTime, DateTime? eTime) + public List SellerStatistics(DateTime? bTime, DateTime? eTime, string Channel) { string where = $" OrderState=90 and Channel IS NOT NULL "; if (bTime.HasValue && eTime.HasValue) { where += $"and CreateTime>'{bTime.Value.ToString("yyyy-MM-dd")}' and CreateTime<'{eTime.Value.ToString("yyyy-MM-dd")}'"; + } else + { + where += $"and CreateTime>'{DateTime.Now.ToString("yyyy-MM-dd")}' and CreateTime<'{DateTime.Now.AddDays(1).ToString("yyyy-MM-dd")}'"; + } + if (Channel.Has()){ + where += $"and Channel='{Channel}'"; } string sql = $@"SELECT Channel,ProductName,