Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-golf-service
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
1
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
9bad3376
authored
Feb 09, 2018
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify a bug of null value
parent
5b7ff15b
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
2 deletions
src/main/java/com/ctrip/fun/golf/service/order/AbstractOrderService.java
src/main/java/com/ctrip/fun/golf/service/order/AbstractOrderService.java
View file @
9bad3376
...
...
@@ -195,8 +195,12 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
order
.
setVoucherCount
(
orderDetailBean
.
getVoucherList
()
==
null
?
0
:
orderDetailBean
.
getVoucherList
().
size
());
/* BigDecimal actualAmount = totalAmount.subtract(orderDetailBean.getTmoney()).subtract(orderDetailBean.getLimitedEmoneyAmount()).subtract(orderDetailBean.getUnlimitedEmoneyAmount())
.subtract(orderDetailBean.getOnPayAmount());*/
BigDecimal
discoutAfterOrder
=
orderDetailBean
.
getDiscountAfterOrderAmount
();
if
(
discoutAfterOrder
==
null
){
discoutAfterOrder
=
new
BigDecimal
(
0
);
}
BigDecimal
actualAmount
=
totalAmount
.
subtract
(
orderDetailBean
.
getTmoney
()).
subtract
(
orderDetailBean
.
getLimitedEmoneyAmount
()).
subtract
(
orderDetailBean
.
getUnlimitedEmoneyAmount
())
.
subtract
(
orderDetailBean
.
getOnPayAmount
()).
subtract
(
orderDetailBean
.
getDiscountAfterOrderAmount
()
);;
.
subtract
(
orderDetailBean
.
getOnPayAmount
()).
subtract
(
discoutAfterOrder
);;
if
(
actualAmount
.
compareTo
(
BigDecimal
.
ZERO
)
<
0
)
{
actualAmount
=
new
BigDecimal
(
0
);
}
...
...
@@ -1149,8 +1153,12 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
/* BigDecimal actualAmount = totalAmount.subtract(abstractOrderBean.getTmoney()).subtract(abstractOrderBean.getLimitedEmoneyAmount())
.subtract(abstractOrderBean.getUnlimitedEmoneyAmount()).subtract(abstractOrderBean.getOnPayAmount());*/
//modify by caosy,重新调整实付金额
BigDecimal
discoutAfterOrder
=
abstractOrderBean
.
getDiscountAfterOrderAmount
();
if
(
discoutAfterOrder
==
null
){
discoutAfterOrder
=
new
BigDecimal
(
0
);
}
BigDecimal
actualAmount
=
totalAmount
.
subtract
(
abstractOrderBean
.
getTmoney
()).
subtract
(
abstractOrderBean
.
getLimitedEmoneyAmount
())
.
subtract
(
abstractOrderBean
.
getUnlimitedEmoneyAmount
()).
subtract
(
abstractOrderBean
.
getOnPayAmount
()).
subtract
(
abstractOrderBean
.
getDiscountAfterOrderAmount
()
);
.
subtract
(
abstractOrderBean
.
getUnlimitedEmoneyAmount
()).
subtract
(
abstractOrderBean
.
getOnPayAmount
()).
subtract
(
discoutAfterOrder
);
if
(
actualAmount
.
compareTo
(
BigDecimal
.
ZERO
)
<
0
){
actualAmount
=
new
BigDecimal
(
0
);
}
...
...
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