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 )