From 1551e3231c31b156811c57b31409265c5eebcbd0 Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Tue, 27 Aug 2024 16:04:20 +0900
Subject: [PATCH 1/3] =?UTF-8?q?pg=20=EA=B2=B0=EC=A0=9C=20-=20pg=20?=
 =?UTF-8?q?=EC=82=AC=20=EA=B8=B0=EB=A1=9D=EC=8B=9C=20pg=EB=A1=9C=20?=
 =?UTF-8?q?=EA=B8=B0=EB=A1=9D=ED=95=98=EC=A7=80=20=EC=95=8A=EA=B3=A0=20?=
 =?UTF-8?q?=EA=B2=B0=EC=A0=9C=EC=97=90=EC=84=9C=20=EB=B0=9B=EC=95=84?=
 =?UTF-8?q?=EC=98=A4=EB=8A=94=20pg=EC=82=AC=20=EC=9D=B4=EB=A6=84=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kotlin/kr/co/vividnext/sodalive/can/charge/ChargeData.kt    | 1 +
 .../kotlin/kr/co/vividnext/sodalive/can/charge/ChargeService.kt | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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 4ac82a1..2fc7a14 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
@@ -18,6 +18,7 @@ data class VerifyResult(
     @JsonProperty("receipt_id")
     val receiptId: String,
     val method: String,
+    val pg: String,
     val status: Int,
     val price: Int
 )
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeService.kt
index f65c389..e400ffd 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeService.kt
@@ -162,7 +162,7 @@ class ChargeService(
                     charge.payment?.receiptId = verifyResult.receiptId
                     charge.payment?.method = verifyResult.method
                     charge.payment?.status = PaymentStatus.COMPLETE
-                    member.charge(charge.chargeCan, charge.rewardCan, "pg")
+                    member.charge(charge.chargeCan, charge.rewardCan, verifyResult.pg)
 
                     applicationEventPublisher.publishEvent(
                         ChargeSpringEvent(

From bb897fe965b8dd9bb48f7a51e449af9ca0d8015c Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Tue, 27 Aug 2024 16:14:29 +0900
Subject: [PATCH 2/3] =?UTF-8?q?pg=20=EA=B2=B0=EC=A0=9C=20-=20=EA=B2=B0?=
 =?UTF-8?q?=EC=A0=9C=EC=88=98=EB=8B=A8=20pg=EC=82=AC=20=EC=9D=B4=EB=A6=84?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kr/co/vividnext/sodalive/can/charge/ChargeService.kt      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeService.kt
index e400ffd..3a0972a 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeService.kt
@@ -160,9 +160,9 @@ class ChargeService(
 
                 if (verifyResult.status == 1 && verifyResult.price == charge.can?.price) {
                     charge.payment?.receiptId = verifyResult.receiptId
-                    charge.payment?.method = verifyResult.method
+                    charge.payment?.method = "${verifyResult.pg}-${verifyResult.method}"
                     charge.payment?.status = PaymentStatus.COMPLETE
-                    member.charge(charge.chargeCan, charge.rewardCan, verifyResult.pg)
+                    member.charge(charge.chargeCan, charge.rewardCan, "pg")
 
                     applicationEventPublisher.publishEvent(
                         ChargeSpringEvent(

From c8d7bdb8b7e253192e63c0f870612379a486d86c Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Tue, 27 Aug 2024 16:24:17 +0900
Subject: [PATCH 3/3] =?UTF-8?q?pg=20=EA=B2=B0=EC=A0=9C=20-=20pg=EC=82=AC?=
 =?UTF-8?q?=EA=B0=80=20=EC=B9=B4=EC=B9=B4=EC=98=A4=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=9D=B4=EB=A9=B4=20"=EC=B9=B4=EC=B9=B4=EC=98=A4=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4-'=EA=B2=B0=EC=A0=9C=EC=88=98=EB=8B=A8'"=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EA=B8=B0=EB=A1=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kr/co/vividnext/sodalive/can/charge/ChargeService.kt    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeService.kt
index 3a0972a..64529b0 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeService.kt
@@ -160,7 +160,11 @@ class ChargeService(
 
                 if (verifyResult.status == 1 && verifyResult.price == charge.can?.price) {
                     charge.payment?.receiptId = verifyResult.receiptId
-                    charge.payment?.method = "${verifyResult.pg}-${verifyResult.method}"
+                    charge.payment?.method = if (verifyResult.pg.contains("카카오")) {
+                        "${verifyResult.pg}-${verifyResult.method}"
+                    } else {
+                        verifyResult.method
+                    }
                     charge.payment?.status = PaymentStatus.COMPLETE
                     member.charge(charge.chargeCan, charge.rewardCan, "pg")