관리자 콘텐츠 후원 정산 - 캔을 한 번 사용했는데 여러개의 PG로 결제한 캔이 사용될 때 생기는 오차수정

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()
     }