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

Merge pull request '크리에이터 관리자 라이브 정산' (#158) from test into main 

Reviewed-on: #158
This commit is contained in:
klaus 2024-04-03 03:45:31 +00:00
parent 7cedea06ac d33ed42853
commit 5e491f11ee
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateQueryRepository.kt
View File

@ -14,8 +14,6 @@ import kr.co.vividnext.sodalive.admin.calculate.QGetCalculateLiveQueryData
import kr.co.vividnext.sodalive.admin.calculate.QGetCumulativeSalesByContentQueryData import kr.co.vividnext.sodalive.admin.calculate.QGetCumulativeSalesByContentQueryData
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
@ -51,17 +49,15 @@ class CreatorAdminCalculateQueryRepository(private val queryFactory: JPAQueryFac
liveRoom.title, liveRoom.title,
liveRoom.price, liveRoom.price,
useCan.canUsage, useCan.canUsage,
useCanCalculate.id.count(), useCan.id.count(),
useCanCalculate.can.sum() useCan.can.add(useCan.rewardCan).sum()
) )
) )
.from(useCanCalculate) .from(useCan)
.innerJoin(useCanCalculate.useCan, useCan)
.innerJoin(useCan.room, liveRoom) .innerJoin(useCan.room, liveRoom)
.innerJoin(liveRoom.member, member) .innerJoin(liveRoom.member, member)
.where( .where(
useCanCalculate.status.eq(UseCanCalculateStatus.RECEIVED) useCan.isRefund.isFalse
.and(useCanCalculate.recipientCreatorId.eq(memberId))
.and(liveRoom.beginDateTime.goe(startDate)) .and(liveRoom.beginDateTime.goe(startDate))
.and(liveRoom.beginDateTime.loe(endDate)) .and(liveRoom.beginDateTime.loe(endDate))
) )
@ -78,16 +74,14 @@ class CreatorAdminCalculateQueryRepository(private val queryFactory: JPAQueryFac
val orderFormattedDate = getFormattedDate(order.createdAt) val orderFormattedDate = getFormattedDate(order.createdAt)
return queryFactory return queryFactory
.select(audioContent.id) .select(audioContent.id)
.from(useCanCalculate) .from(order)
.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(
useCanCalculate.status.eq(UseCanCalculateStatus.RECEIVED) order.createdAt.goe(startDate)
.and(useCanCalculate.recipientCreatorId.eq(memberId))
.and(order.createdAt.goe(startDate))
.and(order.createdAt.loe(endDate)) .and(order.createdAt.loe(endDate))
.and(order.isActive.isTrue)
.and(order.creator.id.eq(memberId))
) )
.groupBy(audioContent.id, order.type, orderFormattedDate, order.can) .groupBy(audioContent.id, order.type, orderFormattedDate, order.can)
.orderBy(member.id.desc(), orderFormattedDate.desc(), audioContent.id.asc()) .orderBy(member.id.desc(), orderFormattedDate.desc(), audioContent.id.asc())