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
8180f583
Commit
8180f583
authored
Aug 06, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
产品查询修改
parent
bda0864e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
0 deletions
+24
-0
OrderModule.cs
Edu.Module.Course/OrderModule.cs
+7
-0
OrderController.cs
Edu.WebApi/Controllers/Course/OrderController.cs
+17
-0
No files found.
Edu.Module.Course/OrderModule.cs
View file @
8180f583
...
...
@@ -228,8 +228,14 @@ namespace Edu.Module.Course
if
(
list
.
Any
())
{
string
classIds
=
string
.
Join
(
","
,
list
.
Select
(
x
=>
x
.
ClassId
));
string
courseIds
=
string
.
Join
(
","
,
list
.
Select
(
qitem
=>
qitem
.
CouseId
));
//查询阶梯价格
List
<
RB_Course_Preferential_Extend
>
coursePreferentialList
=
new
List
<
RB_Course_Preferential_Extend
>();
var
stepList
=
class_StepPriceRepository
.
GetClassStepPriceListRepository
(
new
RB_Class_StepPrice_ViewModel
()
{
QClassIds
=
classIds
});
coursePreferentialList
=
course_PreferentialRepository
.
GetCoursePreferentialListRepostory
(
new
RB_Course_Preferential_Extend
()
{
QCourseIds
=
courseIds
});
var
otherCourseList
=
class_CourseRepository
.
GetClassCourseListRepository
(
new
RB_Class_Course_Extend
()
{
QClassIds
=
classIds
});
List
<
RB_Class_Plan_ViewModel
>
PlanFixed
=
new
List
<
RB_Class_Plan_ViewModel
>();
string
k2classIds
=
string
.
Join
(
","
,
list
.
Where
(
x
=>
x
.
ClassStyle
==
Common
.
Enum
.
Course
.
ClassStyleEnum
.
FixedDate
).
Select
(
x
=>
x
.
ClassId
));
...
...
@@ -239,6 +245,7 @@ namespace Edu.Module.Course
}
foreach
(
var
item
in
list
)
{
item
.
PreferentialList
=
coursePreferentialList
?.
Where
(
qitem
=>
qitem
.
CourseId
==
item
.
CouseId
)?.
ToList
()
??
new
List
<
RB_Course_Preferential_Extend
>();
item
.
ClassStepPriceList
=
stepList
.
Where
(
x
=>
x
.
ClassId
==
item
.
ClassId
).
OrderBy
(
x
=>
x
.
PersionNum
).
ToList
();
item
.
OtherCourseList
=
otherCourseList
?.
Where
(
qitem
=>
qitem
.
ClassId
==
item
.
ClassId
)?.
ToList
()
??
new
List
<
RB_Class_Course_Extend
>();
item
.
DefaultTimeList
=
new
List
<
ClassTimeItem
>();
...
...
Edu.WebApi/Controllers/Course/OrderController.cs
View file @
8180f583
...
...
@@ -95,6 +95,23 @@ namespace Edu.WebApi.Controllers.Course
x
.
OutRemark
,
x
.
OrderStudentCount
,
SurplusNum
,
PreferentialList
=
x
?.
PreferentialList
.
Select
(
qitem
=>
new
{
qitem
.
B2BCommissionMoney
,
qitem
.
B2BCommissionType
,
qitem
.
BuyNum
,
qitem
.
CourseId
,
qitem
.
EduCommissionMoney
,
qitem
.
EduCommissionType
,
qitem
.
Id
,
qitem
.
PreferentialTerms
,
qitem
.
PriceDiscountType
,
qitem
.
PriceDiscountTypeStr
,
qitem
.
PriceMoney
,
qitem
.
PriceType
,
qitem
.
SaleCommissionMoney
,
qitem
.
SaleCommissionType
,
qitem
.
SendNum
,
}),
ClassStepPriceList
=
x
.
ClassStepPriceList
.
Select
(
z
=>
new
{
z
.
ClassStepPriceId
,
...
...
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