From c497f321bb0dcc7b1e170d7f57f7caf15a60ca70 Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 10 Oct 2025 23:32:36 +0900 Subject: [PATCH] =?UTF-8?q?fix(admin-charge-status-detail):=20pgChargeAmou?= =?UTF-8?q?nt=EC=99=80=20can=EC=9D=98=20=EA=B0=80=EA=B2=A9=EC=9D=84=20?= =?UTF-8?q?=EA=B0=80=EC=A0=B8=EC=99=80=EC=84=9C=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EB=A1=9C=EC=A7=81=EC=9D=84=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0=ED=95=98=EA=B3=A0=20payment=EC=97=90=20=EA=B8=B0?= =?UTF-8?q?=EB=A1=9D=EB=90=9C=20=EA=B0=80=EA=B2=A9=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EA=B3=84=EC=82=B0=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/admin/charge/AdminChargeStatusQueryRepository.kt | 1 - .../sodalive/admin/charge/AdminChargeStatusService.kt | 4 +--- .../sodalive/admin/charge/GetChargeStatusDetailQueryDto.kt | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) 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 )