Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Education
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
黄奎
Education
Commits
b7eefcf5
Commit
b7eefcf5
authored
Apr 20, 2022
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
95bddaa1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
4 deletions
+11
-4
RB_Order_ReturnComission_ViewModel.cs
...odel/ViewModel/Sell/RB_Order_ReturnComission_ViewModel.cs
+8
-1
RB_Order_ReturnComissionRepository.cs
Edu.Repository/Sell/RB_Order_ReturnComissionRepository.cs
+1
-2
CustomerCommissionController.cs
...bApi/Controllers/Customer/CustomerCommissionController.cs
+2
-1
No files found.
Edu.Model/ViewModel/Sell/RB_Order_ReturnComission_ViewModel.cs
View file @
b7eefcf5
using
Edu.Model.Entity.Sell
;
using
Edu.Common.Enum.Mall
;
using
Edu.Model.Entity.Sell
;
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
...
...
@@ -83,5 +84,11 @@ namespace Edu.Model.ViewModel.Sell
/// 员工id
/// </summary>
public
int
EnterID
{
get
;
set
;
}
/// <summary>
/// 订单类型
/// </summary>
public
OrderTypeEnum
OrderType
{
get
;
set
;
}
}
}
Edu.Repository/Sell/RB_Order_ReturnComissionRepository.cs
View file @
b7eefcf5
...
...
@@ -148,9 +148,8 @@ where a.`Status`=0 and c.CreateTime<date_add(curdate(),interval -day(curdate())+
{
where
+=
$@" and cus.
{
nameof
(
RB_Order_ReturnComission_ViewModel
.
CategoryId
)}
=
{
demodel
.
CategoryId
}
"
;
}
string
sql
=
$@"
select r.*,b.BatchName,o.ClassId,c.ClassName,c.ClassNo,s.StuName
select r.*,b.BatchName,o.ClassId,c.ClassName,c.ClassNo,s.StuName
,o.OrderType
from RB_Order_ReturnComission r left join rb_returnmoney_batch b on r.BatchId = b.Id
left join rb_order o on r.OrderId = o.OrderId
left join rb_class c on o.ClassId = c.ClassId
...
...
Edu.WebApi/Controllers/Customer/CustomerCommissionController.cs
View file @
b7eefcf5
...
...
@@ -260,7 +260,8 @@ namespace Edu.WebApi.Controllers.Course
x
.
BatchName
,
x
.
StuId
,
x
.
StuName
,
x
.
CommissionType
x
.
CommissionType
,
x
.
OrderType
,
})
};
return
ApiResult
.
Success
(
""
,
pageModel
);
...
...
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