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
1aedb5a1
Commit
1aedb5a1
authored
Oct 21, 2022
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
ab284459
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
3 deletions
+10
-3
RB_Goods_OrderDetail_Extend.cs
Mall.Model/Extend/Product/RB_Goods_OrderDetail_Extend.cs
+5
-0
RB_Goods_OrderDetailRepository.cs
Mall.Repository/Product/RB_Goods_OrderDetailRepository.cs
+1
-1
AppletOrderController.cs
Mall.WebApi/Controllers/Product/AppletOrderController.cs
+4
-2
No files found.
Mall.Model/Extend/Product/RB_Goods_OrderDetail_Extend.cs
View file @
1aedb5a1
...
...
@@ -390,5 +390,10 @@ namespace Mall.Model.Extend.Product
/// 绑定物品列表
/// </summary>
public
List
<
RB_Goods_Relevance_Extend
>
GoodsRelevanceList
{
get
;
set
;
}
/// <summary>
/// 进阶小课堂老师Id
/// </summary>
public
int
EduTeacherId
{
get
;
set
;
}
}
}
Mall.Repository/Product/RB_Goods_OrderDetailRepository.cs
View file @
1aedb5a1
...
...
@@ -64,7 +64,7 @@ namespace Mall.Repository.Product
}
string
sql
=
$@"
SELECT a.*,b.`Name` as SupplierName,C.EduJsonData
SELECT a.*,b.`Name` as SupplierName,C.EduJsonData
,IFNULL(C.EduTeacherId,0) AS EduTeacherId
FROM rb_goods_orderdetail as a LEFT JOIN rb_supplier as b on a.SupplierId=b.ID
LEFT JOIN rb_goods AS C ON a.GoodsId=C.Id
WHERE
{
where
}
order by a.Id asc"
;
...
...
Mall.WebApi/Controllers/Product/AppletOrderController.cs
View file @
1aedb5a1
...
...
@@ -266,7 +266,8 @@ namespace Mall.WebApi.Controllers.MallBase
y
.
Number
,
y
.
IsComment
,
y
.
FreeShippingRemarks
,
InsuranceMoney
=
y
.
InsuranceMoney
??
0
InsuranceMoney
=
y
.
InsuranceMoney
??
0
,
y
.
EduTeacherId
,
}),
x
.
OrderStatus
,
OrderStatusName
=
x
.
OrderStatus
.
GetEnumName
(),
...
...
@@ -275,7 +276,8 @@ namespace Mall.WebApi.Controllers.MallBase
x
.
TenantId
,
x
.
MallBaseId
,
x
.
PresentFXGrade
,
CreateDate
=
x
.
CreateDate
.
HasValue
?
x
.
CreateDate
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
:
""
CreateDate
=
x
.
CreateDate
.
HasValue
?
x
.
CreateDate
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
:
""
,
x
.
JJSWStuId
,
});
return
ApiResult
.
Success
(
""
,
pagelist
);
}
...
...
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