크리에이터 관리자 라이브 정산

- 인 앱 결제 캔과 pg 결제 캔을 동시에 사용된 경우 결제 건 수가 2배로 잡히는 버그 수정

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

@@ -14,8 +14,6 @@ import kr.co.vividnext.sodalive.admin.calculate.QGetCalculateLiveQueryData
 import kr.co.vividnext.sodalive.admin.calculate.QGetCumulativeSalesByContentQueryData
 import kr.co.vividnext.sodalive.can.use.CanUsage
 import kr.co.vividnext.sodalive.can.use.QUseCan.useCan
-import kr.co.vividnext.sodalive.can.use.QUseCanCalculate.useCanCalculate
-import kr.co.vividnext.sodalive.can.use.UseCanCalculateStatus
 import kr.co.vividnext.sodalive.content.QAudioContent.audioContent
 import kr.co.vividnext.sodalive.content.order.QOrder.order
 import kr.co.vividnext.sodalive.live.room.QLiveRoom.liveRoom
@@ -51,17 +49,15 @@ class CreatorAdminCalculateQueryRepository(private val queryFactory: JPAQueryFac
                     liveRoom.title,
                     liveRoom.price,
                     useCan.canUsage,
-                    useCanCalculate.id.count(),
-                    useCanCalculate.can.sum()
+                    useCan.id.count(),
+                    useCan.can.add(useCan.rewardCan).sum()
                 )
             )
-            .from(useCanCalculate)
-            .innerJoin(useCanCalculate.useCan, useCan)
+            .from(useCan)
             .innerJoin(useCan.room, liveRoom)
             .innerJoin(liveRoom.member, member)
             .where(
-                useCanCalculate.status.eq(UseCanCalculateStatus.RECEIVED)
-                    .and(useCanCalculate.recipientCreatorId.eq(memberId))
+                useCan.isRefund.isFalse
                     .and(liveRoom.beginDateTime.goe(startDate))
                     .and(liveRoom.beginDateTime.loe(endDate))
             )
@@ -78,16 +74,14 @@ class CreatorAdminCalculateQueryRepository(private val queryFactory: JPAQueryFac
         val orderFormattedDate = getFormattedDate(order.createdAt)
         return queryFactory
             .select(audioContent.id)
-            .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)
             .orderBy(member.id.desc(), orderFormattedDate.desc(), audioContent.id.asc())