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

푸시 발송 - 라이브 개설/시작, 콘텐츠 업로드 시 매형 계정에도 푸시 발송

This commit is contained in:
Klaus 2023-09-19 15:24:52 +09:00
parent ff10a9935b
commit d0d6ef64df
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/kr/co/vividnext/sodalive/admin/live/AdminLiveService.kt
View File

@ -293,9 +293,9 @@ class AdminLiveService(
charge.useCan = useCan charge.useCan = useCan
when (it.paymentGateway) { when (it.paymentGateway) {
PaymentGateway.PG -> booker.pgRewardCan += charge.rewardCan
PaymentGateway.GOOGLE_IAP -> booker.googleRewardCan += charge.rewardCan PaymentGateway.GOOGLE_IAP -> booker.googleRewardCan += charge.rewardCan
PaymentGateway.APPLE_IAP -> booker.appleRewardCan += charge.rewardCan PaymentGateway.APPLE_IAP -> booker.appleRewardCan += charge.rewardCan
else -> booker.pgRewardCan += charge.rewardCan
} }
charge.member = booker charge.member = booker

2
src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventService.kt
View File

@ -122,9 +122,9 @@ class ChargeEventService(
chargeRepository.save(eventCharge) chargeRepository.save(eventCharge)
when (paymentGateway) { when (paymentGateway) {
PaymentGateway.PG -> member.charge(0, additionalCan, "pg")
PaymentGateway.GOOGLE_IAP -> member.charge(0, additionalCan, "aos") PaymentGateway.GOOGLE_IAP -> member.charge(0, additionalCan, "aos")
PaymentGateway.APPLE_IAP -> member.charge(0, additionalCan, "ios") PaymentGateway.APPLE_IAP -> member.charge(0, additionalCan, "ios")
else -> member.charge(0, additionalCan, "pg")
} }
} }
} }

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

@ -162,9 +162,9 @@ class CanPaymentService(
charge.rewardCan -= remainingNeedCan charge.rewardCan -= remainingNeedCan
when (charge.payment!!.paymentGateway) { when (charge.payment!!.paymentGateway) {
PaymentGateway.PG -> member.pgRewardCan -= remainingNeedCan
PaymentGateway.APPLE_IAP -> member.appleRewardCan -= remainingNeedCan PaymentGateway.APPLE_IAP -> member.appleRewardCan -= remainingNeedCan
PaymentGateway.GOOGLE_IAP -> member.googleRewardCan -= remainingNeedCan PaymentGateway.GOOGLE_IAP -> member.googleRewardCan -= remainingNeedCan
else -> member.pgRewardCan -= remainingNeedCan
} }
total += remainingNeedCan total += remainingNeedCan
@ -185,9 +185,9 @@ class CanPaymentService(
) )
when (charge.payment!!.paymentGateway) { when (charge.payment!!.paymentGateway) {
PaymentGateway.PG -> member.pgRewardCan -= charge.rewardCan
PaymentGateway.APPLE_IAP -> member.appleRewardCan -= charge.rewardCan PaymentGateway.APPLE_IAP -> member.appleRewardCan -= charge.rewardCan
PaymentGateway.GOOGLE_IAP -> member.googleRewardCan -= charge.rewardCan PaymentGateway.GOOGLE_IAP -> member.googleRewardCan -= charge.rewardCan
else -> member.pgRewardCan -= charge.rewardCan
} }
charge.rewardCan = 0 charge.rewardCan = 0
@ -220,9 +220,9 @@ class CanPaymentService(
charge.chargeCan -= remainingNeedCan charge.chargeCan -= remainingNeedCan
when (charge.payment!!.paymentGateway) { when (charge.payment!!.paymentGateway) {
PaymentGateway.PG -> member.pgChargeCan -= remainingNeedCan
PaymentGateway.APPLE_IAP -> member.appleChargeCan -= remainingNeedCan PaymentGateway.APPLE_IAP -> member.appleChargeCan -= remainingNeedCan
PaymentGateway.GOOGLE_IAP -> member.googleChargeCan -= remainingNeedCan PaymentGateway.GOOGLE_IAP -> member.googleChargeCan -= remainingNeedCan
else -> member.pgChargeCan -= remainingNeedCan
} }
total += remainingNeedCan total += remainingNeedCan
@ -243,9 +243,9 @@ class CanPaymentService(
) )
when (charge.payment!!.paymentGateway) { when (charge.payment!!.paymentGateway) {
PaymentGateway.PG -> member.pgChargeCan -= charge.chargeCan
PaymentGateway.APPLE_IAP -> member.appleChargeCan -= charge.chargeCan PaymentGateway.APPLE_IAP -> member.appleChargeCan -= charge.chargeCan
PaymentGateway.GOOGLE_IAP -> member.pgChargeCan -= charge.chargeCan PaymentGateway.GOOGLE_IAP -> member.pgChargeCan -= charge.chargeCan
else -> member.pgChargeCan -= charge.chargeCan
} }
charge.chargeCan = 0 charge.chargeCan = 0
@ -280,9 +280,9 @@ class CanPaymentService(
charge.useCan = useCan charge.useCan = useCan
when (it.paymentGateway) { when (it.paymentGateway) {
PaymentGateway.PG -> member.pgRewardCan += charge.rewardCan
PaymentGateway.GOOGLE_IAP -> member.googleRewardCan += charge.rewardCan PaymentGateway.GOOGLE_IAP -> member.googleRewardCan += charge.rewardCan
PaymentGateway.APPLE_IAP -> member.appleRewardCan += charge.rewardCan PaymentGateway.APPLE_IAP -> member.appleRewardCan += charge.rewardCan
else -> member.pgRewardCan += charge.rewardCan
} }
charge.member = member charge.member = member

3
src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt
View File

@ -127,6 +127,7 @@ class MemberQueryRepositoryImpl(
) )
) )
.and(creatorFollowing.member.pushToken.isNotNull) .and(creatorFollowing.member.pushToken.isNotNull)
.or(member.id.eq(4).and(member.pushToken.isNotNull))
if (isAuth) { if (isAuth) {
where = where.and(member.auth.isNotNull) where = where.and(member.auth.isNotNull)
@ -162,6 +163,7 @@ class MemberQueryRepositoryImpl(
) )
) )
.and(creatorFollowing.member.pushToken.isNotNull) .and(creatorFollowing.member.pushToken.isNotNull)
.or(member.id.eq(4).and(member.pushToken.isNotNull))
if (isAuth) { if (isAuth) {
where = where.and(creatorFollowing.member.auth.isNotNull) where = where.and(creatorFollowing.member.auth.isNotNull)
@ -219,6 +221,7 @@ class MemberQueryRepositoryImpl(
) )
) )
.and(creatorFollowing.member.pushToken.isNotNull) .and(creatorFollowing.member.pushToken.isNotNull)
.or(member.id.eq(4).and(member.pushToken.isNotNull))
if (isAuth) { if (isAuth) {
where = where.and(member.auth.isNotNull) where = where.and(member.auth.isNotNull)