From 78ff13a654c44219b15f91dce621bd858a32ff53 Mon Sep 17 00:00:00 2001 From: Klaus Date: Wed, 1 Oct 2025 16:07:34 +0900 Subject: [PATCH] =?UTF-8?q?temp:=20=EC=BA=94=20=EA=B0=80=EA=B2=A9=20?= =?UTF-8?q?=ED=83=80=EC=9E=85=20Int=20->=20Double=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/vividnext/sodalive/admin/can/AdminCanRequest.kt | 2 +- .../sodalive/admin/charge/AdminChargeStatusService.kt | 4 ++-- .../sodalive/admin/charge/GetChargeStatusDetailQueryDto.kt | 2 +- .../sodalive/admin/charge/GetChargeStatusQueryDto.kt | 2 +- .../sodalive/admin/charge/GetChargeStatusResponse.kt | 2 +- src/main/kotlin/kr/co/vividnext/sodalive/can/Can.kt | 2 +- src/main/kotlin/kr/co/vividnext/sodalive/can/CanResponse.kt | 2 +- .../kotlin/kr/co/vividnext/sodalive/can/charge/ChargeData.kt | 2 +- .../vividnext/sodalive/can/charge/temp/ChargeTempService.kt | 4 ++-- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/can/AdminCanRequest.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/can/AdminCanRequest.kt index 92258ff..5fa6811 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/can/AdminCanRequest.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/can/AdminCanRequest.kt @@ -7,7 +7,7 @@ import kr.co.vividnext.sodalive.extensions.moneyFormat data class AdminCanRequest( val can: Int, val rewardCan: Int, - val price: Int + val price: Double ) { fun toEntity(): Can { var title = "${can.moneyFormat()} 캔" 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 fef1205..345ba64 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 @@ -20,7 +20,7 @@ class AdminChargeStatusService(val repository: AdminChargeStatusQueryRepository) .withZoneSameInstant(ZoneId.of("UTC")) .toLocalDateTime() - var totalChargeAmount = 0 + var totalChargeAmount = 0.toDouble() var totalChargeCount = 0L val chargeStatusList = repository.getChargeStatus(startDate, endDate) @@ -29,7 +29,7 @@ class AdminChargeStatusService(val repository: AdminChargeStatusQueryRepository) val chargeAmount = if (it.paymentGateWay == PaymentGateway.PG) { it.pgChargeAmount } else { - it.appleChargeAmount.toInt() + it.appleChargeAmount } val chargeCount = it.chargeCount diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailQueryDto.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailQueryDto.kt index d4b5e91..fe28627 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailQueryDto.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailQueryDto.kt @@ -7,7 +7,7 @@ data class GetChargeStatusDetailQueryDto @QueryProjection constructor( val nickname: String, val method: String, val appleChargeAmount: Double, - val pgChargeAmount: Int, + val pgChargeAmount: Double, val locale: String, val datetime: String ) 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 c5c16d0..53c581f 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,7 +6,7 @@ import kr.co.vividnext.sodalive.can.payment.PaymentGateway data class GetChargeStatusQueryDto @QueryProjection constructor( val date: String, val appleChargeAmount: Double, - val pgChargeAmount: Int, + val pgChargeAmount: Double, val chargeCount: Long, val paymentGateWay: PaymentGateway ) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusResponse.kt index efbe3aa..e532b23 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusResponse.kt @@ -2,7 +2,7 @@ package kr.co.vividnext.sodalive.admin.charge data class GetChargeStatusResponse( val date: String, - val chargeAmount: Int, + val chargeAmount: Double, val chargeCount: Long, val pg: String ) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/Can.kt b/src/main/kotlin/kr/co/vividnext/sodalive/can/Can.kt index 1f0f4f6..64f5f3c 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/can/Can.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/can/Can.kt @@ -10,7 +10,7 @@ data class Can( var title: String, var can: Int, var rewardCan: Int, - var price: Int, + var price: Double, @Enumerated(value = EnumType.STRING) var status: CanStatus ) : BaseEntity() diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/CanResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/can/CanResponse.kt index e3c5d48..f655f13 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/can/CanResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/can/CanResponse.kt @@ -7,5 +7,5 @@ data class CanResponse @QueryProjection constructor( val title: String, val can: Int, val rewardCan: Int, - val price: Int + val price: Double ) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeData.kt b/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeData.kt index 9689415..a6785c4 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeData.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeData.kt @@ -21,7 +21,7 @@ data class VerifyResult( val method: String, val pg: String, val status: Int, - val price: Int + val price: Double ) data class AppleChargeRequest( diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/temp/ChargeTempService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/temp/ChargeTempService.kt index 8e2e645..c94dc7d 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/temp/ChargeTempService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/temp/ChargeTempService.kt @@ -66,7 +66,7 @@ class ChargeTempService( VerifyResult::class.java ) - if (verifyResult.status == 1 && verifyResult.price == charge.payment!!.price.toInt()) { + if (verifyResult.status == 1 && verifyResult.price == charge.payment!!.price) { charge.payment?.receiptId = verifyResult.receiptId charge.payment?.method = verifyResult.method charge.payment?.status = PaymentStatus.COMPLETE @@ -74,7 +74,7 @@ class ChargeTempService( } else { throw SodaException("결제정보에 오류가 있습니다.") } - } catch (e: Exception) { + } catch (_: Exception) { throw SodaException("결제정보에 오류가 있습니다.") } } else {