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

코인 소비 로직 수정

Browse Source
This commit is contained in:
Klaus
2023-08-02 19:30:53 +09:00
parent 25b3bcb534
commit 472b8d36f5
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/kotlin/kr/co/vividnext/sodalive/can/payment/CanPaymentService.kt
View File

@@ -151,7 +151,7 @@ class CanPaymentService(
when (charge.payment!!.paymentGateway) { when (charge.payment!!.paymentGateway) {
PaymentGateway.PG -> member.pgRewardCan -= remainingNeedCan PaymentGateway.PG -> member.pgRewardCan -= remainingNeedCan
PaymentGateway.APPLE_IAP -> member.appleRewardCan -= remainingNeedCan PaymentGateway.APPLE_IAP -> member.appleRewardCan -= remainingNeedCan
PaymentGateway.GOOGLE_IAP -> member.pgRewardCan -= remainingNeedCan PaymentGateway.GOOGLE_IAP -> member.googleRewardCan -= remainingNeedCan
} }
total += remainingNeedCan total += remainingNeedCan
@@ -174,7 +174,7 @@ class CanPaymentService(
when (charge.payment!!.paymentGateway) { when (charge.payment!!.paymentGateway) {
PaymentGateway.PG -> member.pgRewardCan -= remainingNeedCan PaymentGateway.PG -> member.pgRewardCan -= remainingNeedCan
PaymentGateway.APPLE_IAP -> member.appleRewardCan -= remainingNeedCan PaymentGateway.APPLE_IAP -> member.appleRewardCan -= remainingNeedCan
PaymentGateway.GOOGLE_IAP -> member.pgRewardCan -= remainingNeedCan PaymentGateway.GOOGLE_IAP -> member.googleRewardCan -= remainingNeedCan
} }
charge.rewardCan = 0 charge.rewardCan = 0
@@ -203,13 +203,13 @@ class CanPaymentService(
val charge = chargeRepository.getOldestChargeWhereChargeCanGreaterThan0(chargeId, memberId, container) val charge = chargeRepository.getOldestChargeWhereChargeCanGreaterThan0(chargeId, memberId, container)
?: break ?: break
if (charge.rewardCan >= remainingNeedCan) { if (charge.chargeCan >= remainingNeedCan) {
charge.rewardCan -= remainingNeedCan charge.chargeCan -= remainingNeedCan
when (charge.payment!!.paymentGateway) { when (charge.payment!!.paymentGateway) {
PaymentGateway.PG -> member.pgRewardCan -= remainingNeedCan PaymentGateway.PG -> member.pgChargeCan -= remainingNeedCan
PaymentGateway.APPLE_IAP -> member.appleRewardCan -= remainingNeedCan PaymentGateway.APPLE_IAP -> member.appleChargeCan -= remainingNeedCan
PaymentGateway.GOOGLE_IAP -> member.pgRewardCan -= remainingNeedCan PaymentGateway.GOOGLE_IAP -> member.googleChargeCan -= remainingNeedCan
} }
total += remainingNeedCan total += remainingNeedCan
@@ -221,21 +221,21 @@ class CanPaymentService(
) )
) )
} else { } else {
total += charge.rewardCan total += charge.chargeCan
spentCans.add( spentCans.add(
SpentCan( SpentCan(
paymentGateway = charge.payment!!.paymentGateway, paymentGateway = charge.payment!!.paymentGateway,
can = charge.rewardCan can = charge.chargeCan
) )
) )
when (charge.payment!!.paymentGateway) { when (charge.payment!!.paymentGateway) {
PaymentGateway.PG -> member.pgRewardCan -= remainingNeedCan PaymentGateway.PG -> member.pgChargeCan -= remainingNeedCan
PaymentGateway.APPLE_IAP -> member.appleRewardCan -= remainingNeedCan PaymentGateway.APPLE_IAP -> member.appleChargeCan -= remainingNeedCan
PaymentGateway.GOOGLE_IAP -> member.pgRewardCan -= remainingNeedCan PaymentGateway.GOOGLE_IAP -> member.pgChargeCan -= remainingNeedCan
} }
charge.rewardCan = 0 charge.chargeCan = 0
} }
chargeId = charge.id!! chargeId = charge.id!!

4
src/main/kotlin/kr/co/vividnext/sodalive/member/Member.kt
View File

@@ -63,9 +63,9 @@ data class Member(
var pushToken: String? = null var pushToken: String? = null
// 화폐 // 화폐
private var pgChargeCan: Int = 0 var pgChargeCan: Int = 0
var pgRewardCan: Int = 0 var pgRewardCan: Int = 0
private var googleChargeCan: Int = 0 var googleChargeCan: Int = 0
var googleRewardCan: Int = 0 var googleRewardCan: Int = 0
var appleChargeCan: Int = 0 var appleChargeCan: Int = 0
var appleRewardCan: Int = 0 var appleRewardCan: Int = 0