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
185b430f
Commit
185b430f
authored
Mar 25, 2020
by
guanzhenshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
同上
parent
d93a1435
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
19 deletions
+19
-19
OrdersController.cs
Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs
+19
-19
No files found.
Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs
View file @
185b430f
...
...
@@ -1686,16 +1686,16 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
//退款
var
listRefund_FJH
=
_service
.
ListSku_FJH_L_2_Refund
(
dtstart
,
dtend
,
companyid
,
platform
,
website
,
currency
.
ToUpper
()
==
"USD"
,
false
,
producttype
,
skusource
,
shippingstrategy
);
//不包含未发货的退款金额
//
var listRefund_FJH = _service.ListSku_FJH_L_2_Refund(dtstart, dtend, companyid, platform, website, currency.ToUpper() == "USD", false, producttype, skusource, shippingstrategy); //不包含未发货的退款金额
foreach
(
var
item
in
listRefund
)
{
var
objRefundFJH
=
listRefund_FJH
.
Where
(
a
=>
a
.
platform_type
==
item
.
platform_type
).
FirstOrDefault
();
if
(
objRefundFJH
!=
null
)
{
item
.
amount_refund
+=
objRefundFJH
.
amount_refund
;
}
}
//
foreach (var item in listRefund)
//
{
//
var objRefundFJH = listRefund_FJH.Where(a => a.platform_type == item.platform_type).FirstOrDefault();
//
if (objRefundFJH != null)
//
{
//
item.amount_refund += objRefundFJH.amount_refund;
//
}
//
}
}
...
...
@@ -1734,16 +1734,16 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
}
//退款
var
listRefund_FJH
=
_service
.
ListSku_FJH_L_2_Refund
(
dtstart
,
dtend
,
companyid
,
platform
,
website
,
currency
.
ToUpper
()
==
"USD"
,
false
,
producttype
,
skusource
,
shippingstrategy
);
//不包含未发货的退款金额
foreach
(
var
item
in
listRefund
)
{
var
objRefundFJH
=
listRefund_FJH
.
Where
(
a
=>
a
.
platform_type
==
item
.
platform_type
).
FirstOrDefault
();
if
(
objRefundFJH
!=
null
)
{
item
.
amount_refund
+=
objRefundFJH
.
amount_refund
;
}
}
//
var listRefund_FJH = _service.ListSku_FJH_L_2_Refund(dtstart, dtend, companyid, platform, website, currency.ToUpper() == "USD", false, producttype, skusource, shippingstrategy); //不包含未发货的退款金额
//
foreach (var item in listRefund)
//
{
//
var objRefundFJH = listRefund_FJH.Where(a => a.platform_type == item.platform_type).FirstOrDefault();
//
if (objRefundFJH != null)
//
{
//
item.amount_refund += objRefundFJH.amount_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