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
cfdd6b9c
authored
Nov 06, 2018
by
Huang Linyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2360 -> 2380
parent
635d52cc
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
src/main/java/com/ctrip/fun/golf/dao/user/UserExtDao.java
src/main/java/com/ctrip/fun/golf/service/user/UserService.java
src/main/java/com/ctrip/fun/golf/dao/user/UserExtDao.java
View file @
cfdd6b9c
...
@@ -1295,7 +1295,7 @@ public class UserExtDao extends GenericHibernateDao<UserExt, Integer> {
...
@@ -1295,7 +1295,7 @@ public class UserExtDao extends GenericHibernateDao<UserExt, Integer> {
sql
.
append
(
" LEFT JOIN bsc_userext d ON b.recommendUid = d.UID"
);
sql
.
append
(
" LEFT JOIN bsc_userext d ON b.recommendUid = d.UID"
);
sql
.
append
(
" WHERE a.OrderCategory = 16 "
);
sql
.
append
(
" WHERE a.OrderCategory = 16 "
);
sql
.
append
(
" AND a.ProcessStatus&16=16 AND b.activityId IN ("
+
activityId
+
")"
);
sql
.
append
(
" AND a.ProcessStatus&16=16 AND b.activityId IN ("
+
activityId
+
")"
);
sql
.
append
(
"UNION "
);
sql
.
append
(
"
UNION "
);
sql
.
append
(
" SELECT a.customerMobile,a.saleMobile"
);
sql
.
append
(
" SELECT a.customerMobile,a.saleMobile"
);
sql
.
append
(
" FROM active_customer a WHERE productName = '"
+
productName
+
"' AND a.auditState&128<>128) p"
);
sql
.
append
(
" FROM active_customer a WHERE productName = '"
+
productName
+
"' AND a.auditState&128<>128) p"
);
sql
.
append
(
" LEFT JOIN bsc_userext q ON p.saleMobile =q.bindedmobilePhone"
);
sql
.
append
(
" LEFT JOIN bsc_userext q ON p.saleMobile =q.bindedmobilePhone"
);
...
...
src/main/java/com/ctrip/fun/golf/service/user/UserService.java
View file @
cfdd6b9c
...
@@ -3280,7 +3280,7 @@ public class UserService {
...
@@ -3280,7 +3280,7 @@ public class UserService {
}
}
public
List
<
RecommendRankBean
>
getRankingWys
()
{
public
List
<
RecommendRankBean
>
getRankingWys
()
{
List
<
RecommendRankBean
>
rankingList
=
userExtDao
.
getRankingByActivityId
(
10
,
"23
6
0"
);
List
<
RecommendRankBean
>
rankingList
=
userExtDao
.
getRankingByActivityId
(
10
,
"23
8
0"
);
return
rankingList
;}
return
rankingList
;}
}
}
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