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
f5ae507a
Commit
f5ae507a
authored
Apr 03, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
cdffe073
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
0 deletions
+12
-0
OrderManageServiceImpl.java
.../application/order/serve/impl/OrderManageServiceImpl.java
+2
-0
MallOrder.java
src/main/java/com/gogirl/domain/order/mall/MallOrder.java
+2
-0
OrderManage.java
src/main/java/com/gogirl/domain/order/serve/OrderManage.java
+3
-0
OrderManageDTO.java
...red/order/serve/query/dto/ordermanage/OrderManageDTO.java
+5
-0
No files found.
src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java
View file @
f5ae507a
...
...
@@ -960,6 +960,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
customerMessageMapper
.
insert
(
customerMessage
);
}
OrderManage
orderManage
=
orderManageMapper
.
selectById
(
orderId
);
orderManage
.
setIsFriendPay
(
1
);
}
@Override
...
...
src/main/java/com/gogirl/domain/order/mall/MallOrder.java
View file @
f5ae507a
...
...
@@ -58,9 +58,11 @@ public class MallOrder {
private
Integer
transportMode
;
@ApiModelProperty
(
"支付方式 1-微信支付 2-余额支付 3-余额抵扣微信支付"
)
private
Integer
paymentType
;
@TableField
(
exist
=
false
)
@ApiModelProperty
(
"是否朋友代付 1-是 2-否"
)
private
Integer
isFriendPay
;
@ApiModelProperty
(
"付款客户"
)
private
Integer
paymentCustomerId
;
@ApiModelProperty
(
"订单类型"
)
...
...
src/main/java/com/gogirl/domain/order/serve/OrderManage.java
View file @
f5ae507a
...
...
@@ -265,6 +265,9 @@ public class OrderManage implements Serializable {
private
Integer
payUser
;
@ApiModelProperty
(
"是否朋友代付 1-是 2-否"
)
private
Integer
isFriendPay
;
public
void
addDiscountPrice
(
BigDecimal
discountPrice
)
{
this
.
discountPrice
=
this
.
discountPrice
.
add
(
discountPrice
);
this
.
totalPaymentAmount
=
this
.
totalPaymentAmount
.
subtract
(
discountPrice
);
...
...
src/main/java/com/gogirl/shared/order/serve/query/dto/ordermanage/OrderManageDTO.java
View file @
f5ae507a
...
...
@@ -131,6 +131,11 @@ public class OrderManageDTO {
private
List
<
Integer
>
couponCustomerRelevanceIds
;
private
Integer
payUser
;
@ApiModelProperty
(
"是否朋友代付 1-是 2-否"
)
private
Integer
isFriendPay
;
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