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
f2bf0795
Commit
f2bf0795
authored
Aug 27, 2024
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
f467763b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
10 deletions
+12
-10
RB_Order.cs
Edu.Model/Entity/Sell/RB_Order.cs
+1
-5
OrderController.cs
Edu.WebApi/Controllers/Course/OrderController.cs
+11
-5
No files found.
Edu.Model/Entity/Sell/RB_Order.cs
View file @
f2bf0795
...
...
@@ -37,10 +37,6 @@ namespace Edu.Model.Entity.Sell
/// </summary>
public
decimal
Unit_Price
{
get
;
set
;
}
/// <summary>
/// 价格类型,1-基础价格,2-课时价格 2024-08-26 add by:w
/// </summary>
public
int
SellPriceType
{
get
;
set
;
}
/// <summary>
/// 教材费 2024-08-26 add by:w
...
...
@@ -55,7 +51,7 @@ namespace Edu.Model.Entity.Sell
/// <summary>
/// 总课时 2024-08-26 add by:W
/// </summary>
public
int
TotalClassHours
{
get
;
set
;
}
public
decimal
TotalClassHours
{
get
;
set
;
}
/// <summary>
/// 客人数量
...
...
Edu.WebApi/Controllers/Course/OrderController.cs
View file @
f2bf0795
...
...
@@ -551,6 +551,9 @@ namespace Edu.WebApi.Controllers.Course
SaleRemark
=
base
.
ParmJObj
.
GetStringValue
(
"SaleRemark"
),
SourceId
=
base
.
ParmJObj
.
GetInt
(
"SourceId"
),
Unit_Price
=
base
.
ParmJObj
.
GetDecimal
(
"Unit_Price"
),
TotalClassHours
=
base
.
ParmJObj
.
GetDecimal
(
"TotalClassHours"
),
TextbookFee
=
base
.
ParmJObj
.
GetDecimal
(
"TextbookFee"
),
CoursewareFee
=
base
.
ParmJObj
.
GetDecimal
(
"CoursewareFee"
),
HelpEnterId
=
base
.
ParmJObj
.
GetInt
(
"HelpEnterId"
),
GeneralOccupation
=
base
.
ParmJObj
.
GetStringValue
(
"GeneralOccupation"
),
EduOccupation
=
base
.
ParmJObj
.
GetStringValue
(
"EduOccupation"
),
...
...
@@ -676,7 +679,8 @@ namespace Edu.WebApi.Controllers.Course
{
var
userInfo
=
base
.
UserInfo
;
var
OrderListStr
=
base
.
ParmJObj
.
GetStringValue
(
"OrderList"
);
if
(
string
.
IsNullOrEmpty
(
OrderListStr
))
{
if
(
string
.
IsNullOrEmpty
(
OrderListStr
))
{
return
ApiResult
.
ParamIsNull
(
"请传递表单数据"
);
}
List
<
object
>
OrderObjList
=
JsonHelper
.
DeserializeObject
<
List
<
object
>>(
OrderListStr
);
...
...
@@ -794,13 +798,15 @@ namespace Edu.WebApi.Controllers.Course
}
}
}
else
{
else
{
return
ApiResult
.
Failed
(
"只能课程订单批量操作"
);
}
deList
.
Add
(
demodel
);
}
if
(!
deList
.
Any
())
{
if
(!
deList
.
Any
())
{
return
ApiResult
.
Failed
(
"请传递订单信息"
);
}
var
flag
=
orderModule
.
SetClassOrderModuleBatch
(
deList
,
userInfo
,
base
.
CheckUserActionAuth
(
"Edit_Order"
),
out
string
message
);
...
...
@@ -1155,7 +1161,7 @@ namespace Edu.WebApi.Controllers.Course
}));
}
/// <summary>
/// 获取枚举列表
...
...
@@ -2662,6 +2668,6 @@ namespace Edu.WebApi.Controllers.Course
}
#
endregion
}
}
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