Compare commits

..

No commits in common. "f90a93c4bc70397a9168319420797aebe5ccd531" and "8000ad6c6afb81a5f84d0f835cee6b4d9d5f33cb" have entirely different histories.

1 changed files with 5 additions and 14 deletions

View File

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