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
531a41b0
authored
Mar 04, 2019
by
chongli
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'f-6.7.0' of 192.168.10.6:caosy/fun-golf-service into f-6.7.0
parents
678cf2e8
32217bbe
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
src/main/java/com/ctrip/fun/golf/service/basic/PrePayCardService.java
src/main/java/com/ctrip/fun/golf/service/basic/PrePayCardService.java
View file @
531a41b0
...
...
@@ -245,7 +245,7 @@ public class PrePayCardService extends GenericService<PrePayCardDao, PrePayCard,
if
(
isVipGrade
){
//前提是社员
Date
againTime
=
userExt
.
getCommuneAgainTime
();
if
(
enableToRenew
(
againTime
)){
//
if(enableToRenew(againTime)){
//续费当前时间大于上次生效时间半年后算续费
Date
outDate
=
DateUtil
.
addDateField
(
userExt
.
getCommuneAgainTime
(),
Calendar
.
YEAR
,
1
);
if
(
DateUtil
.
getDistinceDay
(
new
Date
(),
outDate
)
<
0
){
...
...
@@ -256,10 +256,10 @@ public class PrePayCardService extends GenericService<PrePayCardDao, PrePayCard,
userExt
.
setCommuneAgainTime
(
DateUtil
.
addDateField
(
outDate
,
Calendar
.
DATE
,
1
));
}
userExt
.
setCommuneYears
(
userExt
.
getCommuneYears
()+
1
);
}
else
{
rightResponse
.
setBody
(
"请不要重复续费,谢谢!"
);
return
rightResponse
;
};
//
}else{
//
rightResponse.setBody("请不要重复续费,谢谢!");
//
return rightResponse;
//
};
}
else
{
rightResponse
.
setBody
(
"您还不是社员,请用社员卡充值!"
);
return
rightResponse
;
...
...
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