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

Reviewed-on: #100

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

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

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

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