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
b469fc76
authored
Dec 04, 2020
by
caosy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
删除发短信球场
parent
c6566d7f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
27 deletions
src/main/java/com/ctrip/fun/golf/service/basic/OperationMessageService.java
src/main/java/com/ctrip/fun/golf/service/payment/EventActivityNotifyService.java
src/main/java/com/ctrip/fun/golf/service/basic/OperationMessageService.java
View file @
b469fc76
...
...
@@ -224,7 +224,7 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
if
(
orderItems
!=
null
&&
orderItems
.
size
()
>=
0
)
{
OperationMessage
operationMessage
=
this
.
getOperationMessageDao
().
findById
(
messageId
);
message
=
operationMessage
.
getMessage
();
if
(
messageId
!=
120
){
//
if(messageId != 120){
message
=
message
.
replace
(
"[OrderNo]"
,
order
.
getOrderNo
()
+
""
).
replace
(
"[PlayDate]"
,
DateUtil
.
getDateStrC
(
orderItems
.
get
(
0
).
getPlayDate
()));
message
=
message
.
replace
(
"[PlayTime]"
,
orderItems
.
get
(
0
).
getStartTime
());
message
=
message
.
replace
(
"[ProductName]"
,
orderItems
.
get
(
0
).
getProductName
());
...
...
@@ -235,31 +235,31 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
message
=
message
.
replace
(
"[RefundAmount]"
,
order
.
getLaunchRefundAmount
().
toPlainString
());
}
}
}
else
{
// 体验卷赛事下单 发球场信息
System
.
out
.
println
(
"发球场 ================>"
+
"发球场"
);
for
(
String
usedVoucherId:
order
.
getVoucherIDList
().
split
(
","
)){
System
.
out
.
println
(
"usedVoucherId ================>"
+
usedVoucherId
);
Voucher
voucher
=
this
.
voucherDao
.
findById
(
Integer
.
parseInt
(
usedVoucherId
));
if
(
voucher
.
getVoucherType
()
==
2
){
message
=
message
.
replace
(
"[realName]"
,
voucher
.
getRealName
()
+
""
).
replace
(
"[PlayDate]"
,
DateUtil
.
getDateStrC
(
orderItems
.
get
(
0
).
getPlayDate
()));
message
=
message
.
replace
(
"[PlayTime]"
,
orderItems
.
get
(
0
).
getStartTime
());
message
=
message
.
replace
(
"[ProductName]"
,
orderItems
.
get
(
0
).
getProductName
());
System
.
out
.
println
(
"message ================>"
+
message
);
}
}
}
//
}else{
//
// 体验卷赛事下单 发球场信息
//
System.out.println("发球场 ================>"+ "发球场");
//
for(String usedVoucherId: order.getVoucherIDList().split(",")){
//
System.out.println("usedVoucherId ================>"+ usedVoucherId);
//
Voucher voucher = this.voucherDao.findById(Integer.parseInt(usedVoucherId));
//
if(voucher.getVoucherType() == 2){
//
message = message.replace("[realName]", voucher.getRealName() + "").replace("[PlayDate]", DateUtil.getDateStrC(orderItems.get(0).getPlayDate()));
//
message = message.replace("[PlayTime]", orderItems.get(0).getStartTime());
//
message = message.replace("[ProductName]", orderItems.get(0).getProductName());
//
System.out.println("message ================>"+ message);
//
}
//
}
//
}
}
if
(
message
!=
null
)
{
Sms
sms
=
new
Sms
();
sms
.
setMessage
(
message
);
sms
.
setStatus
(
SmsStatus
.
NO_SEND
.
getKey
());
sms
.
setMessageId
(
System
.
currentTimeMillis
());
if
(
messageId
==
120
){
sms
.
setMobileNo
(
"19821271996"
);
}
else
{
//
if(messageId == 120){
//
sms.setMobileNo("19821271996");
//
}else{
sms
.
setMobileNo
(
order
.
getContactTel
());
}
//
}
this
.
getSmsDao
().
save
(
sms
);
}
}
...
...
src/main/java/com/ctrip/fun/golf/service/payment/EventActivityNotifyService.java
View file @
b469fc76
...
...
@@ -82,14 +82,14 @@ public class EventActivityNotifyService extends AbstractNotifyService {
protected
void
doPaySuccess
(
Order
order
)
{
eventCustomerInfoService
.
updateEventCustomerInfosByOrderId
(
order
.
getOrderId
(),
true
);
this
.
sendMessage
(
order
,
100
);
if
(
order
.
getVoucherIDList
()
!=
null
&&
!(
""
).
equals
(
order
.
getVoucherIDList
())){
for
(
String
usedVoucherId:
order
.
getVoucherIDList
().
split
(
","
)){
Voucher
voucher
=
this
.
voucherService
.
getVoucherById
(
Integer
.
parseInt
(
usedVoucherId
));
if
(
voucher
.
getVoucherType
()
==
2
){
this
.
sendMessage
(
order
,
120
);
}
}
}
//
if(order.getVoucherIDList() != null && !("").equals(order.getVoucherIDList())){
//
for(String usedVoucherId: order.getVoucherIDList().split(",")){
//
Voucher voucher = this.voucherService.getVoucherById(Integer.parseInt(usedVoucherId));
//
if(voucher.getVoucherType() == 2){
//
this.sendMessage(order, 120);
//
}
//
}
//
}
}
/**
...
...
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