klaus/sodalive-backend-spring-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: klaus:8000ad6c6afb81a5f84d0f835cee6b4d9d5f33cb
Branches Tags
klaus:test klaus:main
..
compare: klaus:f90a93c4bc70397a9168319420797aebe5ccd531
Branches Tags
klaus:test klaus:main

2 Commits
8000ad6c6a ... f90a93c4bc

Author SHA1 Message Date
klaus
f90a93c4bc Merge pull request '후원순위 - 유료라이브 입장 캔 반영' (#35) from test into main 
Reviewed-on: #35
 2023-09-27 14:57:27 +00:00
Klaus
75dbfad3a7 후원순위 - 유료라이브 입장 캔 반영 2023-09-27 23:22:16 +09:00
1 changed files with 14 additions and 5 deletions
Expand all files Collapse all files

19
src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt
View File

@@ -66,7 +66,10 @@ class ExplorerQueryRepository(
.innerJoin(useCanCalculate.useCan, useCan) .innerJoin(useCanCalculate.useCan, useCan)
.where( .where(
useCanCalculate.status.eq(UseCanCalculateStatus.RECEIVED) useCanCalculate.status.eq(UseCanCalculateStatus.RECEIVED)
.and(useCan.canUsage.eq(CanUsage.DONATION)) .and(
useCan.canUsage.eq(CanUsage.DONATION)
.or(useCan.canUsage.eq(CanUsage.LIVE))
)
.and(useCan.isRefund.isFalse) .and(useCan.isRefund.isFalse)
.and(useCanCalculate.recipientCreatorId.eq(creatorId)) .and(useCanCalculate.recipientCreatorId.eq(creatorId))
.and( .and(
@@ -99,9 +102,12 @@ class ExplorerQueryRepository(
.innerJoin(useCanCalculate.useCan, useCan) .innerJoin(useCanCalculate.useCan, useCan)
.innerJoin(useCan.member, userMember) .innerJoin(useCan.member, userMember)
.where( .where(
useCan.canUsage.eq(CanUsage.DONATION) useCan.isRefund.isFalse
.and(useCan.isRefund.isFalse)
.and(useCanCalculate.recipientCreatorId.eq(creatorId)) .and(useCanCalculate.recipientCreatorId.eq(creatorId))
.and(
useCan.canUsage.eq(CanUsage.DONATION)
.or(useCan.canUsage.eq(CanUsage.LIVE))
)
) )
.groupBy(useCan.member.id) .groupBy(useCan.member.id)
.orderBy(donation.desc()) .orderBy(donation.desc())
@@ -126,9 +132,12 @@ class ExplorerQueryRepository(
.offset(offset) .offset(offset)
.limit(limit) .limit(limit)
.where( .where(
useCan.canUsage.eq(CanUsage.DONATION) useCan.isRefund.isFalse
.and(useCan.isRefund.isFalse)
.and(useCanCalculate.recipientCreatorId.eq(creatorId)) .and(useCanCalculate.recipientCreatorId.eq(creatorId))
.and(
useCan.canUsage.eq(CanUsage.DONATION)
.or(useCan.canUsage.eq(CanUsage.LIVE))
)
) )
.groupBy(useCan.member.id) .groupBy(useCan.member.id)
.orderBy(donation.desc(), member.id.desc()) .orderBy(donation.desc(), member.id.desc())