Commit b84f209e by guanzhenshan

修复平台利润统计报表 选择平台进行过滤的无法筛选的问题

parent 563a41b9
...@@ -11,23 +11,23 @@ namespace Bailun.DC.SyncSkuFinanceCategory ...@@ -11,23 +11,23 @@ namespace Bailun.DC.SyncSkuFinanceCategory
/// 同步sku财务分类 /// 同步sku财务分类
/// </summary> /// </summary>
/// <param name="args"></param> /// <param name="args"></param>
static async Task Main(string[] args) //static async Task Main(string[] args)
{ //{
Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); // Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
var builder = new HostBuilder().ConfigureServices((hostContext, services) => // var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
{ // {
services.AddHostedService<Services>(); // services.AddHostedService<Services>();
}); // });
await builder.RunConsoleAsync(); // await builder.RunConsoleAsync();
} //}
//static void Main(string[] args) static void Main(string[] args)
//{ {
// //Console.WriteLine("Hello World!"); //Console.WriteLine("Hello World!");
// new Services().init(); new Services().Init();
//} }
} }
} }
...@@ -1809,9 +1809,13 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -1809,9 +1809,13 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
{ {
result = _service.ListPlatformProfitByShipTime(platform, website, start, end, shipstart, shipend, currency.ToUpper() == "USD", companyid, skucategoryids, null, null, null,statistictype, skunewcategory); result = _service.ListPlatformProfitByShipTime(platform, website, start, end, shipstart, shipend, currency.ToUpper() == "USD", companyid, skucategoryids, null, null, null,statistictype, skunewcategory);
var fbaResult = _service.ListPlatformProfit(string.IsNullOrEmpty(platform) ? "FBA" : "", website, null, null, null, null, currency.ToUpper() == "USD", companyid, skucategoryids, shipstart, shipend); if(platform.Trim()=="FBA")
{
var fbaResult = _service.ListPlatformProfit(string.IsNullOrEmpty(platform) ? "FBA" : "", website, null, null, null, null, currency.ToUpper() == "USD", companyid, skucategoryids, shipstart, shipend);
result.AddRange(fbaResult); result.AddRange(fbaResult);
}
dtstart = shipstart; dtstart = shipstart;
dtend = shipend; dtend = shipend;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment