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 cf2f704..54e57f0 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 @@ -5,6 +5,7 @@ import com.querydsl.jpa.impl.JPAQueryFactory import kr.co.vividnext.sodalive.can.QCan.can1 import kr.co.vividnext.sodalive.can.charge.ChargeStatus import kr.co.vividnext.sodalive.can.charge.QCharge.charge +import kr.co.vividnext.sodalive.can.payment.PaymentGateway import kr.co.vividnext.sodalive.can.payment.PaymentStatus import kr.co.vividnext.sodalive.can.payment.QPayment.payment import kr.co.vividnext.sodalive.member.QMember.member @@ -50,7 +51,11 @@ class AdminChargeStatusQueryRepository(private val queryFactory: JPAQueryFactory .fetch() } - fun getChargeStatusDetail(startDate: LocalDateTime, endDate: LocalDateTime): List { + fun getChargeStatusDetail( + startDate: LocalDateTime, + endDate: LocalDateTime, + paymentGateway: PaymentGateway + ): List { val formattedDate = Expressions.stringTemplate( "DATE_FORMAT({0}, {1})", Expressions.dateTimeTemplate( @@ -83,6 +88,7 @@ class AdminChargeStatusQueryRepository(private val queryFactory: JPAQueryFactory .and(charge.createdAt.loe(endDate)) .and(charge.status.eq(ChargeStatus.CHARGE)) .and(payment.status.eq(PaymentStatus.COMPLETE)) + .and(payment.paymentGateway.eq(paymentGateway)) ) .orderBy(formattedDate.desc()) .fetch() 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 811e4bd..9b450fb 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 @@ -74,25 +74,14 @@ class AdminChargeStatusService(val repository: AdminChargeStatusQueryRepository) .withZoneSameInstant(ZoneId.of("UTC")) .toLocalDateTime() - return repository.getChargeStatusDetail(startDate, endDate) + return repository.getChargeStatusDetail(startDate, endDate, paymentGateway) .asSequence() - .filter { - if (paymentGateway == PaymentGateway.APPLE_IAP) { - it.appleChargeAmount > 0 - } else { - it.pgChargeAmount > 0 - } - } .map { GetChargeStatusDetailResponse( memberId = it.memberId, nickname = it.nickname, method = it.method, - amount = if (paymentGateway == PaymentGateway.APPLE_IAP) { - it.appleChargeAmount.toInt() - } else { - it.pgChargeAmount - }, + amount = it.appleChargeAmount.toInt(), datetime = it.datetime ) }