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
bc8cf544
Commit
bc8cf544
authored
Oct 24, 2019
by
guanzhenshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
亚马逊广告费导出增加站点字段
parent
76adec1b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
3 deletions
+9
-3
dc_base_finance_amazon_ad_product.cs
Bailun.DC.Models/dc_base_finance_amazon_ad_product.cs
+5
-0
OrdersServices.cs
Bailun.DC.Services/OrdersServices.cs
+1
-1
OrdersController.cs
Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs
+3
-2
No files found.
Bailun.DC.Models/dc_base_finance_amazon_ad_product.cs
View file @
bc8cf544
...
...
@@ -225,5 +225,10 @@ namespace Bailun.DC.Models
public
decimal
cost_rmb
{
get
;
set
;
}
public
string
account_name
{
get
;
set
;
}
/// <summary>
/// 站点
/// </summary>
public
string
site_en
{
get
;
set
;
}
}
}
Bailun.DC.Services/OrdersServices.cs
View file @
bc8cf544
...
...
@@ -4754,7 +4754,7 @@ namespace Bailun.DC.Services
public
List
<
dc_base_finance_amazon_ad_product
>
ListAmazonADSku
(
string
account
,
DateTime
?
start
,
DateTime
?
end
,
int
?
companyid
)
{
var
sqlparam
=
new
DynamicParameters
();
var
sql
=
"select t2.account_name,t1.sku,t1.currency,cost,(cost*exchange_rate) cost_rmb,report_date,asin from dc_base_finance_amazon_ad_product t1 join dc_base_company_account t2 on t1.account_id=t2.account_id "
;
var
sql
=
"select t2.account_name,t1.sku,t1.currency,cost,(cost*exchange_rate) cost_rmb,report_date,asin
,t2.site_en
from dc_base_finance_amazon_ad_product t1 join dc_base_company_account t2 on t1.account_id=t2.account_id "
;
if
(!
string
.
IsNullOrEmpty
(
account
))
{
...
...
Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs
View file @
bc8cf544
...
...
@@ -2213,10 +2213,11 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
a
.
currency
,
cost_rmb
=
a
.
cost_rmb
.
ToString
(
"N2"
),
report_date
=
a
.
report_date
.
ToString
(
"yyyy-MM-dd"
),
a
.
site_en
,
});
var
colNames
=
new
List
<
string
>
{
"帐号"
,
"SKU"
,
"费用"
,
"币种"
,
"费用RMB"
,
"ASIN"
,
"报告日期"
"ASIN"
,
"
站点"
,
"
报告日期"
};
var
listVal
=
new
List
<
string
>();
...
...
@@ -2224,7 +2225,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
{
listVal
.
Add
(
item
.
account_name
+
"|"
+
item
.
sku
+
"|"
+
item
.
cost
+
"|"
+
item
.
currency
+
"|"
+
item
.
cost_rmb
+
"|"
+
item
.
asin
+
"|"
+
item
.
report_date
item
.
asin
+
"|"
+
item
.
site_en
+
"|"
+
item
.
report_date
);
}
...
...
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