diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateQueryRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateQueryRepository.kt index 2a6a97d..933b4ab 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateQueryRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateQueryRepository.kt @@ -138,21 +138,19 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) { getFormattedDate(audioContent.createdAt), donationFormattedDate, useCan.id.count(), - useCanCalculate.can.sum() + useCan.can.add(useCan.rewardCan).sum() ) ) - .from(useCanCalculate) - .innerJoin(useCanCalculate.useCan, useCan) + .from(useCan) .innerJoin(useCan.audioContent, audioContent) .innerJoin(audioContent.member, member) .where( - useCanCalculate.status.eq(UseCanCalculateStatus.RECEIVED) - .and(useCan.isRefund.isFalse) + useCan.isRefund.isFalse .and(useCan.canUsage.eq(CanUsage.DONATION)) .and(useCan.createdAt.goe(startDate)) .and(useCan.createdAt.loe(endDate)) ) - .groupBy(donationFormattedDate, audioContent.id, useCan.id) + .groupBy(donationFormattedDate, audioContent.id) .orderBy(member.id.asc(), donationFormattedDate.desc()) .fetch() }