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

Merge pull request '라이브 정산 - 정렬 순서 추가 (라이브 방 id, 구분)' (#100) from test into main 

Reviewed-on: #100
This commit is contained in:
klaus 2023-12-10 16:58:05 +00:00
parent b20c29b022 185d7e6666
commit 0fd1c2235f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,7 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) {
.and(liveRoom.beginDateTime.loe(endDate)) .and(liveRoom.beginDateTime.loe(endDate))
) )
.groupBy(liveRoom.id, useCan.canUsage) .groupBy(liveRoom.id, useCan.canUsage)
.orderBy(member.nickname.desc(), formattedDate.desc()) .orderBy(member.nickname.desc(), liveRoom.id.desc(), useCan.canUsage.desc(), formattedDate.desc())
.fetch() .fetch()
} }

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

@ -66,7 +66,7 @@ class CreatorAdminCalculateQueryRepository(private val queryFactory: JPAQueryFac
.and(liveRoom.beginDateTime.loe(endDate)) .and(liveRoom.beginDateTime.loe(endDate))
) )
.groupBy(liveRoom.id, useCan.canUsage) .groupBy(liveRoom.id, useCan.canUsage)
.orderBy(formattedDate.desc()) .orderBy(liveRoom.id.desc(), useCan.canUsage.desc(), formattedDate.desc())
.fetch() .fetch()
} }