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
a5e5637a
authored
Oct 28, 2022
by
caosy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
单订场抵扣劵 产品抵扣劵 自动一年
parent
101691f0
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
140 additions
and
62 deletions
src/main/java/com/ctrip/fun/golf/dao/basic/VoucherDao.java
src/main/java/com/ctrip/fun/golf/service/basic/VoucherService.java
src/main/java/com/ctrip/fun/golf/service/order/BuyVoucherOrderService.java
src/main/java/com/ctrip/fun/golf/service/order/CommuneOrderService.java
src/main/java/com/ctrip/fun/golf/service/payment/BuyVoucherNotifyService.java
src/main/java/com/ctrip/fun/golf/service/payment/CommuneNotifyService.java
src/main/java/com/ctrip/fun/golf/dao/basic/VoucherDao.java
View file @
a5e5637a
...
...
@@ -9,6 +9,7 @@ import java.util.List;
import
java.util.Map
;
import
org.apache.activemq.security.SecurityContext
;
import
org.apache.commons.lang.time.DateUtils
;
import
org.hibernate.Criteria
;
import
org.hibernate.HibernateException
;
import
org.hibernate.Query
;
...
...
@@ -22,6 +23,7 @@ import org.hibernate.transform.Transformers;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
com.alibaba.fastjson.JSONObject
;
import
com.ctrip.fun.common.core.util.BeanConverter
;
import
com.ctrip.fun.common.core.util.DateUtil
;
import
com.ctrip.fun.common.core.util.StringUtils
;
...
...
@@ -569,7 +571,7 @@ public class VoucherDao extends GenericHibernateDao<Voucher, Integer> {
.
append
(
DateUtil
.
getDateStr
(
queryBean
.
getPlayDate
())).
append
(
"'"
);
}
if
(
queryBean
.
getType
()
!=
null
&&
queryBean
.
getType
()
!=
0
)
{
if
(
queryBean
.
getType
()
==
6
||
queryBean
.
getType
()
==
7
||
queryBean
.
getType
()
==
8
){
if
(
queryBean
.
getType
()
==
7
||
queryBean
.
getType
()
==
8
){
sb
.
append
(
" and (v.type= "
).
append
(
queryBean
.
getType
()).
append
(
" or v.type= 9)"
);
}
else
{
sb
.
append
(
" and v.type="
).
append
(
queryBean
.
getType
());
...
...
@@ -672,33 +674,68 @@ public class VoucherDao extends GenericHibernateDao<Voucher, Integer> {
Transformers
.
ALIAS_TO_ENTITY_MAP
).
list
();
int
rowNum
=
queryResult
.
size
();
boolean
sendMessage
=
sendMessage
(
voucherRule
);
JSONObject
jsobj1
=
JSONObject
.
parseObject
(
voucherRule
.
getConditionJson
());
String
type1
=
jsobj1
.
getString
(
"type"
);
for
(
Map
<
String
,
Object
>
map
:
queryResult
)
{
for
(
int
j
=
0
;
j
<
voucherRule
.
getQuantity
();
j
++)
{
insertSql
.
append
(
"('"
+
voucherRule
.
getVoucherType
()
+
"'"
);
insertSql
.
append
(
",'"
+
voucherRule
.
getAmount
()
+
"'"
);
String
startUseDate
=
DateUtil
.
getDateTimeStr
(
voucherRule
.
getStartUseDate
());
insertSql
.
append
(
",'"
+
startUseDate
+
"'"
);
String
endUseDate
=
DateUtil
.
getDateTimeStr
(
voucherRule
.
getEndUseDate
());
insertSql
.
append
(
",'"
+
endUseDate
+
"'"
);
insertSql
.
append
(
",'"
+
(
String
)
map
.
get
(
"UID"
)
+
"'"
);
insertSql
.
append
(
",'"
+
source
+
"'"
);
insertSql
.
append
(
",'"
+
voucherRule
.
getId
()
+
"'"
);
insertSql
.
append
(
",'"
+
voucherRule
.
getUserLimit
()
+
"'"
);
insertSql
.
append
(
",'"
+
DateUtil
.
getDateTimeStr
(
new
Date
())+
"'"
);
insertSql
.
append
(
",'"
+
StringUtils
.
escapeSql
(
voucherRule
.
getRemark
())
+
"'"
);
insertSql
.
append
(
",'"
+
StringUtils
.
escapeSql
(
voucherRule
.
getDescription
())
+
"'"
);
insertSql
.
append
(
",'"
+
voucherRule
.
getExclusive
()
+
"'"
);
insertSql
.
append
(
",'"
+
voucherRule
.
getCanUseAmount
()
+
"'"
);
insertSql
.
append
(
",'"
+
voucherRule
.
getFullCutAmount
()
+
"'"
);
// if(!"".equals(voucherRule.getOperater()) && voucherRule.getOperater().equals(loginUserName)){
// insertSql.append(",'"+voucherRule.getOperater()+"'");
// }else{
insertSql
.
append
(
",'"
+
loginUserName
+
"'"
);
//}
insertSql
.
append
(
",'"
+
voucherRule
.
getShared
()
+
"'),"
);
}
if
(
5
==
voucherRule
.
getVoucherType
()||
7
==
voucherRule
.
getVoucherType
()||
8
==
voucherRule
.
getVoucherType
()||
9
==
voucherRule
.
getVoucherType
()||
(
voucherRule
.
getVoucherType
()==
1
&&
"1"
.
equals
(
type1
))){
for
(
int
j
=
0
;
j
<
voucherRule
.
getQuantity
();
j
++)
{
insertSql
.
append
(
"('"
+
voucherRule
.
getVoucherType
()
+
"'"
);
insertSql
.
append
(
",'"
+
voucherRule
.
getAmount
()
+
"'"
);
String
startUseDate
=
DateUtil
.
getDateTimeStr
(
new
Date
());
insertSql
.
append
(
",'"
+
startUseDate
+
"'"
);
String
endUseDate
=
DateUtil
.
getDateTimeStr
(
DateUtils
.
addYears
(
DateUtil
.
getEndOfDay
(
new
Date
()),
1
));
insertSql
.
append
(
",'"
+
endUseDate
+
"'"
);
insertSql
.
append
(
",'"
+
(
String
)
map
.
get
(
"UID"
)
+
"'"
);
insertSql
.
append
(
",'"
+
source
+
"'"
);
insertSql
.
append
(
",'"
+
voucherRule
.
getId
()
+
"'"
);
insertSql
.
append
(
",'"
+
voucherRule
.
getUserLimit
()
+
"'"
);
insertSql
.
append
(
",'"
+
DateUtil
.
getDateTimeStr
(
new
Date
())+
"'"
);
insertSql
.
append
(
",'"
+
StringUtils
.
escapeSql
(
voucherRule
.
getRemark
())
+
"'"
);
insertSql
.
append
(
",'"
+
StringUtils
.
escapeSql
(
voucherRule
.
getDescription
())
+
"'"
);
insertSql
.
append
(
",'"
+
voucherRule
.
getExclusive
()
+
"'"
);
insertSql
.
append
(
",'"
+
voucherRule
.
getCanUseAmount
()
+
"'"
);
insertSql
.
append
(
",'"
+
voucherRule
.
getFullCutAmount
()
+
"'"
);
// if(!"".equals(voucherRule.getOperater()) && voucherRule.getOperater().equals(loginUserName)){
// insertSql.append(",'"+voucherRule.getOperater()+"'");
// }else{
insertSql
.
append
(
",'"
+
loginUserName
+
"'"
);
//}
insertSql
.
append
(
",'"
+
voucherRule
.
getShared
()
+
"'),"
);
}
}
else
{
for
(
int
j
=
0
;
j
<
voucherRule
.
getQuantity
();
j
++)
{
insertSql
.
append
(
"('"
+
voucherRule
.
getVoucherType
()
+
"'"
);
insertSql
.
append
(
",'"
+
voucherRule
.
getAmount
()
+
"'"
);
String
startUseDate
=
DateUtil
.
getDateTimeStr
(
voucherRule
.
getStartUseDate
());
insertSql
.
append
(
",'"
+
startUseDate
+
"'"
);
String
endUseDate
=
DateUtil
.
getDateTimeStr
(
voucherRule
.
getEndUseDate
());
insertSql
.
append
(
",'"
+
endUseDate
+
"'"
);
insertSql
.
append
(
",'"
+
(
String
)
map
.
get
(
"UID"
)
+
"'"
);
insertSql
.
append
(
",'"
+
source
+
"'"
);
insertSql
.
append
(
",'"
+
voucherRule
.
getId
()
+
"'"
);
insertSql
.
append
(
",'"
+
voucherRule
.
getUserLimit
()
+
"'"
);
insertSql
.
append
(
",'"
+
DateUtil
.
getDateTimeStr
(
new
Date
())+
"'"
);
insertSql
.
append
(
",'"
+
StringUtils
.
escapeSql
(
voucherRule
.
getRemark
())
+
"'"
);
insertSql
.
append
(
",'"
+
StringUtils
.
escapeSql
(
voucherRule
.
getDescription
())
+
"'"
);
insertSql
.
append
(
",'"
+
voucherRule
.
getExclusive
()
+
"'"
);
insertSql
.
append
(
",'"
+
voucherRule
.
getCanUseAmount
()
+
"'"
);
insertSql
.
append
(
",'"
+
voucherRule
.
getFullCutAmount
()
+
"'"
);
// if(!"".equals(voucherRule.getOperater()) && voucherRule.getOperater().equals(loginUserName)){
// insertSql.append(",'"+voucherRule.getOperater()+"'");
// }else{
insertSql
.
append
(
",'"
+
loginUserName
+
"'"
);
//}
insertSql
.
append
(
",'"
+
voucherRule
.
getShared
()
+
"'),"
);
}
}
BigDecimal
totalAmount
=
voucherRule
.
getAmount
().
multiply
(
new
BigDecimal
(
voucherRule
.
getQuantity
()));
...
...
src/main/java/com/ctrip/fun/golf/service/basic/VoucherService.java
View file @
a5e5637a
package
com
.
ctrip
.
fun
.
golf
.
service
.
basic
;
import
java.math.BigDecimal
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Calendar
;
...
...
@@ -10,6 +11,8 @@ import java.util.Comparator;
import
java.util.Date
;
import
java.util.List
;
import
net.logstash.logback.encoder.org.apache.commons.lang.time.DateUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -32,15 +35,19 @@ import com.ctrip.fun.common.vo.basic.ConditionMultipleElement;
import
com.ctrip.fun.common.vo.basic.CourseRuleConditionBaseBean
;
import
com.ctrip.fun.common.vo.basic.CourseRuleConditionBean
;
import
com.ctrip.fun.common.vo.basic.EventActivityRuleConditionBaseBean
;
import
com.ctrip.fun.common.vo.basic.EventActivityRuleConditionBean
;
import
com.ctrip.fun.common.vo.basic.GeneralVoucherRuleConditionBaseBean
;
import
com.ctrip.fun.common.vo.basic.MallProductRuleConditionBaseBean
;
import
com.ctrip.fun.common.vo.basic.MallProductRuleConditionBean
;
import
com.ctrip.fun.common.vo.basic.MultipleCourseConditionBean
;
import
com.ctrip.fun.common.vo.basic.PhysicalVoucherRuleConditionBean
;
import
com.ctrip.fun.common.vo.basic.SmsStatus
;
import
com.ctrip.fun.common.vo.basic.SmsType
;
import
com.ctrip.fun.common.vo.basic.PhysicalVoucherRuleConditionBaseBean
;
import
com.ctrip.fun.common.vo.basic.TicketVoucherRuleConditionBaseBean
;
import
com.ctrip.fun.common.vo.basic.TicketVoucherRuleConditionBean
;
import
com.ctrip.fun.common.vo.basic.TrainVoucherRuleConditionBaseBean
;
import
com.ctrip.fun.common.vo.basic.TrainVoucherRuleConditionBean
;
import
com.ctrip.fun.common.vo.basic.VipVoucherRuleConditionBaseBean
;
import
com.ctrip.fun.common.vo.basic.VoucherGetLogBean
;
import
com.ctrip.fun.common.vo.basic.VoucherItemDTO
;
...
...
@@ -1044,13 +1051,14 @@ public class VoucherService {
JSONObject
jsobj
=
JSONObject
.
parseObject
(
clientConfig
.
getMessage
());
if
(
jsobj
.
get
(
voucher
.
getRuleId
()+
""
)!=
null
){
String
[]
newRuleIds
=
jsobj
.
get
(
voucher
.
getRuleId
()+
""
).
toString
().
split
(
","
);
Date
payDate
=
new
Date
();
for
(
String
newRuleId:
newRuleIds
){
String
[]
conf
=
newRuleId
.
split
(
"_"
);
//0是分享和使用都赠送;其它是使用方式和配置方式相同才送券
if
(
Integer
.
parseInt
(
conf
[
1
])==
0
||
Integer
.
parseInt
(
conf
[
1
])==
usedWay
){
VoucherRule
roucherRule
=
voucherRuleDao
.
findById
(
Integer
.
parseInt
(
conf
[
0
]));
for
(
int
i
=
0
;
i
<
roucherRule
.
getQuantity
();
i
++){
Voucher
againVoucher
=
this
.
getVoucherFromRule
(
roucherRule
,
""
,
""
,
""
);
Voucher
againVoucher
=
this
.
getVoucherFromRule
(
roucherRule
,
""
,
""
,
""
,
payDate
);
againVoucher
.
setNo
(
""
);
againVoucher
.
setUid
(
uid
);
againVoucher
.
setSourceRemark
(
remark
);
...
...
@@ -1208,7 +1216,8 @@ public class VoucherService {
ClientConfig
clientConfig
=
clientConfigDao
.
getByType
(
voucherSendType
);
//社员订单赠送优惠券配置:431_sendBeginTime_sendEndTime(规则id_开始发送时间_结束发送方式)
String
commune_voucher
=
clientConfig
.
getMessage
();
this
.
sendVoucherForPlaceOrderByConfig
(
uid
,
orderId
,
myselfOrder
,
commune_voucher
,
""
,
""
,
""
);
Date
payDate
=
new
Date
();
this
.
sendVoucherForPlaceOrderByConfig
(
uid
,
orderId
,
myselfOrder
,
commune_voucher
,
""
,
""
,
""
,
payDate
);
}
...
...
@@ -1235,7 +1244,7 @@ public class VoucherService {
}
}
if
(
rule_String
!=
null
){
this
.
sendVoucherForPlaceOrderByConfig
(
uid
,
orderId
,
true
,
rule_String
,
""
,
""
,
""
);
this
.
sendVoucherForPlaceOrderByConfig
(
uid
,
orderId
,
true
,
rule_String
,
""
,
""
,
""
,
communeEnd
);
}
}
...
...
@@ -1245,8 +1254,9 @@ public class VoucherService {
public
void
sendVoucherForGiftByConfig
(
Integer
ruleId
,
String
uid
,
String
orderId
,
boolean
myselfOrder
,
String
realName
,
String
idCard
,
String
mobilePhone
){
try
{
Date
payDate
=
new
Date
();
VoucherRule
roucherRule
=
voucherRuleDao
.
findById
(
ruleId
);
Voucher
voucher
=
this
.
getVoucherFromRule
(
roucherRule
,
realName
,
idCard
,
mobilePhone
);
Voucher
voucher
=
this
.
getVoucherFromRule
(
roucherRule
,
realName
,
idCard
,
mobilePhone
,
payDate
);
voucher
.
setNo
(
""
);
voucher
.
setUid
(
uid
);
voucher
.
setSourceRemark
(
orderId
);
...
...
@@ -1267,7 +1277,7 @@ public class VoucherService {
* @param myselfOrder 是否用户自己的订单
* @param voucherSendType 发券配置的key值
*/
public
void
sendVoucherForPlaceOrderByConfig
(
String
uid
,
String
orderId
,
boolean
myselfOrder
,
String
voucherConfig
,
String
realName
,
String
idCard
,
String
mobilePhone
){
public
void
sendVoucherForPlaceOrderByConfig
(
String
uid
,
String
orderId
,
boolean
myselfOrder
,
String
voucherConfig
,
String
realName
,
String
idCard
,
String
mobilePhone
,
Date
payDate
){
JSONObject
jsobj
=
JSONObject
.
parseObject
(
voucherConfig
);
try
{
Date
sendBeginTime
=
DateUtil
.
parseDateTime
(
jsobj
.
getString
(
"sendBeginTime"
));
...
...
@@ -1278,7 +1288,7 @@ public class VoucherService {
for
(
String
id:
ids
){
VoucherRule
roucherRule
=
voucherRuleDao
.
findById
(
Integer
.
parseInt
(
id
));
for
(
int
i
=
0
;
i
<
roucherRule
.
getQuantity
();
i
++){
Voucher
voucher
=
this
.
getVoucherFromRule
(
roucherRule
,
realName
,
idCard
,
mobilePhone
);
Voucher
voucher
=
this
.
getVoucherFromRule
(
roucherRule
,
realName
,
idCard
,
mobilePhone
,
payDate
);
voucher
.
setNo
(
""
);
voucher
.
setUid
(
uid
);
voucher
.
setSourceRemark
(
orderId
);
...
...
@@ -1299,34 +1309,65 @@ public class VoucherService {
* @param voucherRule
* @return Voucher
*/
private
Voucher
getVoucherFromRule
(
VoucherRule
voucherRule
,
String
realName
,
String
idCard
,
String
mobilePhone
){
private
Voucher
getVoucherFromRule
(
VoucherRule
voucherRule
,
String
realName
,
String
idCard
,
String
mobilePhone
,
Date
payDate
){
if
(
voucherRule
==
null
){
return
null
;
}
Voucher
voucher
=
new
Voucher
();
voucher
.
setType
(
voucherRule
.
getVoucherType
());
voucher
.
setAmount
(
voucherRule
.
getAmount
());
voucher
.
setStartUseDate
(
voucherRule
.
getStartUseDate
());
voucher
.
setEndUseDate
(
voucherRule
.
getEndUseDate
());
voucher
.
setRuleId
(
voucherRule
.
getId
());
voucher
.
setRemark
(
voucherRule
.
getRemark
());
voucher
.
setDescription
(
voucherRule
.
getDescription
());
voucher
.
setShared
(
voucherRule
.
getShared
());
voucher
.
setUserLimit
(
voucherRule
.
getUserLimit
());
voucher
.
setExclusive
(
voucherRule
.
getExclusive
());
voucher
.
setCanUseAmount
(
voucherRule
.
getCanUseAmount
());
voucher
.
setFullCutAmount
(
voucherRule
.
getFullCutAmount
());
voucher
.
setCreatedTime
(
new
Date
());
voucher
.
setRealName
(
realName
);
voucher
.
setIdCard
(
idCard
);
voucher
.
setMobilePhone
(
mobilePhone
);
if
(
realName
!=
null
&&
!(
""
).
equals
(
realName
)){
voucher
.
setVoucherType
(
2
);
JSONObject
jsobj1
=
JSONObject
.
parseObject
(
voucherRule
.
getConditionJson
());
String
type
=
jsobj1
.
getString
(
"type"
);
if
(
voucherRule
.
getVoucherType
()==
5
||
voucherRule
.
getVoucherType
()
==
7
||
voucherRule
.
getVoucherType
()==
8
||
voucherRule
.
getVoucherType
()==
9
||
(
voucherRule
.
getVoucherType
()==
1
&&
"1"
.
equals
(
type
))){
Voucher
voucher
=
new
Voucher
();
voucher
.
setType
(
voucherRule
.
getVoucherType
());
voucher
.
setAmount
(
voucherRule
.
getAmount
());
voucher
.
setStartUseDate
(
payDate
);
voucher
.
setEndUseDate
(
DateUtils
.
addYears
(
DateUtil
.
getEndOfDay
(
payDate
),
1
));
voucher
.
setRuleId
(
voucherRule
.
getId
());
voucher
.
setRemark
(
voucherRule
.
getRemark
());
voucher
.
setDescription
(
voucherRule
.
getDescription
());
voucher
.
setShared
(
voucherRule
.
getShared
());
voucher
.
setUserLimit
(
voucherRule
.
getUserLimit
());
voucher
.
setExclusive
(
voucherRule
.
getExclusive
());
voucher
.
setCanUseAmount
(
voucherRule
.
getCanUseAmount
());
voucher
.
setFullCutAmount
(
voucherRule
.
getFullCutAmount
());
voucher
.
setCreatedTime
(
new
Date
());
voucher
.
setRealName
(
realName
);
voucher
.
setIdCard
(
idCard
);
voucher
.
setMobilePhone
(
mobilePhone
);
if
(
realName
!=
null
&&
!(
""
).
equals
(
realName
)){
voucher
.
setVoucherType
(
2
);
}
else
{
voucher
.
setVoucherType
(
1
);
}
return
voucher
;
}
else
{
voucher
.
setVoucherType
(
1
);
Voucher
voucher
=
new
Voucher
();
voucher
.
setType
(
voucherRule
.
getVoucherType
());
voucher
.
setAmount
(
voucherRule
.
getAmount
());
voucher
.
setStartUseDate
(
voucherRule
.
getStartUseDate
());
voucher
.
setEndUseDate
(
voucherRule
.
getEndUseDate
());
voucher
.
setRuleId
(
voucherRule
.
getId
());
voucher
.
setRemark
(
voucherRule
.
getRemark
());
voucher
.
setDescription
(
voucherRule
.
getDescription
());
voucher
.
setShared
(
voucherRule
.
getShared
());
voucher
.
setUserLimit
(
voucherRule
.
getUserLimit
());
voucher
.
setExclusive
(
voucherRule
.
getExclusive
());
voucher
.
setCanUseAmount
(
voucherRule
.
getCanUseAmount
());
voucher
.
setFullCutAmount
(
voucherRule
.
getFullCutAmount
());
voucher
.
setCreatedTime
(
new
Date
());
voucher
.
setRealName
(
realName
);
voucher
.
setIdCard
(
idCard
);
voucher
.
setMobilePhone
(
mobilePhone
);
if
(
realName
!=
null
&&
!(
""
).
equals
(
realName
)){
voucher
.
setVoucherType
(
2
);
}
else
{
voucher
.
setVoucherType
(
1
);
}
return
voucher
;
}
return
voucher
;
}
...
...
src/main/java/com/ctrip/fun/golf/service/order/BuyVoucherOrderService.java
View file @
a5e5637a
...
...
@@ -232,7 +232,7 @@ public class BuyVoucherOrderService extends AbstractOrderService<CommuneOrderBea
BuyVoucherActivity
buyVoucherActivity
=
buyVoucherActivityDao
.
findById
(
communeOrderItem
.
getActivityId
());
//执行发券
String
uid
=
order
.
getUid
();
//下单人id
voucherService
.
sendVoucherForPlaceOrderByConfig
(
uid
,
order
.
getOrderId
()+
""
,
true
,
buyVoucherActivity
.
getVoucherConfig
(),
""
,
""
,
""
);
voucherService
.
sendVoucherForPlaceOrderByConfig
(
uid
,
order
.
getOrderId
()+
""
,
true
,
buyVoucherActivity
.
getVoucherConfig
(),
""
,
""
,
""
,
order
.
getPayDate
()
);
}
}
...
...
src/main/java/com/ctrip/fun/golf/service/order/CommuneOrderService.java
View file @
a5e5637a
...
...
@@ -335,7 +335,7 @@ public class CommuneOrderService extends AbstractOrderService<CommuneOrderBean,
this
.
getOrderDao
().
updateOrderStatusForMiniApps
(
order
.
getOrderNo
());
//执行发券
BuyVoucherActivity
buyVoucherActivity
=
buyVoucherActivityDao
.
findById
(
newCommuneOrderBean
.
getActivityId
());
voucherService
.
sendVoucherForPlaceOrderByConfig
(
newCommuneOrderBean
.
getUid
(),
order
.
getOrderId
()+
""
,
true
,
buyVoucherActivity
.
getVoucherConfig
(),
""
,
""
,
""
);
voucherService
.
sendVoucherForPlaceOrderByConfig
(
newCommuneOrderBean
.
getUid
(),
order
.
getOrderId
()+
""
,
true
,
buyVoucherActivity
.
getVoucherConfig
(),
""
,
""
,
""
,
order
.
getPayDate
()
);
// 修改优惠券状态
List
<
VoucherItemBean
>
voucherList
=
communeOrderBean
.
getVoucherList
();
...
...
@@ -411,7 +411,7 @@ public class CommuneOrderService extends AbstractOrderService<CommuneOrderBean,
this
.
getOrderDao
().
updateOrderStatusForMiniApps
(
order
.
getOrderNo
());
//执行发券
BuyVoucherActivity
buyVoucherActivity
=
buyVoucherActivityDao
.
findById
(
newCommuneOrderBean
.
getActivityId
());
voucherService
.
sendVoucherForPlaceOrderByConfig
(
newCommuneOrderBean
.
getUid
(),
order
.
getOrderId
()+
""
,
true
,
buyVoucherActivity
.
getVoucherConfig
(),
""
,
""
,
""
);
voucherService
.
sendVoucherForPlaceOrderByConfig
(
newCommuneOrderBean
.
getUid
(),
order
.
getOrderId
()+
""
,
true
,
buyVoucherActivity
.
getVoucherConfig
(),
""
,
""
,
""
,
order
.
getPayDate
()
);
// 修改优惠券状态
List
<
VoucherItemBean
>
voucherList
=
communeOrderBean
.
getVoucherList
();
if
(
voucherList
.
size
()
>
0
){
...
...
src/main/java/com/ctrip/fun/golf/service/payment/BuyVoucherNotifyService.java
View file @
a5e5637a
...
...
@@ -36,7 +36,7 @@ public class BuyVoucherNotifyService extends AbstractNotifyService {
BuyVoucherActivity
buyVoucherActivity
=
buyVoucherActivityDao
.
findById
(
communeOrderItem
.
getActivityId
());
//执行发券
String
uid
=
order
.
getUid
();
//下单人id
voucherService
.
sendVoucherForPlaceOrderByConfig
(
uid
,
order
.
getOrderId
()+
""
,
true
,
buyVoucherActivity
.
getVoucherConfig
(),
""
,
""
,
""
);
voucherService
.
sendVoucherForPlaceOrderByConfig
(
uid
,
order
.
getOrderId
()+
""
,
true
,
buyVoucherActivity
.
getVoucherConfig
(),
""
,
""
,
""
,
order
.
getPayDate
()
);
}
...
...
src/main/java/com/ctrip/fun/golf/service/payment/CommuneNotifyService.java
View file @
a5e5637a
...
...
@@ -85,7 +85,7 @@ public class CommuneNotifyService extends AbstractNotifyService {
if
(
communeOrderItem
.
getActivityId
()
!=
null
){
//执行发券
BuyVoucherActivity
buyVoucherActivity
=
buyVoucherActivityDao
.
findById
(
communeOrderItem
.
getActivityId
());
voucherService
.
sendVoucherForPlaceOrderByConfig
(
uid
,
order
.
getOrderId
()+
""
,
true
,
buyVoucherActivity
.
getVoucherConfig
(),
""
,
""
,
""
);
voucherService
.
sendVoucherForPlaceOrderByConfig
(
uid
,
order
.
getOrderId
()+
""
,
true
,
buyVoucherActivity
.
getVoucherConfig
(),
""
,
""
,
""
,
order
.
getPayDate
()
);
}
}
...
...
@@ -118,7 +118,7 @@ public class CommuneNotifyService extends AbstractNotifyService {
if
(!
""
.
equals
(
order
.
getRealName
())
&&
!
""
.
equals
(
order
.
getIdCard
())
&&
order
.
getIdCard
()!=
null
&&
order
.
getRealName
()!=
null
){
// voucherService.sendVoucherForPlaceOrderByConfig(uid, order.getOrderId()+"", true, buyVoucherActivity.getVoucherConfig(),order.getRealName(),order.getIdCard(),order.getMobilePhone());
}
else
{
voucherService
.
sendVoucherForPlaceOrderByConfig
(
uid
,
order
.
getOrderId
()+
""
,
true
,
buyVoucherActivity
.
getVoucherConfig
(),
""
,
""
,
""
);
voucherService
.
sendVoucherForPlaceOrderByConfig
(
uid
,
order
.
getOrderId
()+
""
,
true
,
buyVoucherActivity
.
getVoucherConfig
(),
""
,
""
,
""
,
order
.
getPayDate
()
);
}
//给推荐人发现金红包
...
...
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