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
55f5d35d
Commit
55f5d35d
authored
Sep 29, 2020
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
教育结算
parent
e1d45777
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
622 additions
and
2 deletions
+622
-2
RB_Goods_Order_Extend.cs
Mall.Model/Extend/Product/RB_Goods_Order_Extend.cs
+4
-0
OrderModule.cs
Mall.Module.Product/OrderModule.cs
+1
-1
OrderModule_Part.cs
Mall.Module.Product/OrderModule_Part.cs
+583
-0
EducationController.cs
Mall.WebApi/Controllers/Education/EducationController.cs
+1
-1
AppletOrderController.cs
Mall.WebApi/Controllers/Product/AppletOrderController.cs
+33
-0
No files found.
Mall.Model/Extend/Product/RB_Goods_Order_Extend.cs
View file @
55f5d35d
...
...
@@ -166,6 +166,10 @@ namespace Mall.Model.Extend.Product
/// </summary>
public
int
?
User_Coupon_Id
{
get
;
set
;
}
/// <summary>
/// 使用课程卡id
/// </summary>
public
int
?
Use_Education_Id
{
get
;
set
;
}
/// <summary>
/// 优惠券描述
/// </summary>
public
string
CouponDestription
{
get
;
set
;
}
...
...
Mall.Module.Product/OrderModule.cs
View file @
55f5d35d
...
...
@@ -37,7 +37,7 @@ namespace Mall.Module.Product
/// <summary>
/// 商品处理层
/// </summary>
public
class
OrderModule
public
partial
class
OrderModule
{
/// <summary>
/// 素材管理
...
...
Mall.Module.Product/OrderModule_Part.cs
0 → 100644
View file @
55f5d35d
This diff is collapsed.
Click to expand it.
Mall.WebApi/Controllers/Education/EducationController.cs
View file @
55f5d35d
...
...
@@ -399,7 +399,7 @@ namespace Mall.WebApi.Controllers.Education
{
return
ApiResult
.
ParamIsNull
(
"请传递视频封面图"
);
}
if
((
item
.
VideoTime
??
0
)
<
=
0
)
if
((
item
.
VideoTime
??
0
)
<
0
)
{
return
ApiResult
.
ParamIsNull
(
"请传递视频时长"
);
}
...
...
Mall.WebApi/Controllers/Product/AppletOrderController.cs
View file @
55f5d35d
...
...
@@ -387,6 +387,39 @@ namespace Mall.WebApi.Controllers.MallBase
return
orderModule
.
GetAppletGoodsSettlementInfoForZY
(
demodel
);
}
/// <summary>
/// 结算页面详情(教育)
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetAppletCourseSettlementInfo
()
{
var
req
=
RequestParm
;
var
userInfo
=
AppletUserInfo
;
RB_Goods_Order_Extend
demodel
=
JsonConvert
.
DeserializeObject
<
RB_Goods_Order_Extend
>(
req
.
msg
.
ToString
());
if
(
demodel
.
DetailList
==
null
||
!
demodel
.
DetailList
.
Any
())
{
return
ApiResult
.
ParamIsNull
(
"请传递商品信息"
);
}
foreach
(
var
item
in
demodel
.
DetailList
)
{
if
((
item
.
GoodsId
??
0
)
<=
0
)
{
return
ApiResult
.
ParamIsNull
(
"请传递商品id"
);
}
if
((
item
.
Number
??
0
)
<=
0
)
{
return
ApiResult
.
ParamIsNull
(
"请传递商品数量"
);
}
}
demodel
.
TenantId
=
userInfo
.
TenantId
;
demodel
.
MallBaseId
=
userInfo
.
MallBaseId
;
demodel
.
UserId
=
userInfo
.
UserId
;
demodel
.
SmallShopsId
=
req
.
SmallShopsId
;
return
orderModule
.
GetAppletCourseSettlementInfo
(
demodel
);
}
/// <summary>
/// 结算页面修改快递,获取快递费用
/// </summary>
...
...
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