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
527ee68d
authored
Nov 19, 2018
by
chongli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
加入会员续费活动调试信息
parent
044fdab5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
1 deletions
src/main/java/com/ctrip/fun/golf/service/basic/VoucherService.java
src/main/java/com/ctrip/fun/golf/service/order/CommuneOrderService.java
src/main/java/com/ctrip/fun/golf/service/payment/CommuneNotifyService.java
src/test/java/com/ctrip/fun/golf/dao/statistics/user/UserOrderBehaviourStatisticsDaoTest.java
src/main/java/com/ctrip/fun/golf/service/basic/VoucherService.java
View file @
527ee68d
...
...
@@ -1070,9 +1070,12 @@ public class VoucherService {
* @throws Exception
*/
public
void
sendVoucherFor360PlaceOrder
(
String
uid
,
String
orderId
)
throws
Exception
{
logger
.
error
(
"[sendVoucherFor360PlaceOrder in self "
);
UserExt
userExt
=
this
.
userExtDao
.
getByUid
(
uid
);
Date
communeEnd
=
DateUtil
.
addDateField
(
userExt
.
getCommuneAgainTime
(),
Calendar
.
YEAR
,
1
);
logger
.
error
(
"[sendVoucherFor360PlaceOrder in self uid="
+
uid
+
";communeEnd="
+
DateUtil
.
getDateTimeStr
(
communeEnd
));
String
rule_String
=
null
;
JSONObject
jsobj
=
JSONObject
.
parseObject
(
clientConfigDao
.
getByType
(
"chongzhiren_voucher_send_360"
).
getMessage
());
JSONArray
config_360
=
jsobj
.
getJSONArray
(
"rules"
);
...
...
src/main/java/com/ctrip/fun/golf/service/order/CommuneOrderService.java
View file @
527ee68d
...
...
@@ -362,6 +362,8 @@ public class CommuneOrderService extends AbstractOrderService<CommuneOrderBean,
getUserExtDao
().
setUserExtVipGradeRenewCommune
(
order
.
getUid
());
operationMessageService
.
executeSendMessageOfVipCommune
(
order
,
110
);
try
{
//1:执行续费人的小程序送券
logger
.
error
(
"[sendVoucherFor360PlaceOrder in afterSubmitOrder 367 "
);
this
.
getVoucherService
().
sendVoucherFor360PlaceOrder
(
order
.
getUid
(),
order
.
getOrderId
()+
""
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
...
...
src/main/java/com/ctrip/fun/golf/service/payment/CommuneNotifyService.java
View file @
527ee68d
...
...
@@ -69,6 +69,7 @@ public class CommuneNotifyService extends AbstractNotifyService {
}
}
else
if
(
order
.
getAmount
().
intValue
()==
360
){
//1:执行续费人的小程序送券
logger
.
error
(
"[sendVoucherFor360PlaceOrder in notifyForMiniApp 73 "
);
voucherService
.
sendVoucherFor360PlaceOrder
(
order
.
getUid
(),
order
.
getOrderId
()+
""
);
}
}
...
...
@@ -116,6 +117,8 @@ public class CommuneNotifyService extends AbstractNotifyService {
sendMessage
(
order
,
110
);
//1:执行续费送券逻辑
try
{
//1:执行续费人的小程序送券
logger
.
error
(
"[sendVoucherFor360PlaceOrder in doPaySuccess 122 "
);
voucherService
.
sendVoucherFor360PlaceOrder
(
order
.
getUid
(),
order
.
getOrderId
()+
""
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
...
...
src/test/java/com/ctrip/fun/golf/dao/statistics/user/UserOrderBehaviourStatisticsDaoTest.java
View file @
527ee68d
...
...
@@ -115,7 +115,7 @@ public class UserOrderBehaviourStatisticsDaoTest {
}
@Test
public
void
testOrderUpdate
()
throws
Exception
{
voucherService
.
voucherUsedSend
(
1106088
,
"15021270276"
,
"lichong"
,
1
);
voucherService
.
sendVoucherFor360PlaceOrder
(
"15021268738"
,
"111111"
);
}
...
...
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