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
42f7060f
Commit
42f7060f
authored
Apr 03, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
02da5228
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
4 deletions
+13
-4
OrderManageDTOAssembler.java
...in/java/com/gogirl/assembler/OrderManageDTOAssembler.java
+3
-0
OrderManage.java
src/main/java/com/gogirl/domain/order/serve/OrderManage.java
+0
-4
OrderManageDTO.java
...red/order/serve/query/dto/ordermanage/OrderManageDTO.java
+10
-0
No files found.
src/main/java/com/gogirl/assembler/OrderManageDTOAssembler.java
View file @
42f7060f
...
...
@@ -46,6 +46,9 @@ public class OrderManageDTOAssembler implements Function<OrderManage, OrderManag
orderManageDTO
.
setTimesCardUsedRecordDTOList
(
orderManage
.
getListTimesCardRecord
()
.
stream
().
map
(
timesCardUsedRecordDTOAssembler
).
collect
(
Collectors
.
toList
()));
}
orderManageDTO
.
setCustomer
(
orderManage
.
getCustomer
());
orderManageDTO
.
setPayCustomer
(
orderManage
.
getPayCustomer
());
return
orderManageDTO
;
}
...
...
src/main/java/com/gogirl/domain/order/serve/OrderManage.java
View file @
42f7060f
...
...
@@ -224,10 +224,6 @@ public class OrderManage implements Serializable {
private
String
receipt
;
@TableField
(
exist
=
false
)
@ApiModelProperty
(
"开单人"
)
private
StoreUser
userManage
;
@TableField
(
exist
=
false
)
@ApiModelProperty
(
"预约建立时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
scheduledTime
;
...
...
src/main/java/com/gogirl/shared/order/serve/query/dto/ordermanage/OrderManageDTO.java
View file @
42f7060f
package
com
.
gogirl
.
shared
.
order
.
serve
.
query
.
dto
.
ordermanage
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.gogirl.domain.user.customer.Customer
;
import
com.gogirl.shared.market.query.dto.CouponCustomerRelevanceDTO
;
import
com.gogirl.shared.market.query.dto.TimesCardUsedRecordDTO
;
import
com.gogirl.shared.order.serve.query.dto.ScheduleManageDTO
;
...
...
@@ -136,6 +138,14 @@ public class OrderManageDTO {
@ApiModelProperty
(
"是否朋友代付 1-是 2-否"
)
private
Integer
isFriendPay
;
@TableField
(
exist
=
false
)
@ApiModelProperty
(
"下单用户信息"
)
private
Customer
customer
;
@TableField
(
exist
=
false
)
@ApiModelProperty
(
"支付用户信息"
)
private
Customer
payCustomer
;
public
void
setImages
()
{
images
=
orderServeDTOList
.
stream
()
...
...
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