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
c5289018
Commit
c5289018
authored
Aug 08, 2019
by
guanzhenshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、调整拦截订单接口
2、调整ebay销售统计的汇损比例为2.5%
parent
f1fb5029
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
OrdersServices.cs
Bailun.DC.Services/OrdersServices.cs
+1
-1
OrdersController.cs
Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs
+5
-0
No files found.
Bailun.DC.Services/OrdersServices.cs
View file @
c5289018
...
@@ -4692,7 +4692,7 @@ namespace Bailun.DC.Services
...
@@ -4692,7 +4692,7 @@ namespace Bailun.DC.Services
if
(
end
.
HasValue
)
if
(
end
.
HasValue
)
{
{
sql
+=
" and paid_time<@end"
;
sql
+=
" and paid_time<@end"
;
sqlparam
.
Add
(
"end"
,
end
.
Value
.
AddDays
(
1
)
);
sqlparam
.
Add
(
"end"
,
end
.
Value
);
}
}
if
(!
string
.
IsNullOrEmpty
(
platform
))
if
(!
string
.
IsNullOrEmpty
(
platform
))
...
...
Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs
View file @
c5289018
...
@@ -2403,6 +2403,11 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
...
@@ -2403,6 +2403,11 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
withdrawpercent
=
objwithdraw
.
Loss_withdrawal_percent
.
Value
;
withdrawpercent
=
objwithdraw
.
Loss_withdrawal_percent
.
Value
;
}
}
if
(
platform
.
ToLower
()
==
"ebay"
)
//ebay的汇损为2.5%
{
withdrawpercent
=
0.025
m
;
}
var
obj
=
_services
.
ListEbayStatisticsByWebsite
(
request
,
platform
,
website
,
selleraccount
,
start
,
end
,
warehousetype
,
warehousecode
,
companyid
,
ref
total
,
skucategoryids
);
var
obj
=
_services
.
ListEbayStatisticsByWebsite
(
request
,
platform
,
website
,
selleraccount
,
start
,
end
,
warehousetype
,
warehousecode
,
companyid
,
ref
total
,
skucategoryids
);
var
countM
=
_services
.
ListEbayStatisticsCount
(
platform
,
website
,
selleraccount
,
start
,
end
,
warehousetype
,
warehousecode
,
companyid
,
skucategoryids
);
var
countM
=
_services
.
ListEbayStatisticsCount
(
platform
,
website
,
selleraccount
,
start
,
end
,
warehousetype
,
warehousecode
,
companyid
,
skucategoryids
);
...
...
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