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