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
eb0d269b
authored
Aug 05, 2018
by
chongli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改会员充值的发券规则
parent
b117f141
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
src/main/java/com/ctrip/fun/golf/service/order/CommuneOrderService.java
src/main/java/com/ctrip/fun/golf/service/payment/CommuneNotifyService.java
src/main/java/com/ctrip/fun/golf/service/order/CommuneOrderService.java
View file @
eb0d269b
...
...
@@ -158,9 +158,12 @@ public class CommuneOrderService extends AbstractOrderService<CommuneOrderBean,
Date
sendEndTime
=
DateUtil
.
parseDateTime
(
jsobj
.
getString
(
"sendEndTime"
));
Date
now
=
new
Date
();
if
(
sendBeginTime
.
getTime
()<
now
.
getTime
()&&
now
.
getTime
()<
sendEndTime
.
getTime
()){
VoucherRule
voucherRule
=
this
.
getVoucherRuleDao
().
findById
(
Integer
.
parseInt
(
jsobj
.
getString
(
"id"
)));
String
[]
ids
=
jsobj
.
getString
(
"id"
).
split
(
","
);
for
(
String
id:
ids
){
VoucherRule
voucherRule
=
this
.
getVoucherRuleDao
().
findById
(
Integer
.
parseInt
(
id
));
this
.
getVoucherDao
().
sendVoucherToSpecificUsers
(
voucherRule
,
"'"
+
uid
+
"'"
,
voucherRule
.
getQuantity
());
}
}
}
catch
(
ParseException
e
)
{
e
.
printStackTrace
();
}
...
...
src/main/java/com/ctrip/fun/golf/service/payment/CommuneNotifyService.java
View file @
eb0d269b
...
...
@@ -61,12 +61,14 @@ public class CommuneNotifyService extends AbstractNotifyService {
//1:执行充值人的小程序优惠
communeOrderService
.
executeOrderActive
(
uid
,
"chongzhiren_voucher_send_980"
);
//1:执行推荐人的小程序优惠
if
(
recommendUid
!=
null
&&!
""
.
equals
(
recommendUid
)){
communeOrderService
.
executeOrderActive
(
recommendUid
,
"tuijianren_voucher_send_980"
);
}
}
else
if
(
order
.
getAmount
().
intValue
()==
360
){
//1:执行充值人的小程序优惠
communeOrderService
.
executeOrderActive
(
uid
,
"chongzhiren_voucher_send_360"
);
//1:执行推荐人的小程序优惠
communeOrderService
.
executeOrderActive
(
recommendUid
,
"tuijianren_voucher_send_360"
);
//
communeOrderService.executeOrderActive(recommendUid, "tuijianren_voucher_send_360");
}
}
}
...
...
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