klaus
/
sodalive-backend-spring-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: klaus:ff255dbfae6941678de599ff54693be11e6c202f
Branches Tags
klaus:test
klaus:main
..
compare: klaus:dbe9b72feb3955d0979cef3dad2ae4d1be244830
Branches Tags
klaus:main
klaus:test

No commits in common. "ff255dbfae6941678de599ff54693be11e6c202f" and "dbe9b72feb3955d0979cef3dad2ae4d1be244830" have entirely different histories.
ff255dbfae ... dbe9b72feb

2 changed files with 1 additions and 6 deletions
Show Stats Expand all files Collapse all files

1
src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeData.kt
View File

@ -18,7 +18,6 @@ data class VerifyResult(
@JsonProperty("receipt_id") @JsonProperty("receipt_id")
val receiptId: String, val receiptId: String,
val method: String, val method: String,
val pg: String,
val status: Int, val status: Int,
val price: Int val price: Int
) )

6
src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeService.kt
View File

@ -160,11 +160,7 @@ class ChargeService(
if (verifyResult.status == 1 && verifyResult.price == charge.can?.price) { if (verifyResult.status == 1 && verifyResult.price == charge.can?.price) {
charge.payment?.receiptId = verifyResult.receiptId charge.payment?.receiptId = verifyResult.receiptId
charge.payment?.method = if (verifyResult.pg.contains("카카오")) { charge.payment?.method = verifyResult.method
"${verifyResult.pg}-${verifyResult.method}"
} else {
verifyResult.method
}
charge.payment?.status = PaymentStatus.COMPLETE charge.payment?.status = PaymentStatus.COMPLETE
member.charge(charge.chargeCan, charge.rewardCan, "pg") member.charge(charge.chargeCan, charge.rewardCan, "pg")