From 84c0768c8b7052c1e8c7292750e18f1f754c1170 Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Fri, 10 Oct 2025 22:31:36 +0900
Subject: [PATCH] =?UTF-8?q?fix(admin-charge-status):=20pgChargeAmount?=
 =?UTF-8?q?=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

---
 .../admin/charge/AdminChargeStatusQueryRepository.kt       | 1 -
 .../sodalive/admin/charge/AdminChargeStatusService.kt      | 7 +------
 .../sodalive/admin/charge/GetChargeStatusQueryDto.kt       | 3 +--
 3 files changed, 2 insertions(+), 9 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 dc61d83..fbdb575 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
@@ -32,7 +32,6 @@ class AdminChargeStatusQueryRepository(private val queryFactory: JPAQueryFactory
                 QGetChargeStatusQueryDto(
                     formattedDate,
                     payment.price.sum(),
-                    can1.price.sum(),
                     payment.id.count(),
                     payment.paymentGateway
                 )
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 cc6d4ca..b82321e 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
@@ -25,12 +25,7 @@ class AdminChargeStatusService(val repository: AdminChargeStatusQueryRepository)
 
         val chargeStatusList = repository.getChargeStatus(startDate, endDate)
             .map {
-                val chargeAmount = if (it.paymentGateWay == PaymentGateway.PG) {
-                    it.pgChargeAmount
-                } else {
-                    it.appleChargeAmount
-                }
-
+                val chargeAmount = it.amount
                 val chargeCount = it.chargeCount
 
                 totalChargeAmount += chargeAmount
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusQueryDto.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusQueryDto.kt
index 5d4c6a4..22bdd4c 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusQueryDto.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusQueryDto.kt
@@ -6,8 +6,7 @@ import java.math.BigDecimal
 
 data class GetChargeStatusQueryDto @QueryProjection constructor(
     val date: String,
-    val appleChargeAmount: BigDecimal,
-    val pgChargeAmount: BigDecimal,
+    val amount: BigDecimal,
     val chargeCount: Long,
     val paymentGateWay: PaymentGateway
 )