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
f9f8980b
authored
Nov 09, 2018
by
Huang Linyu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'f-6.7.0' of 192.168.10.6:caosy/fun-golf-service into f-6.7.0
parents
cac54e33
1993cdbe
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
1 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 @
f9f8980b
...
...
@@ -265,10 +265,18 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
this
.
checkContinuePayParameters
(
abstractOrderBean
);
UserExt
userExt
=
getUserExtDao
().
getByUid
(
abstractOrderBean
.
getUid
());
Order
order
=
this
.
getOrderDao
().
getOrderByOrderNo
(
abstractOrderBean
.
getOrderNo
());
BigDecimal
invoiceAmount
=
order
.
getInvoiceAmount
()
==
null
?
new
BigDecimal
(
0
)
:
order
.
getInvoiceAmount
();
BigDecimal
postageAmount
=
order
.
getPostageAmount
()
==
null
?
new
BigDecimal
(
0
)
:
order
.
getPostageAmount
();
BigDecimal
insuranceAmount
=
order
.
getInsuranceAmount
()
==
null
?
new
BigDecimal
(
0
)
:
order
.
getInsuranceAmount
();
BigDecimal
needPayAmount
=
order
.
getPrePayAmount
().
add
(
invoiceAmount
).
add
(
postageAmount
).
add
(
insuranceAmount
).
subtract
(
order
.
getPrePayCardAmount
()).
subtract
(
order
.
getVoucherAmount
());
ResponseMp
<
JSONObject
>
response
=
new
ResponseMp
<
JSONObject
>();
JSONObject
jSONObject
=
new
JSONObject
();
try
{
jSONObject
=
WeiXinAtcion
.
weixinPlay
(
userExt
.
getMiniAppOpenId
(),
order
.
getAmount
()
.
multiply
(
new
BigDecimal
(
"100"
)).
intValue
(),
order
.
getOrderNo
()+
""
,
this
.
getNotifyUrlForWeiXinPay
(
order
),
"dingqiu"
);
jSONObject
=
WeiXinAtcion
.
weixinPlay
(
userExt
.
getMiniAppOpenId
(),
needPayAmount
.
multiply
(
new
BigDecimal
(
"100"
)).
intValue
(),
order
.
getOrderNo
()+
""
,
this
.
getNotifyUrlForWeiXinPay
(
order
),
"dingqiu"
);
jSONObject
.
put
(
"needWXPay"
,
true
);
response
.
setBody
(
jSONObject
);
}
catch
(
Exception
e
)
{
...
...
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