Compare commits

..

No commits in common. "aa682aa10aee31a7160160d7a40121052d8ec853" and "6dd2a3136f99c24ec4c5d47a285c6803a32b343c" have entirely different histories.

5 changed files with 4 additions and 13 deletions

View File

@ -36,7 +36,6 @@ class CanPaymentService(
memberId: Long, memberId: Long,
needCan: Int, needCan: Int,
canUsage: CanUsage, canUsage: CanUsage,
isSecret: Boolean = false,
liveRoom: LiveRoom? = null, liveRoom: LiveRoom? = null,
order: Order? = null, order: Order? = null,
audioContent: AudioContent? = null, audioContent: AudioContent? = null,
@ -66,8 +65,7 @@ class CanPaymentService(
val useCan = UseCan( val useCan = UseCan(
canUsage = canUsage, canUsage = canUsage,
can = useChargeCan?.total ?: 0, can = useChargeCan?.total ?: 0,
rewardCan = useRewardCan.total, rewardCan = useRewardCan.total
isSecret = isSecret
) )
var recipientId: Long? = null var recipientId: Long? = null

View File

@ -25,9 +25,7 @@ data class UseCan(
val rewardCan: Int, val rewardCan: Int,
var isRefund: Boolean = false, var isRefund: Boolean = false
val isSecret: Boolean = false
) : BaseEntity() { ) : BaseEntity() {
@ManyToOne(fetch = FetchType.LAZY) @ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "member_id", nullable = false) @JoinColumn(name = "member_id", nullable = false)

View File

@ -229,7 +229,6 @@ class LiveRoomQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : L
liveRoom.id.eq(roomId) liveRoom.id.eq(roomId)
.and(useCan.canUsage.eq(CanUsage.DONATION).or(useCan.canUsage.eq(CanUsage.SPIN_ROULETTE))) .and(useCan.canUsage.eq(CanUsage.DONATION).or(useCan.canUsage.eq(CanUsage.SPIN_ROULETTE)))
.and(useCan.isRefund.isFalse) .and(useCan.isRefund.isFalse)
.and(useCan.isSecret.isFalse)
) )
.fetchOne() .fetchOne()
} }
@ -254,7 +253,6 @@ class LiveRoomQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : L
useCan.room.id.eq(roomId) useCan.room.id.eq(roomId)
.and(useCan.canUsage.eq(CanUsage.DONATION).or(useCan.canUsage.eq(CanUsage.SPIN_ROULETTE))) .and(useCan.canUsage.eq(CanUsage.DONATION).or(useCan.canUsage.eq(CanUsage.SPIN_ROULETTE)))
.and(useCan.isRefund.isFalse) .and(useCan.isRefund.isFalse)
.and(useCan.isSecret.isFalse)
) )
.orderBy(useCan.can.sum().add(useCan.rewardCan.sum()).desc()) .orderBy(useCan.can.sum().add(useCan.rewardCan.sum()).desc())
.fetch() .fetch()

View File

@ -1052,12 +1052,11 @@ class LiveRoomService(
memberId = member.id!!, memberId = member.id!!,
needCan = request.can, needCan = request.can,
canUsage = CanUsage.DONATION, canUsage = CanUsage.DONATION,
isSecret = request.isSecret,
liveRoom = room, liveRoom = room,
container = request.container container = request.container
) )
if (!request.isSecret && request.message.isNotBlank()) { if (request.message.isNotBlank()) {
val lock = getOrCreateLock(memberId = member.id!!) val lock = getOrCreateLock(memberId = member.id!!)
lock.write { lock.write {
val roomInfo = roomInfoRepository.findByIdOrNull(room.id!!) val roomInfo = roomInfoRepository.findByIdOrNull(room.id!!)
@ -1096,12 +1095,11 @@ class LiveRoomService(
memberId = member.id!!, memberId = member.id!!,
needCan = request.can, needCan = request.can,
canUsage = CanUsage.DONATION, canUsage = CanUsage.DONATION,
isSecret = request.isSecret,
liveRoom = room, liveRoom = room,
container = request.container container = request.container
) )
if (!request.isSecret && request.message.isNotBlank()) { if (request.message.isNotBlank()) {
val lock = getOrCreateLock(memberId = member.id!!) val lock = getOrCreateLock(memberId = member.id!!)
lock.write { lock.write {
val roomInfo = roomInfoRepository.findByIdOrNull(room.id!!) val roomInfo = roomInfoRepository.findByIdOrNull(room.id!!)

View File

@ -3,7 +3,6 @@ package kr.co.vividnext.sodalive.live.room.donation
data class LiveRoomDonationRequest( data class LiveRoomDonationRequest(
val roomId: Long, val roomId: Long,
val can: Int, val can: Int,
val isSecret: Boolean,
val container: String, val container: String,
val message: String = "" val message: String = ""
) )