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

Merge pull request 'test' (#207) from test into main 

Reviewed-on: #207
This commit is contained in:
klaus 2024-08-27 07:31:05 +00:00
parent dbe9b72feb c8d7bdb8b7
commit ff255dbfae
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@ 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,7 +160,11 @@ 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 = verifyResult.method charge.payment?.method = if (verifyResult.pg.contains("카카오")) {
"${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")