Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mall.oytour.com
Project
Project
Details
Activity
Releases
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
黄奎
mall.oytour.com
Commits
b3beabf2
Commit
b3beabf2
authored
Oct 14, 2020
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交收益核算手续费
parent
93e212e0
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
247 additions
and
27 deletions
+247
-27
OrderStatistics_Query.cs
Mall.Model/Query/OrderStatistics_Query.cs
+5
-2
StatisticsModule.cs
Mall.Module.MarketingCenter/StatisticsModule.cs
+24
-0
RB_Goods_OrderRepository.cs
Mall.Repository/Product/RB_Goods_OrderRepository.cs
+144
-16
LiveHouseController.cs
Mall.WebApi/Controllers/AppletWeChat/LiveHouseController.cs
+74
-9
No files found.
Mall.Model/Query/OrderStatistics_Query.cs
View file @
b3beabf2
...
...
@@ -14,7 +14,7 @@ namespace Mall.Model.Query
[
DB
(
ConnectionName
=
"DefaultConnection"
)]
public
class
OrderStatistics_Query
{
public
string
Ids
{
get
;
set
;
}
public
int
Id
{
get
;
set
;
}
public
int
OrderId
{
get
;
set
;
}
...
...
@@ -323,7 +323,10 @@ namespace Mall.Model.Query
/// </summary>
public
decimal
ServiceCharge
{
get
;
set
;
}
/// <summary>
/// 订单手续费
/// </summary>
public
decimal
ReturnServiceCharge
{
get
;
set
;
}
/// <summary>
/// 保险收入
/// </summary>
...
...
Mall.Module.MarketingCenter/StatisticsModule.cs
View file @
b3beabf2
...
...
@@ -185,6 +185,30 @@ namespace Mall.Module.MarketingCenter
return
list
;
}
/// <summary>
/// 售后订单
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public
List
<
OrderStatistics_Query
>
GetFXAllAftersaleOrderProfitLossList
(
OrderStatistics_Query
dmodel
)
{
var
list
=
orderRepository
.
GetFXAllAftersaleOrderProfitLossList
(
dmodel
);
return
list
;
}
/// <summary>
/// 取消订单
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public
List
<
OrderStatistics_Query
>
GetFXAllCancelOrderProfitLossList
(
OrderStatistics_Query
dmodel
)
{
var
list
=
orderRepository
.
GetFXAllCancelOrderProfitLossList
(
dmodel
);
return
list
;
}
public
List
<
RB_Goods_OrderCommission_Extend
>
GetByOrderDetailId
(
RB_Goods_OrderCommission_Extend
model
)
{
...
...
Mall.Repository/Product/RB_Goods_OrderRepository.cs
View file @
b3beabf2
This diff is collapsed.
Click to expand it.
Mall.WebApi/Controllers/AppletWeChat/LiveHouseController.cs
View file @
b3beabf2
This diff is collapsed.
Click to expand it.
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