test #197

Merged
klaus merged 12 commits from test into main 2024-07-08 14:17:42 +00:00
1 changed files with 12 additions and 0 deletions
Showing only changes of commit a9d74605af - Show all commits

View File

@ -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)