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
871789f8
authored
Sep 29, 2018
by
chongli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
取消下单使用券再赠送券的功能
parent
ac53fbc6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
src/main/java/com/ctrip/fun/golf/service/order/AbstractOrderService.java
src/main/java/com/ctrip/fun/golf/service/payment/AbstractNotifyService.java
src/main/java/com/ctrip/fun/golf/service/order/AbstractOrderService.java
View file @
871789f8
...
...
@@ -1106,7 +1106,7 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
throw
new
OrderException
(-
100
,
"您的抵用劵使用错误"
);
}
for
(
VoucherItemBean
bean:
beanlist
){
this
.
voucherService
.
voucherUsedSend
(
bean
.
getId
(),
order
.
getUid
(),
order
.
getOrderNo
()+
""
,
VoucherSourceEnum
.
RULE_VOUCHERUSED_PRESENT
.
getValue
());
//
this.voucherService.voucherUsedSend(bean.getId(), order.getUid(), order.getOrderNo()+"", VoucherSourceEnum.RULE_VOUCHERUSED_PRESENT.getValue());
}
}
}
...
...
src/main/java/com/ctrip/fun/golf/service/payment/AbstractNotifyService.java
View file @
871789f8
...
...
@@ -280,7 +280,7 @@ public abstract class AbstractNotifyService extends CorePaymentService {
order
.
getVoucherIDList
());
if
(
order
.
getVoucherIDList
()!=
null
&&!
""
.
equals
(
order
.
getVoucherIDList
())){
for
(
String
usedVoucherId:
order
.
getVoucherIDList
().
split
(
","
)){
this
.
voucherService
.
voucherUsedSend
(
Integer
.
parseInt
(
usedVoucherId
),
order
.
getUid
(),
order
.
getOrderNo
()+
""
,
VoucherSourceEnum
.
RULE_VOUCHERUSED_PRESENT
.
getValue
());
//
this.voucherService.voucherUsedSend(Integer.parseInt(usedVoucherId), order.getUid(), order.getOrderNo()+"", VoucherSourceEnum.RULE_VOUCHERUSED_PRESENT.getValue());
}
}
...
...
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