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
f2de4ec6
authored
Dec 03, 2020
by
caosy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
球场发信息
parent
441b8b5c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
0 deletions
src/main/java/com/ctrip/fun/golf/service/basic/OperationMessageService.java
src/main/java/com/ctrip/fun/golf/service/order/EventActivityOrderService.java
src/main/java/com/ctrip/fun/golf/service/basic/OperationMessageService.java
View file @
f2de4ec6
...
...
@@ -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
;
...
...
@@ -24,6 +25,7 @@ import com.ctrip.fun.golf.dao.tour.TourBasicDao;
import
com.ctrip.fun.golf.dao.user.UserExtDao
;
import
com.ctrip.fun.golf.domain.basic.OperationMessage
;
import
com.ctrip.fun.golf.domain.basic.Sms
;
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.domain.order.OrderItem
;
...
...
@@ -49,6 +51,7 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
private
UserExtDao
userExtDao
=
null
;
private
MallOrderConnectDao
mallOrderConnectDao
=
null
;
private
MallMerchantDao
mallMerchantDao
=
null
;
private
VoucherDao
voucherDao
=
null
;
/**
* 发送球场订单的短信
...
...
@@ -59,6 +62,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
){
message
=
message
.
replace
(
"[OrderNo]"
,
order
.
getOrderNo
()
+
""
).
replace
(
"[PlayDate]"
,
DateUtil
.
getDateStrC
(
orderItems
.
get
(
0
).
getPlayDate
()));
if
(
orderItems
.
get
(
0
).
getRealPlayTime
()
!=
null
&&
!
""
.
equals
(
orderItems
.
get
(
0
).
getRealPlayTime
()))
{
message
=
message
.
replace
(
"[PlayTime]"
,
orderItems
.
get
(
0
).
getRealPlayTime
());
...
...
@@ -76,13 +80,36 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
}
else
if
(
messageId
==
7
||
messageId
==
5
)
{
}
}
else
{
//发球场
String
[]
split
=
order
.
getVoucherIDList
().
split
(
","
);
for
(
int
i
=
0
;
i
<
split
.
length
;
i
++)
{
Voucher
voucher
=
voucherDao
.
findById
(
Integer
.
valueOf
(
split
[
i
]));
if
(
voucher
.
getVoucherType
()
==
2
){
message
=
message
.
replace
(
"[realName]"
,
voucher
.
getRealName
()
+
""
).
replace
(
"[PlayDate]"
,
DateUtil
.
getDateStrC
(
orderItems
.
get
(
0
).
getPlayDate
()));
if
(
orderItems
.
get
(
0
).
getRealPlayTime
()
!=
null
&&
!
""
.
equals
(
orderItems
.
get
(
0
).
getRealPlayTime
()))
{
message
=
message
.
replace
(
"[PlayTime]"
,
orderItems
.
get
(
0
).
getRealPlayTime
());
}
else
{
message
=
message
.
replace
(
"[PlayTime]"
,
DateUtil
.
int2TeeTime
(
Integer
.
parseInt
(
orderItems
.
get
(
0
).
getTeeTime
())));
}
message
=
message
.
replace
(
"[ProductName]"
,
orderItems
.
get
(
0
).
getProductName
());
}
}
}
}
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
(
order
.
getContactTel
());
}
else
{
sms
.
setMobileNo
(
"19821271996"
);
}
this
.
getSmsDao
().
save
(
sms
);
}
}
...
...
src/main/java/com/ctrip/fun/golf/service/order/EventActivityOrderService.java
View file @
f2de4ec6
...
...
@@ -56,6 +56,7 @@ import com.ctrip.fun.common.vo.product.ResourceInventoryQuery;
import
com.ctrip.fun.common.vo.product.ResourcePriceStatusEnum
;
import
com.ctrip.fun.common.vo.product.ResourceRealTimeTeeTimeTypeEnum
;
import
com.ctrip.fun.golf.dao.assemble.AsmCourseResourceDao
;
import
com.ctrip.fun.golf.dao.basic.VoucherDao
;
import
com.ctrip.fun.golf.dao.notification.EventDao
;
import
com.ctrip.fun.golf.dao.operation.SupplierDao
;
import
com.ctrip.fun.golf.dao.order.EventActivityOrderItemDao
;
...
...
@@ -132,6 +133,8 @@ public class EventActivityOrderService extends
private
EventCustomerInfoService
eventCustomerInfoService
=
null
;
private
VoucherDao
voucherDao
=
null
;
...
...
@@ -313,6 +316,15 @@ public class EventActivityOrderService extends
.
getEventActivityOrderItemDao
().
getOrderItemByOrderId
(
order
.
getOrderId
());
if
(
null
!=
eventActivityOrderItemList
&&
eventActivityOrderItemList
.
size
()
>
0
)
{
this
.
sendMessage
(
order
,
5
);
if
(
order
.
getVoucherIDList
()
!=
null
){
String
[]
split
=
order
.
getVoucherIDList
().
split
(
","
);
for
(
int
i
=
0
;
i
<
split
.
length
;
i
++)
{
Voucher
voucher
=
voucherDao
.
findById
(
Integer
.
valueOf
(
split
[
i
]));
if
(
voucher
.
getVoucherType
()
==
2
){
this
.
sendMessage
(
order
,
120
);
}
}
}
}
}
startCancelOrderJob
(
order
);
...
...
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