Compare commits
No commits in common. "e09a59c5b485cde270708533cc8415bec245431f" and "049e65453543e5e0f80e578c2df0ecb744a51a84" have entirely different histories.
e09a59c5b4
...
049e654535
|
@ -6,6 +6,8 @@ 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
|
||||
|
@ -27,15 +29,16 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) {
|
|||
liveRoom.title,
|
||||
liveRoom.price,
|
||||
useCan.canUsage,
|
||||
useCan.id.count(),
|
||||
useCan.can.add(useCan.rewardCan).sum()
|
||||
useCanCalculate.id.count(),
|
||||
useCanCalculate.can.sum()
|
||||
)
|
||||
)
|
||||
.from(useCan)
|
||||
.from(useCanCalculate)
|
||||
.innerJoin(useCanCalculate.useCan, useCan)
|
||||
.innerJoin(useCan.room, liveRoom)
|
||||
.innerJoin(liveRoom.member, member)
|
||||
.where(
|
||||
useCan.isRefund.isFalse
|
||||
useCanCalculate.status.eq(UseCanCalculateStatus.RECEIVED)
|
||||
.and(liveRoom.beginDateTime.goe(startDate))
|
||||
.and(liveRoom.beginDateTime.loe(endDate))
|
||||
)
|
||||
|
@ -59,11 +62,14 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) {
|
|||
order.can.sum()
|
||||
)
|
||||
)
|
||||
.from(order)
|
||||
.from(useCanCalculate)
|
||||
.innerJoin(useCanCalculate.useCan, useCan)
|
||||
.innerJoin(useCan.order, order)
|
||||
.innerJoin(order.audioContent, audioContent)
|
||||
.innerJoin(audioContent.member, member)
|
||||
.where(
|
||||
order.createdAt.goe(startDate)
|
||||
useCanCalculate.status.eq(UseCanCalculateStatus.RECEIVED)
|
||||
.and(order.createdAt.goe(startDate))
|
||||
.and(order.createdAt.loe(endDate))
|
||||
)
|
||||
.groupBy(audioContent.id, order.type, orderFormattedDate, order.can)
|
||||
|
@ -135,11 +141,13 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) {
|
|||
useCan.can.add(useCan.rewardCan).sum()
|
||||
)
|
||||
)
|
||||
.from(useCan)
|
||||
.from(useCanCalculate)
|
||||
.innerJoin(useCanCalculate.useCan, useCan)
|
||||
.innerJoin(useCan.audioContent, audioContent)
|
||||
.innerJoin(audioContent.member, member)
|
||||
.where(
|
||||
useCan.isRefund.isFalse
|
||||
useCanCalculate.status.eq(UseCanCalculateStatus.RECEIVED)
|
||||
.and(useCan.isRefund.isFalse)
|
||||
.and(useCan.canUsage.eq(CanUsage.DONATION))
|
||||
.and(useCan.createdAt.goe(startDate))
|
||||
.and(useCan.createdAt.loe(endDate))
|
||||
|
|
Loading…
Reference in New Issue