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 3fa0582..2a6a97d 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,7 +138,7 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) { getFormattedDate(audioContent.createdAt), donationFormattedDate, useCan.id.count(), - useCan.can.add(useCan.rewardCan).sum() + useCanCalculate.can.sum() ) ) .from(useCanCalculate) @@ -152,7 +152,7 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) { .and(useCan.createdAt.goe(startDate)) .and(useCan.createdAt.loe(endDate)) ) - .groupBy(donationFormattedDate, audioContent.id) + .groupBy(donationFormattedDate, audioContent.id, useCan.id) .orderBy(member.id.asc(), donationFormattedDate.desc()) .fetch() }