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
8f7f3f32
Commit
8f7f3f32
authored
Jan 05, 2021
by
guanzhenshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加广告费编辑
parent
f6173c37
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
2 deletions
+16
-2
dc_month_sales_profit.cs
Bailun.DC.Models/dc_month_sales_profit.cs
+2
-0
mMonthSaleProfitNew_Input.cs
Bailun.DC.Models/mMonthSaleProfitNew_Input.cs
+6
-0
FinanceReportServices.cs
Bailun.DC.Services/FinanceReportServices.cs
+8
-2
No files found.
Bailun.DC.Models/dc_month_sales_profit.cs
View file @
8f7f3f32
...
...
@@ -134,6 +134,8 @@ namespace Bailun.DC.Models
/// </summary>
public
decimal
fee_storage_incidentals
{
get
;
set
;
}
public
decimal
fee_add
{
get
;
set
;
}
/// <summary>
/// 付现销售费用
/// </summary>
...
...
Bailun.DC.Models/mMonthSaleProfitNew_Input.cs
View file @
8f7f3f32
...
...
@@ -87,6 +87,12 @@ namespace Bailun.DC.Models
/// 平台退款
/// </summary>
public
decimal
?
fee_refund
{
get
;
set
;
}
/// <summary>
/// 广告
/// </summary>
public
decimal
?
fee_ad
{
get
;
set
;
}
/// <summary>
/// 平台提现回款
/// </summary>
...
...
Bailun.DC.Services/FinanceReportServices.cs
View file @
8f7f3f32
...
...
@@ -5287,6 +5287,8 @@ group by currency";
fee_storage
=
0
,
fee_storage_incidentals
=
0
,
fee_ad
=
0
,
cost_fuzhuang
=
0
,
cost
=
0
,
...
...
@@ -5430,7 +5432,10 @@ group by currency";
obj
.
fee_platform
=
m
.
fee_platform
.
Value
;
}
if
(
m
.
fee_ad
.
HasValue
)
{
obj
.
fee_ad
=
m
.
fee_ad
.
Value
;
}
if
(
m
.
fee_refund
.
HasValue
)
{
...
...
@@ -5448,6 +5453,7 @@ group by currency";
obj
.
fee_storage_incidentals
=
m
.
fee_storage_incidentals
.
Value
;
}
if
(
m
.
incoming_non_operating
.
HasValue
)
{
obj
.
incoming_non_operating
=
m
.
incoming_non_operating
.
Value
;
...
...
@@ -5515,7 +5521,7 @@ group by currency";
sql_update
+=
" ,cost="
+
obj
.
cost
;
//平台扣费及退款
obj
.
fee_platform_and_refund
=
obj
.
fee_platform
+
obj
.
fee_fba
+
obj
.
fee_refund
;
obj
.
fee_platform_and_refund
=
obj
.
fee_platform
+
obj
.
fee_fba
+
obj
.
fee_refund
+
obj
.
fee_ad
;
sql_update
+=
" ,fee_platform_and_refund="
+
obj
.
fee_platform_and_refund
;
//物流仓储费用 = 头程运输+直邮物流费+海外仓仓储+海外仓杂费
...
...
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