Compare commits
No commits in common. "5e491f11ee1f0be2ef20bfc194b31f6ae6d27eac" and "7cedea06ac5da92045b7807fb0100b84cbf01f15" have entirely different histories.
5e491f11ee
...
7cedea06ac
|
@ -14,6 +14,8 @@ import kr.co.vividnext.sodalive.admin.calculate.QGetCalculateLiveQueryData
|
|||
import kr.co.vividnext.sodalive.admin.calculate.QGetCumulativeSalesByContentQueryData
|
||||
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
|
||||
|
@ -49,15 +51,17 @@ class CreatorAdminCalculateQueryRepository(private val queryFactory: JPAQueryFac
|
|||
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(useCanCalculate.recipientCreatorId.eq(memberId))
|
||||
.and(liveRoom.beginDateTime.goe(startDate))
|
||||
.and(liveRoom.beginDateTime.loe(endDate))
|
||||
)
|
||||
|
@ -74,14 +78,16 @@ class CreatorAdminCalculateQueryRepository(private val queryFactory: JPAQueryFac
|
|||
val orderFormattedDate = getFormattedDate(order.createdAt)
|
||||
return queryFactory
|
||||
.select(audioContent.id)
|
||||
.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(useCanCalculate.recipientCreatorId.eq(memberId))
|
||||
.and(order.createdAt.goe(startDate))
|
||||
.and(order.createdAt.loe(endDate))
|
||||
.and(order.isActive.isTrue)
|
||||
.and(order.creator.id.eq(memberId))
|
||||
)
|
||||
.groupBy(audioContent.id, order.type, orderFormattedDate, order.can)
|
||||
.orderBy(member.id.desc(), orderFormattedDate.desc(), audioContent.id.asc())
|
||||
|
|
Loading…
Reference in New Issue