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
7bfa3066
authored
Dec 07, 2017
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
repair the multiple is null
parent
78e60522
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
src/main/java/com/ctrip/fun/golf/domain/basic/VoucherRule.java
src/main/java/com/ctrip/fun/golf/service/order/OpEventActivityOrderService.java
src/main/java/com/ctrip/fun/golf/domain/basic/VoucherRule.java
View file @
7bfa3066
...
@@ -313,7 +313,7 @@ public class VoucherRule {
...
@@ -313,7 +313,7 @@ public class VoucherRule {
this
.
createdTime
=
createdTime
;
this
.
createdTime
=
createdTime
;
}
}
@Column
(
name
=
"multiple"
)
@Column
(
name
=
"multiple"
,
nullable
=
false
)
public
int
getMultiple
()
{
public
int
getMultiple
()
{
return
multiple
;
return
multiple
;
}
}
...
...
src/main/java/com/ctrip/fun/golf/service/order/OpEventActivityOrderService.java
View file @
7bfa3066
...
@@ -455,8 +455,7 @@ public class OpEventActivityOrderService
...
@@ -455,8 +455,7 @@ public class OpEventActivityOrderService
}
}
}
}
}
}
BigDecimal
resultAmount
=
order
return
order
.
getTotalAmount
()
.
getTotalAmount
()
.
subtract
(
.
subtract
(
new
BigDecimal
(
orderProcessBean
.
getPrePayCardRefundAmount
()
==
null
?
0
new
BigDecimal
(
orderProcessBean
.
getPrePayCardRefundAmount
()
==
null
?
0
...
@@ -465,10 +464,11 @@ public class OpEventActivityOrderService
...
@@ -465,10 +464,11 @@ public class OpEventActivityOrderService
orderProcessBean
.
getRefundAmount
()
==
null
?
0
orderProcessBean
.
getRefundAmount
()
==
null
?
0
:
orderProcessBean
.
getRefundAmount
()))).
add
(
:
orderProcessBean
.
getRefundAmount
()))).
add
(
order
.
getOnPayAmount
()
==
null
?
new
BigDecimal
(
0
)
:
order
order
.
getOnPayAmount
()
==
null
?
new
BigDecimal
(
0
)
:
order
.
getOnPayAmount
())).
doubleValue
()
<=
0
;
.
getOnPayAmount
()));
return
resultAmount
.
compareTo
(
BigDecimal
.
ZERO
)
<=
1
;
}
}
@Override
@Override
protected
void
returnInventory
(
EventActivityOrderProcessBean
orderProcessBean
)
{
protected
void
returnInventory
(
EventActivityOrderProcessBean
orderProcessBean
)
{
Order
order
=
getOrderDao
().
findById
(
orderProcessBean
.
getOrderId
());
Order
order
=
getOrderDao
().
findById
(
orderProcessBean
.
getOrderId
());
...
...
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