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
1da211f6
authored
Oct 09, 2018
by
chongli
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'f-6.6.9' of 192.168.10.6:caosy/fun-golf-service into f-6.6.9
parents
4dbaf5fe
58f1c97e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
49 additions
and
13 deletions
src/main/java/com/ctrip/fun/golf/dao/user/UserExtDao.java
src/main/java/com/ctrip/fun/golf/service/user/UserService.java
src/test/java/com/ctrip/fun/golf/dao/user/UserExtDaoTest.java
src/main/java/com/ctrip/fun/golf/dao/user/UserExtDao.java
View file @
1da211f6
...
...
@@ -1225,15 +1225,21 @@ public class UserExtDao extends GenericHibernateDao<UserExt, Integer> {
return
query
.
executeUpdate
();
}
public
List
<
RecommendRankBean
>
getRanking
(
Integer
activityId
)
{
String
sql
=
" SELECT b.recommendUid inviterUid,d.UserName as inviterUserName,COUNT(*) AS myNum1 FROM ord_order a "
+
" LEFT JOIN ord_communeitem b ON a.OrderID = b.OrderID"
+
" LEFT JOIN bsc_userext d ON d.uid = b.recommendUid"
+
" WHERE a.OrderCategory = 16 "
+
" AND a.ProcessStatus&16=16 AND b.activityId = "
+
activityId
+
" GROUP BY b.recommendUid ORDER BY myNum1 DESC"
+
""
;
Query
query
=
getSession
().
createSQLQuery
(
sql
)
public
List
<
RecommendRankBean
>
getRanking
(
Integer
[]
activityIds
)
{
StringBuffer
sql
=
new
StringBuffer
(
""
);
sql
.
append
(
" SELECT b.recommendUid inviterUid,d.UserName as inviterUserName,COUNT(*) AS myNum1 FROM ord_order a "
);
sql
.
append
(
" LEFT JOIN ord_communeitem b ON a.OrderID = b.OrderID "
);
sql
.
append
(
" LEFT JOIN bsc_userext d ON d.uid = b.recommendUid "
);
sql
.
append
(
" WHERE a.OrderCategory = 16 "
);
sql
.
append
(
" AND a.ProcessStatus&16=16 AND b.activityId in ("
);
for
(
Integer
id
:
activityIds
){
sql
.
append
(
id
+
","
);
}
sql
.
setLength
(
sql
.
length
()-
1
);
sql
.
append
(
" ) "
);
sql
.
append
(
" GROUP BY b.recommendUid ORDER BY myNum1 DESC "
);
Query
query
=
getSession
().
createSQLQuery
(
sql
.
toString
())
.
addScalar
(
"inviterUid"
,
StandardBasicTypes
.
STRING
)
.
addScalar
(
"inviterUserName"
,
StandardBasicTypes
.
STRING
)
.
addScalar
(
"myNum1"
,
StandardBasicTypes
.
INTEGER
)
...
...
src/main/java/com/ctrip/fun/golf/service/user/UserService.java
View file @
1da211f6
...
...
@@ -1639,9 +1639,9 @@ public class UserService {
* 当前uid大多数等于bindedmobilePhone,新增加的社员都是uid等于手机号码, 所以更改优先使用手机号码查询用户信息
*/
public
UserBean
getUserDetail
(
UserQuery
userQuery
)
{
UserExt
userExt
=
this
.
userExtDao
.
getUserExtInfoByUid
(
userQuery
.
getUid
());
UserExt
userExt
=
this
.
userExtDao
.
GetUserExtInfoByPhone
(
userQuery
.
getUid
());
if
(
userExt
==
null
)
{
userExt
=
this
.
userExtDao
.
GetUserExtInfoByPhone
(
userQuery
.
getUid
());
userExt
=
this
.
userExtDao
.
getUserExtInfoByUid
(
userQuery
.
getUid
());
}
if
(
userExt
==
null
)
{
return
null
;
...
...
@@ -3239,14 +3239,16 @@ public class UserService {
}
public
List
<
RecommendRankBean
>
getRanking
()
{
List
<
RecommendRankBean
>
rankingList
=
userExtDao
.
getRanking
(
3
);
Integer
activitys
[]
=
{
3
};
List
<
RecommendRankBean
>
rankingList
=
userExtDao
.
getRanking
(
activitys
);
return
rankingList
;
}
public
List
<
RecommendRankBean
>
getRankingXiehe
()
{
List
<
RecommendRankBean
>
rankingList
=
userExtDao
.
getRanking
(
5
);
Integer
activitys
[]
=
{
5
,
6
};
List
<
RecommendRankBean
>
rankingList
=
userExtDao
.
getRanking
(
activitys
);
return
rankingList
;
}
...
...
src/test/java/com/ctrip/fun/golf/dao/user/UserExtDaoTest.java
0 → 100644
View file @
1da211f6
package
com
.
ctrip
.
fun
.
golf
.
dao
.
user
;
import
java.util.List
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.test.context.ContextConfiguration
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
com.ctrip.fun.common.vo.user.RecommendRankBean
;
@RunWith
(
SpringJUnit4ClassRunner
.
class
)
@ContextConfiguration
(
locations
={
"classpath*:*.spring.xml"
})
public
class
UserExtDaoTest
{
@Autowired
private
UserExtDao
userExtDao
;
@Test
public
void
testGetRanking
()
{
Integer
[]
activityIds
=
{
5
,
6
};
List
<
RecommendRankBean
>
rankBeanList
=
userExtDao
.
getRanking
(
activityIds
);
System
.
out
.
println
(
"ssss"
);
}
}
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