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
320970e6
authored
Mar 24, 2021
by
caosy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
多次部分退款
parent
f5cb6f19
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletions
src/main/java/com/ctrip/fun/golf/service/order/OpCourseOrderService.java
src/main/java/com/ctrip/fun/golf/service/payment/AbstractNotifyService.java
src/main/java/com/ctrip/fun/golf/service/order/OpCourseOrderService.java
View file @
320970e6
...
@@ -617,14 +617,18 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
...
@@ -617,14 +617,18 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
}
}
}
else
{
}
else
{
// 不需走在线退款 :手动退款或没有退在线支付
// 不需走在线退款 :手动退款或没有退在线支付
order
.
setProcessStatus
(
order
.
getProcessStatus
()
|
OrderStatusBitEnum
.
REFUNDED
.
getValue
());
if
(
order
.
getTotalAmount
().
subtract
(
order
.
getVipmemberDiscount
()).
subtract
(
refundAll
.
add
(
order
.
getOnPayAmount
())).
doubleValue
()
<=
0
)
{
if
(
order
.
getTotalAmount
().
subtract
(
order
.
getVipmemberDiscount
()).
subtract
(
refundAll
.
add
(
order
.
getOnPayAmount
())).
doubleValue
()
<=
0
)
{
order
.
setProcessStatus
(
order
.
getProcessStatus
()
|
OrderStatusBitEnum
.
REFUNDED
.
getValue
());
order
.
setProcessStatus
(
order
.
getProcessStatus
()
|
OrderStatusBitEnum
.
REFUNDED
.
getValue
());
order
.
setProcessStatus
(
order
.
getProcessStatus
()
|
OrderStatusBitEnum
.
REFUNDED
.
getValue
());
order
.
setProcessStatus
(
order
.
getProcessStatus
()
|
OrderStatusBitEnum
.
ALL_UNSUBSCRIBED
.
getValue
());
order
.
setProcessStatus
(
order
.
getProcessStatus
()
|
OrderStatusBitEnum
.
ALL_UNSUBSCRIBED
.
getValue
());
order
.
setProcessStatus
(
order
.
getProcessStatus
()
|
OrderStatusBitEnum
.
BARGAINED
.
getValue
());
order
.
setProcessStatus
(
order
.
getProcessStatus
()
|
OrderStatusBitEnum
.
BARGAINED
.
getValue
());
order
.
setOrderUserStatus
(
6
);
order
.
setOrderUserStatus
(
6
);
}
else
{
}
else
{
if
(
order
.
getProcessStatus
()
!=
275
){
order
.
setProcessStatus
(
order
.
getProcessStatus
()
+
3
);
order
.
setProcessStatus
(
order
.
getProcessStatus
()
+
3
);
}
order
.
setProcessStatus
(
order
.
getProcessStatus
()
|
OrderStatusBitEnum
.
REFUNDED
.
getValue
());
order
.
setProcessStatus
(
order
.
getProcessStatus
()
|
OrderStatusBitEnum
.
REFUNDED
.
getValue
());
order
.
setProcessStatus
(
order
.
getProcessStatus
()
|
OrderStatusBitEnum
.
REFUNDED
.
getValue
());
order
.
setProcessStatus
(
order
.
getProcessStatus
()
|
OrderStatusBitEnum
.
PART_UNSUBSCRIBED
.
getValue
());
order
.
setProcessStatus
(
order
.
getProcessStatus
()
|
OrderStatusBitEnum
.
PART_UNSUBSCRIBED
.
getValue
());
order
.
setOrderUserStatus
(
5
);
order
.
setOrderUserStatus
(
5
);
...
...
src/main/java/com/ctrip/fun/golf/service/payment/AbstractNotifyService.java
View file @
320970e6
...
@@ -232,8 +232,10 @@ public abstract class AbstractNotifyService extends CorePaymentService {
...
@@ -232,8 +232,10 @@ public abstract class AbstractNotifyService extends CorePaymentService {
NotifyRequestBean
notifyRequestBean
=
new
NotifyRequestBean
();
NotifyRequestBean
notifyRequestBean
=
new
NotifyRequestBean
();
notifyRequestBean
.
setAmount
(
bigDecimal
.
divide
(
new
BigDecimal
(
"100"
)));
notifyRequestBean
.
setAmount
(
bigDecimal
.
divide
(
new
BigDecimal
(
"100"
)));
if
(!
this
.
isAllRefund
(
notifyRequestBean
,
order
)){
if
(!
this
.
isAllRefund
(
notifyRequestBean
,
order
)){
if
(
order
.
getProcessStatus
()
!=
275
){
order
.
setProcessStatus
(
order
.
getProcessStatus
()+
3
)
;
order
.
setProcessStatus
(
order
.
getProcessStatus
()+
3
)
;
}
}
}
order
.
setProcessStatus
(
order
.
getProcessStatus
()
order
.
setProcessStatus
(
order
.
getProcessStatus
()
|
OrderStatusBitEnum
.
REFUNDED
.
getValue
());
|
OrderStatusBitEnum
.
REFUNDED
.
getValue
());
order
.
setOrderStatus
(
"U"
);
order
.
setOrderStatus
(
"U"
);
...
@@ -495,8 +497,10 @@ public abstract class AbstractNotifyService extends CorePaymentService {
...
@@ -495,8 +497,10 @@ public abstract class AbstractNotifyService extends CorePaymentService {
if
(
SUCCESS
.
equalsIgnoreCase
(
notifyRequestBean
.
getStatus
()))
{
if
(
SUCCESS
.
equalsIgnoreCase
(
notifyRequestBean
.
getStatus
()))
{
if
(!
this
.
isAllRefund
(
notifyRequestBean
,
order
)){
if
(!
this
.
isAllRefund
(
notifyRequestBean
,
order
)){
if
(
order
.
getProcessStatus
()
!=
275
){
order
.
setProcessStatus
(
order
.
getProcessStatus
()+
3
);
order
.
setProcessStatus
(
order
.
getProcessStatus
()+
3
);
}
}
}
order
.
setProcessStatus
(
order
.
getProcessStatus
()
order
.
setProcessStatus
(
order
.
getProcessStatus
()
|
OrderStatusBitEnum
.
REFUNDED
.
getValue
());
|
OrderStatusBitEnum
.
REFUNDED
.
getValue
());
order
.
setOrderStatus
(
"U"
);
order
.
setOrderStatus
(
"U"
);
...
...
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