fix(admin/charge): 통화별 리스트와 합계 행 추가 및 전체 합계 로직 수정

- 기존 로직은 통화 구분 없이 전체 합계를 계산·표시하여 통화가 혼재된 데이터에서 오해의 소지가 있었음.
- 관리 화면 요구사항: 통화(currency)별 합계를 명확히 제공.
This commit is contained in:
2025-10-11 03:12:10 +09:00
parent 38c50a4f8a
commit 778f0c3ba2
3 changed files with 22 additions and 13 deletions

View File

@@ -21,6 +21,7 @@ class AdminChargeStatusController(private val service: AdminChargeStatusService)
@GetMapping("/detail") @GetMapping("/detail")
fun getChargeStatusDetail( fun getChargeStatusDetail(
@RequestParam startDateStr: String, @RequestParam startDateStr: String,
@RequestParam paymentGateway: PaymentGateway @RequestParam paymentGateway: PaymentGateway,
) = ApiResponse.ok(service.getChargeStatusDetail(startDateStr, paymentGateway)) @RequestParam(value = "currency", required = false) currency: String? = null
) = ApiResponse.ok(service.getChargeStatusDetail(startDateStr, paymentGateway, currency))
} }

View File

@@ -1,5 +1,6 @@
package kr.co.vividnext.sodalive.admin.charge package kr.co.vividnext.sodalive.admin.charge
import com.querydsl.core.BooleanBuilder
import com.querydsl.core.types.dsl.Expressions import com.querydsl.core.types.dsl.Expressions
import com.querydsl.jpa.impl.JPAQueryFactory import com.querydsl.jpa.impl.JPAQueryFactory
import kr.co.vividnext.sodalive.can.QCan.can1 import kr.co.vividnext.sodalive.can.QCan.can1
@@ -55,7 +56,8 @@ class AdminChargeStatusQueryRepository(private val queryFactory: JPAQueryFactory
fun getChargeStatusDetail( fun getChargeStatusDetail(
startDate: LocalDateTime, startDate: LocalDateTime,
endDate: LocalDateTime, endDate: LocalDateTime,
paymentGateway: PaymentGateway paymentGateway: PaymentGateway,
currency: String? = null
): List<GetChargeStatusDetailQueryDto> { ): List<GetChargeStatusDetailQueryDto> {
val formattedDate = Expressions.stringTemplate( val formattedDate = Expressions.stringTemplate(
"DATE_FORMAT({0}, {1})", "DATE_FORMAT({0}, {1})",
@@ -68,6 +70,17 @@ class AdminChargeStatusQueryRepository(private val queryFactory: JPAQueryFactory
), ),
"%Y-%m-%d %H:%i:%s" "%Y-%m-%d %H:%i:%s"
) )
val currencyExpr = Expressions.stringTemplate("RIGHT({0}, 3)", payment.locale)
val whereBuilder = BooleanBuilder()
whereBuilder.and(charge.createdAt.goe(startDate))
.and(charge.createdAt.loe(endDate))
.and(charge.status.eq(ChargeStatus.CHARGE))
.and(payment.status.eq(PaymentStatus.COMPLETE))
.and(payment.paymentGateway.eq(paymentGateway))
if (currency != null) {
whereBuilder.and(currencyExpr.eq(currency))
}
return queryFactory return queryFactory
.select( .select(
@@ -76,7 +89,7 @@ class AdminChargeStatusQueryRepository(private val queryFactory: JPAQueryFactory
member.nickname, member.nickname,
payment.method.coalesce(""), payment.method.coalesce(""),
payment.price, payment.price,
payment.locale.coalesce(""), currencyExpr.coalesce(""),
formattedDate formattedDate
) )
) )
@@ -84,13 +97,7 @@ class AdminChargeStatusQueryRepository(private val queryFactory: JPAQueryFactory
.innerJoin(charge.member, member) .innerJoin(charge.member, member)
.innerJoin(charge.payment, payment) .innerJoin(charge.payment, payment)
.leftJoin(charge.can, can1) .leftJoin(charge.can, can1)
.where( .where(whereBuilder)
charge.createdAt.goe(startDate)
.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()) .orderBy(formattedDate.desc())
.fetch() .fetch()
} }

View File

@@ -60,7 +60,8 @@ class AdminChargeStatusService(val repository: AdminChargeStatusQueryRepository)
fun getChargeStatusDetail( fun getChargeStatusDetail(
startDateStr: String, startDateStr: String,
paymentGateway: PaymentGateway paymentGateway: PaymentGateway,
currency: String? = null
): List<GetChargeStatusDetailResponse> { ): List<GetChargeStatusDetailResponse> {
val dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd") val dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
val startDate = LocalDate.parse(startDateStr, dateTimeFormatter).atTime(0, 0, 0) val startDate = LocalDate.parse(startDateStr, dateTimeFormatter).atTime(0, 0, 0)
@@ -73,7 +74,7 @@ class AdminChargeStatusService(val repository: AdminChargeStatusQueryRepository)
.withZoneSameInstant(ZoneId.of("UTC")) .withZoneSameInstant(ZoneId.of("UTC"))
.toLocalDateTime() .toLocalDateTime()
return repository.getChargeStatusDetail(startDate, endDate, paymentGateway) return repository.getChargeStatusDetail(startDate, endDate, paymentGateway, currency)
.map { .map {
GetChargeStatusDetailResponse( GetChargeStatusDetailResponse(
memberId = it.memberId, memberId = it.memberId,