From 68c2b505bbe91b4731f74e92d0ac37ac27974dfe Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 14 Nov 2023 18:54:17 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=9D=BC?= =?UTF-8?q?=EC=9E=90=EB=B3=84=20=EC=BD=98=ED=85=90=EC=B8=A0=20=ED=9B=84?= =?UTF-8?q?=EC=9B=90=20=EC=A0=95=EC=82=B0=20-=20=EC=BA=94=EC=9D=84=20?= =?UTF-8?q?=ED=95=9C=20=EB=B2=88=20=EC=82=AC=EC=9A=A9=ED=96=88=EB=8A=94?= =?UTF-8?q?=EB=8D=B0=20=EC=97=AC=EB=9F=AC=EA=B0=9C=EC=9D=98=20PG=EB=A1=9C?= =?UTF-8?q?=20=EA=B2=B0=EC=A0=9C=ED=95=9C=20=EC=BA=94=EC=9D=B4=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EB=90=A0=20=EB=95=8C=20=EC=83=9D=EA=B8=B0=EB=8A=94=20?= =?UTF-8?q?=EC=98=A4=EC=B0=A8=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/admin/calculate/AdminCalculateQueryRepository.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 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 3fa0582..2a6a97d 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 @@ -138,7 +138,7 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) { getFormattedDate(audioContent.createdAt), donationFormattedDate, useCan.id.count(), - useCan.can.add(useCan.rewardCan).sum() + useCanCalculate.can.sum() ) ) .from(useCanCalculate) @@ -152,7 +152,7 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) { .and(useCan.createdAt.goe(startDate)) .and(useCan.createdAt.loe(endDate)) ) - .groupBy(donationFormattedDate, audioContent.id) + .groupBy(donationFormattedDate, audioContent.id, useCan.id) .orderBy(member.id.asc(), donationFormattedDate.desc()) .fetch() } From 04314c6256e54cba38a085bd68954b033f314374 Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 14 Nov 2023 19:09:49 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=BD=98?= =?UTF-8?q?=ED=85=90=EC=B8=A0=20=ED=9B=84=EC=9B=90=20=EC=A0=95=EC=82=B0=20?= =?UTF-8?q?-=20=EC=BA=94=EC=9D=84=20=ED=95=9C=20=EB=B2=88=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=ED=96=88=EB=8A=94=EB=8D=B0=20=EC=97=AC=EB=9F=AC?= =?UTF-8?q?=EA=B0=9C=EC=9D=98=20PG=EB=A1=9C=20=EA=B2=B0=EC=A0=9C=ED=95=9C?= =?UTF-8?q?=20=EC=BA=94=EC=9D=B4=20=EC=82=AC=EC=9A=A9=EB=90=A0=20=EB=95=8C?= =?UTF-8?q?=20=EC=83=9D=EA=B8=B0=EB=8A=94=20=EC=98=A4=EC=B0=A8=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/calculate/AdminCalculateQueryRepository.kt | 10 ++++------ 1 file changed, 4 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 2a6a97d..933b4ab 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 @@ -138,21 +138,19 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) { getFormattedDate(audioContent.createdAt), donationFormattedDate, useCan.id.count(), - useCanCalculate.can.sum() + 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)) ) - .groupBy(donationFormattedDate, audioContent.id, useCan.id) + .groupBy(donationFormattedDate, audioContent.id) .orderBy(member.id.asc(), donationFormattedDate.desc()) .fetch() } From 8d32f1b3bd63c8bb8706eb1b4b34dddce0e29f86 Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 14 Nov 2023 19:12:10 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=BD=98?= =?UTF-8?q?=ED=85=90=EC=B8=A0=20=EC=A0=95=EC=82=B0,=20=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=EB=B8=8C=20=EC=A0=95=EC=82=B0=20-=20=EC=BA=94=EC=9D=84=20?= =?UTF-8?q?=ED=95=9C=20=EB=B2=88=20=EC=82=AC=EC=9A=A9=ED=96=88=EB=8A=94?= =?UTF-8?q?=EB=8D=B0=20=EC=97=AC=EB=9F=AC=EA=B0=9C=EC=9D=98=20PG=EB=A1=9C?= =?UTF-8?q?=20=EA=B2=B0=EC=A0=9C=ED=95=9C=20=EC=BA=94=EC=9D=B4=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EB=90=A0=20=EB=95=8C=20=EC=83=9D=EA=B8=B0=EB=8A=94=20?= =?UTF-8?q?=EC=98=A4=EC=B0=A8=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../calculate/AdminCalculateQueryRepository.kt | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 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 933b4ab..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)