From e1ea1f14a5f69a40fc13d7d475a9d0fb598c4daf Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 2 Feb 2024 21:48:11 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EC=A0=95?= =?UTF-8?q?=EC=82=B0=20-=20=ED=95=98=EB=82=98=EC=9D=98=20=EC=BD=98?= =?UTF-8?q?=ED=85=90=EC=B8=A0=EB=A5=BC=20=EA=B5=AC=EB=A7=A4=ED=95=A0=20?= =?UTF-8?q?=EB=95=8C=20PG,=20APPLE=5FIAP=20=EC=99=80=20=EA=B0=99=EC=9D=B4?= =?UTF-8?q?=202=EA=B0=9C=20=EC=9D=B4=EC=83=81=EC=9D=98=20=EB=8B=A4?= =?UTF-8?q?=EB=A5=B8=20=EC=BA=94=EC=9C=BC=EB=A1=9C=20=EA=B2=B0=EC=A0=9C=20?= =?UTF-8?q?=ED=96=88=EC=9D=84=20=EB=95=8C=202=EA=B0=9C=20=EC=9D=B4?= =?UTF-8?q?=EC=83=81=20=EA=B5=AC=EB=A7=A4=EB=90=9C=20=EA=B2=83=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=ED=91=9C=EC=8B=9C=EB=90=98=EB=8A=94=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/calculate/AdminCalculateQueryRepository.kt | 1 + .../calculate/CreatorAdminCalculateQueryRepository.kt | 10 ++++------ 2 files changed, 5 insertions(+), 6 deletions(-) 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 f94b641..2f61759 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 @@ -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()) 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 fb1fc98..2a7dc02 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 @@ -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)