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
71388e89
authored
Dec 04, 2020
by
caosy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
注入
parent
b29239cf
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
53 additions
and
30 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/resources/basic.spring.xml
src/main/java/com/ctrip/fun/golf/service/basic/OperationMessageService.java
View file @
71388e89
...
...
@@ -16,6 +16,7 @@ import com.ctrip.fun.common.vo.basic.SmsQuery;
import
com.ctrip.fun.common.vo.basic.SmsStatus
;
import
com.ctrip.fun.golf.dao.basic.OperationMessageDao
;
import
com.ctrip.fun.golf.dao.basic.SmsDao
;
import
com.ctrip.fun.golf.dao.basic.VoucherDao
;
import
com.ctrip.fun.golf.dao.order.EventActivityOrderItemDao
;
import
com.ctrip.fun.golf.dao.order.OrderItemDao
;
import
com.ctrip.fun.golf.dao.order.RechargeOrderItemDao
;
...
...
@@ -50,8 +51,10 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
private
UserExtDao
userExtDao
=
null
;
private
MallOrderConnectDao
mallOrderConnectDao
=
null
;
private
MallMerchantDao
mallMerchantDao
=
null
;
private
VoucherDao
voucherDao
=
null
;
/**
* 发送球场订单的短信
*/
...
...
@@ -223,7 +226,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
());
...
...
@@ -234,31 +237,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
);
}
}
...
...
@@ -395,5 +398,13 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
public
void
setEventActivityOrderItemDao
(
EventActivityOrderItemDao
eventActivityOrderItemDao
)
{
this
.
eventActivityOrderItemDao
=
eventActivityOrderItemDao
;
}
public
VoucherDao
getVoucherDao
()
{
return
voucherDao
;
}
public
void
setVoucherDao
(
VoucherDao
voucherDao
)
{
this
.
voucherDao
=
voucherDao
;
}
}
src/main/java/com/ctrip/fun/golf/service/payment/EventActivityNotifyService.java
View file @
71388e89
...
...
@@ -8,16 +8,19 @@ import java.util.List;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
com.ctrip.fun.common.vo.operation.ResourceConfirmTypeEnum
;
import
com.ctrip.fun.common.vo.payment.NotifyRequestBean
;
import
com.ctrip.fun.common.vo.product.ResourceCategoryEnum
;
import
com.ctrip.fun.common.vo.product.ResourceInventoryQuery
;
import
com.ctrip.fun.golf.dao.order.EventActivityOrderItemDao
;
import
com.ctrip.fun.golf.domain.basic.Voucher
;
import
com.ctrip.fun.golf.domain.order.EventActivityOrderItem
;
import
com.ctrip.fun.golf.domain.order.Order
;
import
com.ctrip.fun.golf.exceptions.InventoryException
;
import
com.ctrip.fun.golf.exceptions.OrderException
;
import
com.ctrip.fun.golf.service.basic.OperationMessageService
;
import
com.ctrip.fun.golf.service.basic.VoucherService
;
import
com.ctrip.fun.golf.service.order.EventCustomerInfoService
;
import
com.ctrip.fun.golf.service.product.CourseResourceService
;
...
...
@@ -37,9 +40,12 @@ public class EventActivityNotifyService extends AbstractNotifyService {
private
OperationMessageService
operationMessageService
;
private
VoucherService
voucherService
;
/**
/**
* 支付调用方法
*/
private
void
weiXinPayNotify
(
NotifyRequestBean
notifyRequestBean
)
{
...
...
@@ -78,14 +84,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
);
}
}
}
}
/**
...
...
@@ -209,5 +215,11 @@ public class EventActivityNotifyService extends AbstractNotifyService {
this
.
eventCustomerInfoService
=
eventCustomerInfoService
;
}
public
VoucherService
getVoucherService
()
{
return
voucherService
;
}
public
void
setVoucherService
(
VoucherService
voucherService
)
{
this
.
voucherService
=
voucherService
;
}
}
src/main/resources/basic.spring.xml
View file @
71388e89
...
...
@@ -231,7 +231,7 @@
<property
name=
"eventActivityOrderItemDao"
ref=
"eventActivityOrderItemDao"
/>
<property
name=
"operationMessageDao"
ref=
"operationMessageDao"
/>
<property
name=
"smsDao"
ref=
"smsDao"
/>
<property
name=
"voucherDao"
ref=
"voucherDao"
/>
<property
name=
"userExtDao"
ref=
"userExtDao"
/>
<property
name=
"mallOrderConnectDao"
ref=
"mallOrderConnectDao"
/>
<property
name=
"mallMerchantDao"
ref=
"mallMerchantDao"
/>
...
...
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