콘텐츠 정산

- 하나의 콘텐츠를 구매할 때 PG, APPLE_IAP 와 같이 2개 이상의 다른 캔으로 결제 했을 때 2개 이상 구매된 것으로 표시되는 버그 수정

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

@@ -65,6 +65,7 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) {
             .where(
                 order.createdAt.goe(startDate)
                     .and(order.createdAt.loe(endDate))
+                    .and(order.isActive.isTrue)
             )
             .groupBy(audioContent.id, order.type, orderFormattedDate, order.can)
             .orderBy(member.id.desc(), orderFormattedDate.desc(), audioContent.id.asc())

src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateQueryRepository.kt

@@ -116,16 +116,14 @@ class CreatorAdminCalculateQueryRepository(private val queryFactory: JPAQueryFac
                     order.can.sum()
                 )
             )
-            .from(useCanCalculate)
-            .innerJoin(useCanCalculate.useCan, useCan)
-            .innerJoin(useCan.order, order)
+            .from(order)
             .innerJoin(order.audioContent, audioContent)
             .innerJoin(audioContent.member, member)
             .where(
-                useCanCalculate.status.eq(UseCanCalculateStatus.RECEIVED)
-                    .and(useCanCalculate.recipientCreatorId.eq(memberId))
-                    .and(order.createdAt.goe(startDate))
+                order.createdAt.goe(startDate)
                     .and(order.createdAt.loe(endDate))
+                    .and(order.isActive.isTrue)
+                    .and(order.creator.id.eq(memberId))
             )
             .groupBy(audioContent.id, order.type, orderFormattedDate, order.can)
             .offset(offset)