Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
DataCenter_Core2.1_20190520
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bltdc
DataCenter_Core2.1_20190520
Commits
b84f209e
Commit
b84f209e
authored
Sep 18, 2020
by
guanzhenshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复平台利润统计报表 选择平台进行过滤的无法筛选的问题
parent
563a41b9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
16 deletions
+20
-16
Program.cs
Bailun.DC.SyncSkuFinanceCategory/Program.cs
+14
-14
OrdersController.cs
Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs
+6
-2
No files found.
Bailun.DC.SyncSkuFinanceCategory/Program.cs
View file @
b84f209e
...
...
@@ -11,23 +11,23 @@ namespace Bailun.DC.SyncSkuFinanceCategory
/// 同步sku财务分类
/// </summary>
/// <param name="args"></param>
static
async
Task
Main
(
string
[]
args
)
{
Console
.
WriteLine
(
"启动服务 "
+
DateTime
.
Now
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
));
var
builder
=
new
HostBuilder
().
ConfigureServices
((
hostContext
,
services
)
=>
{
services
.
AddHostedService
<
Services
>();
});
//
static async Task Main(string[] args)
//
{
//
Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
//
var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
//
{
//
services.AddHostedService<Services>();
//
});
await
builder
.
RunConsoleAsync
();
}
//
await builder.RunConsoleAsync();
//
}
//
static void Main(string[] args)
//
{
//
//Console.WriteLine("Hello World!");
static
void
Main
(
string
[]
args
)
{
//Console.WriteLine("Hello World!");
// new Services().i
nit();
new
Services
().
I
nit
();
//
}
}
}
}
Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs
View file @
b84f209e
...
...
@@ -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
);
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
;
dtend
=
shipend
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment