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
ff8e5e10
Commit
ff8e5e10
authored
Jul 11, 2019
by
guanzhenshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
利润接口增加仓库编码,货值字段
parent
561e6555
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
1 deletion
+13
-1
dc_base_oms_sku.cs
Bailun.DC.Models/Orders/dc_base_oms_sku.cs
+5
-0
OrdersServices.cs
Bailun.DC.Services/OrdersServices.cs
+0
-0
ApiController.cs
Bailun.DC.Web/Controllers/ApiController.cs
+8
-1
No files found.
Bailun.DC.Models/Orders/dc_base_oms_sku.cs
View file @
ff8e5e10
...
@@ -545,5 +545,10 @@ namespace Bailun.DC.Models.Orders
...
@@ -545,5 +545,10 @@ namespace Bailun.DC.Models.Orders
/// 上架费
/// 上架费
/// </summary>
/// </summary>
public
decimal
?
putawayfee
{
get
;
set
;
}
public
decimal
?
putawayfee
{
get
;
set
;
}
/// <summary>
/// 货值
/// </summary>
public
decimal
?
productvalue
{
get
;
set
;
}
}
}
}
}
Bailun.DC.Services/OrdersServices.cs
View file @
ff8e5e10
This diff is collapsed.
Click to expand it.
Bailun.DC.Web/Controllers/ApiController.cs
View file @
ff8e5e10
...
@@ -239,6 +239,11 @@ namespace Bailun.DC.Web.Controllers
...
@@ -239,6 +239,11 @@ namespace Bailun.DC.Web.Controllers
a
.
bailun_account_id
,
a
.
bailun_account_id
,
a
.
shipping_time
,
a
.
shipping_time
,
a
.
has_delete
,
a
.
has_delete
,
quantity_shipped
=
a
.
bailun_sku_quantity_shipped
,
a
.
warehouse_code
,
a
.
id
,
a
.
productvalue
,
});
});
return
Json
(
new
{
return
Json
(
new
{
...
@@ -284,7 +289,8 @@ namespace Bailun.DC.Web.Controllers
...
@@ -284,7 +289,8 @@ namespace Bailun.DC.Web.Controllers
"PaypalOnFile"
,
"PaypalOnFile"
,
"PrivateListing"
,
"PrivateListing"
,
"SubscriptionSMBasic"
,
"SubscriptionSMBasic"
,
"SubtitleFee"
};
"SubtitleFee"
};
}
}
else
if
(
m
.
type
==
2
)
//广告费
else
if
(
m
.
type
==
2
)
//广告费
{
{
...
@@ -298,6 +304,7 @@ namespace Bailun.DC.Web.Controllers
...
@@ -298,6 +304,7 @@ namespace Bailun.DC.Web.Controllers
var
obj
=
new
Services
.
OrdersServices
().
ListEbayFee
(
m
.
page
,
pagesize
,
m
.
start
,
m
.
end
,
arrtype
.
ToArray
());
var
obj
=
new
Services
.
OrdersServices
().
ListEbayFee
(
m
.
page
,
pagesize
,
m
.
start
,
m
.
end
,
arrtype
.
ToArray
());
var
list
=
obj
.
Select
(
a
=>
new
{
var
list
=
obj
.
Select
(
a
=>
new
{
a
.
id
,
a
.
account_entry_type
,
a
.
account_entry_type
,
a
.
description
,
a
.
description
,
bj_date
=
a
.
bj_date
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
),
bj_date
=
a
.
bj_date
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
),
...
...
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