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
906da92b
authored
Jan 29, 2023
by
caosy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
劵过期
parent
1b3857a2
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
2 deletions
src/main/java/com/ctrip/fun/golf/dao/basic/VoucherDao.java
src/main/java/com/ctrip/fun/golf/dao/user/UserExtDao.java
src/main/java/com/ctrip/fun/golf/service/basic/PrePayCardService.java
src/main/java/com/ctrip/fun/golf/dao/basic/VoucherDao.java
View file @
906da92b
...
@@ -411,6 +411,7 @@ public class VoucherDao extends GenericHibernateDao<Voucher, Integer> {
...
@@ -411,6 +411,7 @@ public class VoucherDao extends GenericHibernateDao<Voucher, Integer> {
if
(
StringUtils
.
hasText
(
request
.
getUserId
()))
{
if
(
StringUtils
.
hasText
(
request
.
getUserId
()))
{
sb
.
append
(
" and v.uid='"
).
append
(
request
.
getUserId
()).
append
(
"'"
);
sb
.
append
(
" and v.uid='"
).
append
(
request
.
getUserId
()).
append
(
"'"
);
sb
.
append
(
" and v.deleteStatus=0"
);
sb
.
append
(
" and v.deleteStatus=0"
);
sb
.
append
(
" and DATE_ADD(NOW(),INTERVAL -2 year)<=v.EndUseDate "
);
}
}
// sb.append(" and v.Used=").append(VourcherUsedEnum.UNUSED.getKey().intValue());
// sb.append(" and v.Used=").append(VourcherUsedEnum.UNUSED.getKey().intValue());
// sb.append(" and DATE_FORMAT(v.StartUseDate, '%Y-%m-%d') <= DATE_FORMAT(now(), '%Y-%m-%d') and DATE_FORMAT(v.EndUseDate, '%Y-%m-%d') >= DATE_FORMAT(now(), '%Y-%m-%d') ");
// sb.append(" and DATE_FORMAT(v.StartUseDate, '%Y-%m-%d') <= DATE_FORMAT(now(), '%Y-%m-%d') and DATE_FORMAT(v.EndUseDate, '%Y-%m-%d') >= DATE_FORMAT(now(), '%Y-%m-%d') ");
...
...
src/main/java/com/ctrip/fun/golf/dao/user/UserExtDao.java
View file @
906da92b
...
@@ -471,6 +471,9 @@ public class UserExtDao extends GenericHibernateDao<UserExt, Integer> {
...
@@ -471,6 +471,9 @@ public class UserExtDao extends GenericHibernateDao<UserExt, Integer> {
}
}
// mobilePhone
// mobilePhone
if
((
""
.
equals
(
query
.
getMobilePhone
())||
query
.
getMobilePhone
()==
null
)&&(
query
.
getUid
()==
null
||
""
.
equals
(
query
.
getUid
()))){
query
.
setMobilePhone
(
"root"
);
}
if
(!
StringUtils
.
isEmpty
(
query
.
getMobilePhone
()))
{
if
(!
StringUtils
.
isEmpty
(
query
.
getMobilePhone
()))
{
criteria
.
add
(
Restrictions
.
like
(
"bindedMobilePhone"
,
query
.
getMobilePhone
(),
criteria
.
add
(
Restrictions
.
like
(
"bindedMobilePhone"
,
query
.
getMobilePhone
(),
MatchMode
.
ANYWHERE
));
MatchMode
.
ANYWHERE
));
...
@@ -529,10 +532,10 @@ public class UserExtDao extends GenericHibernateDao<UserExt, Integer> {
...
@@ -529,10 +532,10 @@ public class UserExtDao extends GenericHibernateDao<UserExt, Integer> {
List
<
UserExt
>
result
=
criteria
.
list
();
List
<
UserExt
>
result
=
criteria
.
list
();
// count
// count
criteria
.
setFirstResult
(
0
);
//
criteria.setFirstResult(0);
Long
count
=
(
Long
)
criteria
.
setProjection
(
Projections
.
rowCount
()).
uniqueResult
();
Long
count
=
(
Long
)
criteria
.
setProjection
(
Projections
.
rowCount
()).
uniqueResult
();
pagedEntityBean
.
setCount
(
count
);
//
pagedEntityBean.setCount(count);
pagedEntityBean
.
setResult
(
result
);
pagedEntityBean
.
setResult
(
result
);
return
pagedEntityBean
;
return
pagedEntityBean
;
...
...
src/main/java/com/ctrip/fun/golf/service/basic/PrePayCardService.java
View file @
906da92b
...
@@ -6,6 +6,8 @@ import java.util.Date;
...
@@ -6,6 +6,8 @@ import java.util.Date;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.transaction.annotation.Transactional
;
import
com.ctrip.fun.common.core.exceptions.service.ServiceException
;
import
com.ctrip.fun.common.core.exceptions.service.ServiceException
;
import
com.ctrip.fun.common.core.util.BeanConverter
;
import
com.ctrip.fun.common.core.util.BeanConverter
;
...
@@ -23,6 +25,7 @@ import com.ctrip.fun.golf.dao.basic.OperationMessageDao;
...
@@ -23,6 +25,7 @@ import com.ctrip.fun.golf.dao.basic.OperationMessageDao;
import
com.ctrip.fun.golf.dao.basic.PrePayCardDao
;
import
com.ctrip.fun.golf.dao.basic.PrePayCardDao
;
import
com.ctrip.fun.golf.dao.basic.PrePayCardProcessLogDao
;
import
com.ctrip.fun.golf.dao.basic.PrePayCardProcessLogDao
;
import
com.ctrip.fun.golf.dao.basic.SmsDao
;
import
com.ctrip.fun.golf.dao.basic.SmsDao
;
import
com.ctrip.fun.golf.dao.basic.UserPrepayCardLogDao
;
import
com.ctrip.fun.golf.dao.user.UserExtDao
;
import
com.ctrip.fun.golf.dao.user.UserExtDao
;
import
com.ctrip.fun.golf.dao.user.UserTokenDao
;
import
com.ctrip.fun.golf.dao.user.UserTokenDao
;
import
com.ctrip.fun.golf.domain.basic.OperationMessage
;
import
com.ctrip.fun.golf.domain.basic.OperationMessage
;
...
@@ -30,6 +33,7 @@ import com.ctrip.fun.golf.domain.basic.PrePayCard;
...
@@ -30,6 +33,7 @@ import com.ctrip.fun.golf.domain.basic.PrePayCard;
import
com.ctrip.fun.golf.domain.basic.PrePayCardProcessLog
;
import
com.ctrip.fun.golf.domain.basic.PrePayCardProcessLog
;
import
com.ctrip.fun.golf.domain.basic.Sms
;
import
com.ctrip.fun.golf.domain.basic.Sms
;
import
com.ctrip.fun.golf.domain.user.UserExt
;
import
com.ctrip.fun.golf.domain.user.UserExt
;
import
com.ctrip.fun.golf.domain.user.UserPrepayCardLog
;
import
com.ctrip.fun.golf.domain.user.UserToken
;
import
com.ctrip.fun.golf.domain.user.UserToken
;
import
com.ctrip.fun.golf.service.GenericService
;
import
com.ctrip.fun.golf.service.GenericService
;
...
@@ -42,6 +46,8 @@ public class PrePayCardService extends GenericService<PrePayCardDao, PrePayCard,
...
@@ -42,6 +46,8 @@ public class PrePayCardService extends GenericService<PrePayCardDao, PrePayCard,
private
UserTokenDao
userTokenDao
=
null
;
private
UserTokenDao
userTokenDao
=
null
;
private
OperationMessageDao
operationMessageDao
=
null
;
private
OperationMessageDao
operationMessageDao
=
null
;
private
SmsDao
smsDao
=
null
;
private
SmsDao
smsDao
=
null
;
@Autowired
private
UserPrepayCardLogDao
userPrepayCardLogDao
;
public
PrePayCardBean
getById
(
Integer
id
)
{
public
PrePayCardBean
getById
(
Integer
id
)
{
PrePayCard
prePayCard
=
prePayCardDao
.
findById
(
id
);
PrePayCard
prePayCard
=
prePayCardDao
.
findById
(
id
);
...
@@ -333,6 +339,7 @@ public class PrePayCardService extends GenericService<PrePayCardDao, PrePayCard,
...
@@ -333,6 +339,7 @@ public class PrePayCardService extends GenericService<PrePayCardDao, PrePayCard,
*
*
* @param uid
* @param uid
*/
*/
@Transactional
public
Response
<
PrePayCardBean
>
updateStatusValid
(
Integer
id
,
String
uid
)
{
public
Response
<
PrePayCardBean
>
updateStatusValid
(
Integer
id
,
String
uid
)
{
// 得到卡号entity
// 得到卡号entity
PrePayCard
prePayCard
=
null
;
PrePayCard
prePayCard
=
null
;
...
@@ -364,6 +371,15 @@ public class PrePayCardService extends GenericService<PrePayCardDao, PrePayCard,
...
@@ -364,6 +371,15 @@ public class PrePayCardService extends GenericService<PrePayCardDao, PrePayCard,
errorResponse
.
setMessage
(
"该卡号已作废!"
);
errorResponse
.
setMessage
(
"该卡号已作废!"
);
return
errorResponse
;
return
errorResponse
;
}
}
userExtDao
.
addAmount
(
prePayCard
.
getInputer
(),
prePayCard
.
getAmount
());
UserPrepayCardLog
userPrepayCardLog
=
new
UserPrepayCardLog
();
userPrepayCardLog
.
setAmount
(
prePayCard
.
getAmount
().
doubleValue
());
userPrepayCardLog
.
setLogType
(
2
);
userPrepayCardLog
.
setOccurTime
(
new
Date
());
userPrepayCardLog
.
setOrderId
(
prePayCard
.
getId
());
userPrepayCardLog
.
setOrderName
(
prePayCard
.
getCardId
());
userPrepayCardLog
.
setUid
(
prePayCard
.
getInputer
());
userPrepayCardLogDao
.
save
(
userPrepayCardLog
);
prePayCardDao
.
updateStatusValid
(
prePayCard
);
prePayCardDao
.
updateStatusValid
(
prePayCard
);
prePayCardProcessLog
.
setCid
(
prePayCard
.
getId
());
prePayCardProcessLog
.
setCid
(
prePayCard
.
getId
());
...
...
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