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
5a3d1e8e
authored
Oct 31, 2017
by
Huang Linyu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'f-6.6.4' of 192.168.10.6:caosy/fun-golf-service into f-6.6.4
parents
7295e11f
ea0482a5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
src/main/java/com/ctrip/fun/golf/service/integral/UserMemberIntegralLogService.java
src/main/java/com/ctrip/fun/golf/service/order/EventActivityOrderService.java
src/main/java/com/ctrip/fun/golf/service/integral/UserMemberIntegralLogService.java
View file @
5a3d1e8e
...
...
@@ -194,7 +194,8 @@ public class UserMemberIntegralLogService extends GenericService<UserMemberInteg
}
public
void
giveWorkPoint
()
{
this
.
giveEventActivityWorkPoint
();
//取消社员参加赛事送公分
//this.giveEventActivityWorkPoint();
}
/**
...
...
src/main/java/com/ctrip/fun/golf/service/order/EventActivityOrderService.java
View file @
5a3d1e8e
...
...
@@ -496,7 +496,7 @@ public class EventActivityOrderService extends
@Override
protected
boolean
beforePlaceOrder
(
EventActivityOrderBean
eventActivityOrderBean
)
{
this
.
checkCommuneIdentity
(
eventActivityOrderBean
);
//
this.checkCommuneIdentity(eventActivityOrderBean);
this
.
checkTotalCashRebate
(
eventActivityOrderBean
);
...
...
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