Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gogirl-miniapp-backend
Overview
Overview
Details
Activity
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
huluobin
gogirl-miniapp-backend
Commits
02da5228
Commit
02da5228
authored
Apr 03, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
05dd580d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
1 deletion
+14
-1
OrderManageServiceImpl.java
.../application/order/serve/impl/OrderManageServiceImpl.java
+7
-0
OrderManage.java
src/main/java/com/gogirl/domain/order/serve/OrderManage.java
+7
-1
No files found.
src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java
View file @
02da5228
...
...
@@ -599,6 +599,9 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
.
eq
(
OrderManage:
:
getPayUser
,
customerId
)))
.
orderByDesc
(
OrderManage:
:
getCreateTime
));
// List<Integer> orderUserIdList = orderManageList.stream().map(OrderManage::getOrderUser).collect(Collectors.toList());
// List<Integer> payUserIdList = orderManageList.stream().map(OrderManage::getPayUser).collect(Collectors.toList());
//订单记录的图片
for
(
OrderManage
orderManage
:
orderManageList
)
{
//订单详情
...
...
@@ -620,6 +623,9 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
Customer
customer
=
customerService
.
getById
(
orderManage
.
getOrderUser
());
orderManage
.
setCustomer
(
customer
);
//支付用户信息
Customer
payCustomer
=
customerService
.
getById
(
orderManage
.
getPayUser
());
orderManage
.
setPayCustomer
(
payCustomer
);
orderServeList
.
forEach
(
orderServe
->
{
//订单详情 款式sku
...
...
@@ -633,6 +639,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
}
PageInfo
<
OrderManage
>
pageInfo
=
new
PageInfo
<>(
orderManageList
);
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"pageInfo"
,
pageInfo
);
...
...
src/main/java/com/gogirl/domain/order/serve/OrderManage.java
View file @
02da5228
...
...
@@ -199,10 +199,15 @@ public class OrderManage implements Serializable {
private
String
deleteOrder
;
@TableField
(
exist
=
false
)
@ApiModelProperty
(
"
预约
用户信息"
)
@ApiModelProperty
(
"
下单
用户信息"
)
private
Customer
customer
;
@TableField
(
exist
=
false
)
@ApiModelProperty
(
"支付用户信息"
)
private
Customer
payCustomer
;
@TableField
(
exist
=
false
)
@ApiModelProperty
(
"导出订单按月份"
)
private
String
exportTime
;
...
...
@@ -276,4 +281,5 @@ public class OrderManage implements Serializable {
@ApiModelProperty
(
"是否发送评论服务通知 0-没有 1-是"
)
private
Integer
isSendCommentMsg
;
}
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