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

test #88

Merged
klaus merged 3 commits from test into main 2023-11-14 11:09:14 +00:00
Conversation 0 Commits 3 Files Changed 1 +4 -6
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 04314c6256 - Show all commits

10
src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateQueryRepository.kt
View File

@@ -138,21 +138,19 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) {
getFormattedDate(audioContent.createdAt), getFormattedDate(audioContent.createdAt),
donationFormattedDate, donationFormattedDate,
useCan.id.count(), useCan.id.count(),
useCanCalculate.can.sum() useCan.can.add(useCan.rewardCan).sum()
) )
) )
.from(useCanCalculate) .from(useCan)
.innerJoin(useCanCalculate.useCan, useCan)
.innerJoin(useCan.audioContent, audioContent) .innerJoin(useCan.audioContent, audioContent)
.innerJoin(audioContent.member, member) .innerJoin(audioContent.member, member)
.where( .where(
useCanCalculate.status.eq(UseCanCalculateStatus.RECEIVED) useCan.isRefund.isFalse
.and(useCan.isRefund.isFalse)
.and(useCan.canUsage.eq(CanUsage.DONATION)) .and(useCan.canUsage.eq(CanUsage.DONATION))
.and(useCan.createdAt.goe(startDate)) .and(useCan.createdAt.goe(startDate))
.and(useCan.createdAt.loe(endDate)) .and(useCan.createdAt.loe(endDate))
) )
.groupBy(donationFormattedDate, audioContent.id, useCan.id) .groupBy(donationFormattedDate, audioContent.id)
.orderBy(member.id.asc(), donationFormattedDate.desc()) .orderBy(member.id.asc(), donationFormattedDate.desc())
.fetch() .fetch()
} }