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
771045f4
authored
Jun 11, 2018
by
chongli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
980发券时使用uid
parent
fce9f53f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
src/main/java/com/ctrip/fun/golf/service/order/CommuneOrderService.java
src/test/java/com/ctrip/fun/golf/dao/statistics/user/UserOrderBehaviourStatisticsDaoTest.java
src/main/java/com/ctrip/fun/golf/service/order/CommuneOrderService.java
View file @
771045f4
...
...
@@ -143,7 +143,7 @@ public class CommuneOrderService extends AbstractOrderService<CommuneOrderBean,
Date
now
=
new
Date
();
if
(
sendBeginTime
.
getTime
()<
now
.
getTime
()&&
now
.
getTime
()<
sendEndTime
.
getTime
()){
VoucherRule
voucherRule
=
this
.
getVoucherRuleDao
().
findById
(
Integer
.
parseInt
(
commune_voucher_configs
[
0
]));
this
.
getVoucherDao
().
sendVoucherToSpecificUsers
(
voucherRule
,
order
.
get
ContactTel
(),
voucherRule
.
getQuantity
());
this
.
getVoucherDao
().
sendVoucherToSpecificUsers
(
voucherRule
,
order
.
get
Uid
(),
voucherRule
.
getQuantity
());
}
}
catch
(
ParseException
e
)
{
e
.
printStackTrace
();
...
...
src/test/java/com/ctrip/fun/golf/dao/statistics/user/UserOrderBehaviourStatisticsDaoTest.java
View file @
771045f4
...
...
@@ -4,7 +4,9 @@ import com.ctrip.fun.common.core.util.DateUtil;
import
com.ctrip.fun.common.vo.market.RmdCodeReportQuery
;
import
com.ctrip.fun.common.vo.market.UserOrderBehaviourStatisticsBean
;
import
com.ctrip.fun.common.vo.statistics.query.UserStatisticsQuery
;
import
com.ctrip.fun.golf.dao.order.OrderDao
;
import
com.ctrip.fun.golf.dao.user.UserOrderBehaviourStatisticsDao
;
import
com.ctrip.fun.golf.service.order.CommuneOrderService
;
import
com.ctrip.fun.golf.service.payment.CommuneNotifyService
;
import
com.ctrip.fun.golf.vo.PagedEntityBean
;
...
...
@@ -19,6 +21,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import
java.text.SimpleDateFormat
;
import
java.util.Date
;
import
java.util.List
;
...
...
@@ -33,11 +37,14 @@ public class UserOrderBehaviourStatisticsDaoTest{
private
UserOrderBehaviourStatisticsDao
userOrderBehaviourStatisticsDao
;
@Autowired
private
CommuneNotifyService
communeNotifyService
;
private
CommuneOrderService
communeOrderService
;
@Autowired
private
OrderDao
orderDao
;
@Test
public
void
testListNonOrderUser
()
throws
Exception
{
commune
NotifyService
.
executeOrderActive
(
null
);
commune
OrderService
.
executeOrderActive
(
orderDao
.
getOrderByID
(
1317857115
)
);
}
@Test
...
...
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