From a9d74605af24ff3ff96c7b43e2b88d728a1bad4e Mon Sep 17 00:00:00 2001 From: Klaus Date: Mon, 8 Jul 2024 14:04:52 +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=B8=B0=EC=A4=80=20=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=ED=95=A9?= =?UTF-8?q?=EA=B3=84=20=EC=A0=95=EC=82=B0=20API=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/calculate/AdminCalculateQueryRepository.kt | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 b0155e7..8c01312 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 @@ -233,6 +233,12 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) { .innerJoin(liveRoom.member, member) .leftJoin(creatorSettlementRatio) .on(member.id.eq(creatorSettlementRatio.member.id)) + .where( + useCan.isRefund.isFalse + .and(useCan.canUsage.eq(CanUsage.LIVE)) + .and(useCan.createdAt.goe(startDate)) + .and(useCan.createdAt.loe(endDate)) + ) .groupBy(member.id) .fetch() .size @@ -258,6 +264,12 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) { .innerJoin(liveRoom.member, member) .leftJoin(creatorSettlementRatio) .on(member.id.eq(creatorSettlementRatio.member.id)) + .where( + useCan.isRefund.isFalse + .and(useCan.canUsage.eq(CanUsage.LIVE)) + .and(useCan.createdAt.goe(startDate)) + .and(useCan.createdAt.loe(endDate)) + ) .groupBy(member.id, creatorSettlementRatio.liveSettlementRatio) .orderBy(member.id.desc()) .offset(offset)