From 472b8d36f51a9c401f871de78d61bc9d6c83a9c2 Mon Sep 17 00:00:00 2001 From: Klaus Date: Wed, 2 Aug 2023 19:30:53 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=94=EC=9D=B8=20=EC=86=8C=EB=B9=84=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/can/payment/CanPaymentService.kt | 26 +++++++++---------- .../kr/co/vividnext/sodalive/member/Member.kt | 4 +-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/payment/CanPaymentService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/can/payment/CanPaymentService.kt index 82885d9..e181567 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/can/payment/CanPaymentService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/can/payment/CanPaymentService.kt @@ -151,7 +151,7 @@ class CanPaymentService( when (charge.payment!!.paymentGateway) { PaymentGateway.PG -> member.pgRewardCan -= remainingNeedCan PaymentGateway.APPLE_IAP -> member.appleRewardCan -= remainingNeedCan - PaymentGateway.GOOGLE_IAP -> member.pgRewardCan -= remainingNeedCan + PaymentGateway.GOOGLE_IAP -> member.googleRewardCan -= remainingNeedCan } total += remainingNeedCan @@ -174,7 +174,7 @@ class CanPaymentService( when (charge.payment!!.paymentGateway) { PaymentGateway.PG -> member.pgRewardCan -= remainingNeedCan PaymentGateway.APPLE_IAP -> member.appleRewardCan -= remainingNeedCan - PaymentGateway.GOOGLE_IAP -> member.pgRewardCan -= remainingNeedCan + PaymentGateway.GOOGLE_IAP -> member.googleRewardCan -= remainingNeedCan } charge.rewardCan = 0 @@ -203,13 +203,13 @@ class CanPaymentService( val charge = chargeRepository.getOldestChargeWhereChargeCanGreaterThan0(chargeId, memberId, container) ?: break - if (charge.rewardCan >= remainingNeedCan) { - charge.rewardCan -= remainingNeedCan + if (charge.chargeCan >= remainingNeedCan) { + charge.chargeCan -= remainingNeedCan when (charge.payment!!.paymentGateway) { - PaymentGateway.PG -> member.pgRewardCan -= remainingNeedCan - PaymentGateway.APPLE_IAP -> member.appleRewardCan -= remainingNeedCan - PaymentGateway.GOOGLE_IAP -> member.pgRewardCan -= remainingNeedCan + PaymentGateway.PG -> member.pgChargeCan -= remainingNeedCan + PaymentGateway.APPLE_IAP -> member.appleChargeCan -= remainingNeedCan + PaymentGateway.GOOGLE_IAP -> member.googleChargeCan -= remainingNeedCan } total += remainingNeedCan @@ -221,21 +221,21 @@ class CanPaymentService( ) ) } else { - total += charge.rewardCan + total += charge.chargeCan spentCans.add( SpentCan( paymentGateway = charge.payment!!.paymentGateway, - can = charge.rewardCan + can = charge.chargeCan ) ) when (charge.payment!!.paymentGateway) { - PaymentGateway.PG -> member.pgRewardCan -= remainingNeedCan - PaymentGateway.APPLE_IAP -> member.appleRewardCan -= remainingNeedCan - PaymentGateway.GOOGLE_IAP -> member.pgRewardCan -= remainingNeedCan + PaymentGateway.PG -> member.pgChargeCan -= remainingNeedCan + PaymentGateway.APPLE_IAP -> member.appleChargeCan -= remainingNeedCan + PaymentGateway.GOOGLE_IAP -> member.pgChargeCan -= remainingNeedCan } - charge.rewardCan = 0 + charge.chargeCan = 0 } chargeId = charge.id!! diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/Member.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/Member.kt index 785517d..a6b5c49 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/member/Member.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/Member.kt @@ -63,9 +63,9 @@ data class Member( var pushToken: String? = null // 화폐 - private var pgChargeCan: Int = 0 + var pgChargeCan: Int = 0 var pgRewardCan: Int = 0 - private var googleChargeCan: Int = 0 + var googleChargeCan: Int = 0 var googleRewardCan: Int = 0 var appleChargeCan: Int = 0 var appleRewardCan: Int = 0