wyk/juipnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【管理端修改】 https://www.tapd.cn/39598945/prong/stories/view/1139598945001000225

Browse Source
This commit is contained in:
“wanyongkang”
2021-05-28 17:26:55 +08:00
parent 4e3185dc8f
commit 8558a808dc
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs
View File

@@ -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);
}

1
Services/Hncore.Pass.Vpn/Request/Product/OrderQueryRequest.cs
View File

@@ -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<int> ProductIds { get; set; }

14
Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
View File

@@ -114,7 +114,7 @@ FROM product_order where OrderState=20 or OrderState=90 or OrderState=40 or Orde
return m_DbContext.ExecSqlQuery<OrderStatisticModel>(sql).ToList();
}
public List<OrderStatisticModel> Statistics(DateTime? bTime, DateTime? eTime)
public List<OrderStatisticModel> 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<OrderStatisticModel>(sql).ToList();
}
public List<OrderStatisticModel> SellerStatistics(DateTime? bTime, DateTime? eTime)
public List<OrderStatisticModel> 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,