Compare commits

..

2 Commits

Author SHA1 Message Date
klaus d3222ce083 Merge pull request '관리자 캔 충전현황' (#146) from test into main
Reviewed-on: #146
2024-03-21 15:56:02 +00:00
Klaus 71dffc4c0b 관리자 캔 충전현황
- 충전금액 표시 로직 수정
- PG일 떄 can 테이블에 표시된 가격을 가져오고 나머지는 payment 테이블에 있는 가격을 가져오도록 수정
2024-03-22 00:49:46 +09:00
1 changed files with 3 additions and 3 deletions

View File

@ -26,10 +26,10 @@ class AdminChargeStatusService(val repository: AdminChargeStatusQueryRepository)
val chargeStatusList = repository.getChargeStatus(startDate, endDate)
.asSequence()
.map {
val chargeAmount = if (it.paymentGateWay == PaymentGateway.APPLE_IAP) {
it.appleChargeAmount.toInt()
} else {
val chargeAmount = if (it.paymentGateWay == PaymentGateway.PG) {
it.pgChargeAmount
} else {
it.appleChargeAmount.toInt()
}
val chargeCount = it.chargeCount