diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusQueryRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusQueryRepository.kt index fbdb575..f1ec63c 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusQueryRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusQueryRepository.kt @@ -74,7 +74,6 @@ class AdminChargeStatusQueryRepository(private val queryFactory: JPAQueryFactory member.nickname, payment.method.coalesce(""), payment.price, - can1.price, payment.locale.coalesce(""), formattedDate ) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusService.kt index b82321e..f1b5e7e 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusService.kt @@ -69,17 +69,15 @@ class AdminChargeStatusService(val repository: AdminChargeStatusQueryRepository) .toLocalDateTime() return repository.getChargeStatusDetail(startDate, endDate, paymentGateway) - .asSequence() .map { GetChargeStatusDetailResponse( memberId = it.memberId, nickname = it.nickname, method = it.method, - amount = it.appleChargeAmount.toInt(), + amount = it.amount.toInt(), locale = it.locale, datetime = it.datetime ) } - .toList() } } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailQueryDto.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailQueryDto.kt index 3164e91..260c538 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailQueryDto.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailQueryDto.kt @@ -7,8 +7,7 @@ data class GetChargeStatusDetailQueryDto @QueryProjection constructor( val memberId: Long, val nickname: String, val method: String, - val appleChargeAmount: BigDecimal, - val pgChargeAmount: BigDecimal, + val amount: BigDecimal, val locale: String, val datetime: String )