klaus
/
sodalive-backend-spring-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: klaus:8d32f1b3bd63c8bb8706eb1b4b34dddce0e29f86
Branches Tags
klaus:test
klaus:main
..
compare: klaus:9448c6a48857ea450a376fb5fc03a5b6dfe8d788
Branches Tags
klaus:main
klaus:test

No commits in common. "8d32f1b3bd63c8bb8706eb1b4b34dddce0e29f86" and "9448c6a48857ea450a376fb5fc03a5b6dfe8d788" have entirely different histories.
8d32f1b3bd ... 9448c6a488

1 changed files with 16 additions and 8 deletions
Show Stats Expand all files Collapse all files

24
src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateQueryRepository.kt
View File

@ -6,6 +6,8 @@ import com.querydsl.core.types.dsl.StringTemplate
import com.querydsl.jpa.impl.JPAQueryFactory import com.querydsl.jpa.impl.JPAQueryFactory
import kr.co.vividnext.sodalive.can.use.CanUsage import kr.co.vividnext.sodalive.can.use.CanUsage
import kr.co.vividnext.sodalive.can.use.QUseCan.useCan 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.QAudioContent.audioContent
import kr.co.vividnext.sodalive.content.order.QOrder.order import kr.co.vividnext.sodalive.content.order.QOrder.order
import kr.co.vividnext.sodalive.live.room.QLiveRoom.liveRoom import kr.co.vividnext.sodalive.live.room.QLiveRoom.liveRoom
@ -27,15 +29,16 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) {
liveRoom.title, liveRoom.title,
liveRoom.price, liveRoom.price,
useCan.canUsage, useCan.canUsage,
useCan.id.count(), useCanCalculate.id.count(),
useCan.can.add(useCan.rewardCan).sum() useCanCalculate.can.sum()
) )
) )
.from(useCan) .from(useCanCalculate)
.innerJoin(useCanCalculate.useCan, useCan)
.innerJoin(useCan.room, liveRoom) .innerJoin(useCan.room, liveRoom)
.innerJoin(liveRoom.member, member) .innerJoin(liveRoom.member, member)
.where( .where(
useCan.isRefund.isFalse useCanCalculate.status.eq(UseCanCalculateStatus.RECEIVED)
.and(liveRoom.beginDateTime.goe(startDate)) .and(liveRoom.beginDateTime.goe(startDate))
.and(liveRoom.beginDateTime.loe(endDate)) .and(liveRoom.beginDateTime.loe(endDate))
) )
@ -59,11 +62,14 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) {
order.can.sum() order.can.sum()
) )
) )
.from(order) .from(useCanCalculate)
.innerJoin(useCanCalculate.useCan, useCan)
.innerJoin(useCan.order, order)
.innerJoin(order.audioContent, audioContent) .innerJoin(order.audioContent, audioContent)
.innerJoin(audioContent.member, member) .innerJoin(audioContent.member, member)
.where( .where(
order.createdAt.goe(startDate) useCanCalculate.status.eq(UseCanCalculateStatus.RECEIVED)
.and(order.createdAt.goe(startDate))
.and(order.createdAt.loe(endDate)) .and(order.createdAt.loe(endDate))
) )
.groupBy(audioContent.id, order.type, orderFormattedDate, order.can) .groupBy(audioContent.id, order.type, orderFormattedDate, order.can)
@ -135,11 +141,13 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) {
useCan.can.add(useCan.rewardCan).sum() useCan.can.add(useCan.rewardCan).sum()
) )
) )
.from(useCan) .from(useCanCalculate)
.innerJoin(useCanCalculate.useCan, useCan)
.innerJoin(useCan.audioContent, audioContent) .innerJoin(useCan.audioContent, audioContent)
.innerJoin(audioContent.member, member) .innerJoin(audioContent.member, member)
.where( .where(
useCan.isRefund.isFalse useCanCalculate.status.eq(UseCanCalculateStatus.RECEIVED)
.and(useCan.isRefund.isFalse)
.and(useCan.canUsage.eq(CanUsage.DONATION)) .and(useCan.canUsage.eq(CanUsage.DONATION))
.and(useCan.createdAt.goe(startDate)) .and(useCan.createdAt.goe(startDate))
.and(useCan.createdAt.loe(endDate)) .and(useCan.createdAt.loe(endDate))