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..9c5b12d 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 @@ -6,8 +6,6 @@ import com.querydsl.core.types.dsl.StringTemplate import com.querydsl.jpa.impl.JPAQueryFactory 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 @@ -29,16 +27,15 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) { 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) + useCan.isRefund.isFalse .and(liveRoom.beginDateTime.goe(startDate)) .and(liveRoom.beginDateTime.loe(endDate)) ) @@ -62,14 +59,11 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) { 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(order.createdAt.goe(startDate)) + order.createdAt.goe(startDate) .and(order.createdAt.loe(endDate)) ) .groupBy(audioContent.id, order.type, orderFormattedDate, order.can) @@ -141,13 +135,11 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) { 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))