From d33ed42853c7d0d1560f548bb58d62133f2d64ac Mon Sep 17 00:00:00 2001 From: Klaus Date: Wed, 3 Apr 2024 12:39:26 +0900 Subject: [PATCH] =?UTF-8?q?=ED=81=AC=EB=A6=AC=EC=97=90=EC=9D=B4=ED=84=B0?= =?UTF-8?q?=20=EA=B4=80=EB=A6=AC=EC=9E=90=20=EB=9D=BC=EC=9D=B4=EB=B8=8C=20?= =?UTF-8?q?=EC=A0=95=EC=82=B0=20-=20=EC=9D=B8=20=EC=95=B1=20=EA=B2=B0?= =?UTF-8?q?=EC=A0=9C=20=EC=BA=94=EA=B3=BC=20pg=20=EA=B2=B0=EC=A0=9C=20?= =?UTF-8?q?=EC=BA=94=EC=9D=84=20=EB=8F=99=EC=8B=9C=EC=97=90=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EB=90=9C=20=EA=B2=BD=EC=9A=B0=20=EA=B2=B0=EC=A0=9C=20?= =?UTF-8?q?=EA=B1=B4=20=EC=88=98=EA=B0=80=202=EB=B0=B0=EB=A1=9C=20?= =?UTF-8?q?=EC=9E=A1=ED=9E=88=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreatorAdminCalculateQueryRepository.kt | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateQueryRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateQueryRepository.kt index 2a7dc02..ef91a4f 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateQueryRepository.kt +++ b/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())