Compare commits
No commits in common. "2c305dc6c6e7a8247e03b927707ec606231567fd" and "62f76f743365c0ad8591a6873ef575b7dc22fc7a" have entirely different histories.
2c305dc6c6
...
62f76f7433
|
@ -33,18 +33,10 @@ class AdminCalculateService(private val repository: AdminCalculateQueryRepositor
|
||||||
.getCalculateLive(startDate, endDate)
|
.getCalculateLive(startDate, endDate)
|
||||||
.asSequence()
|
.asSequence()
|
||||||
.map {
|
.map {
|
||||||
val canUsageStr = when (it.canUsage) {
|
val canUsageStr = if (it.canUsage == CanUsage.LIVE) {
|
||||||
CanUsage.LIVE -> {
|
"유료"
|
||||||
"유료"
|
} else {
|
||||||
}
|
"후원"
|
||||||
|
|
||||||
CanUsage.SPIN_ROULETTE -> {
|
|
||||||
"룰렛"
|
|
||||||
}
|
|
||||||
|
|
||||||
else -> {
|
|
||||||
"후원"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
val numberOfPeople = if (it.canUsage == CanUsage.LIVE) {
|
val numberOfPeople = if (it.canUsage == CanUsage.LIVE) {
|
||||||
|
|
|
@ -39,18 +39,10 @@ class CreatorAdminCalculateService(private val repository: CreatorAdminCalculate
|
||||||
.getCalculateLive(startDate, endDate, member.id!!)
|
.getCalculateLive(startDate, endDate, member.id!!)
|
||||||
.asSequence()
|
.asSequence()
|
||||||
.map {
|
.map {
|
||||||
val canUsageStr = when (it.canUsage) {
|
val canUsageStr = if (it.canUsage == CanUsage.LIVE) {
|
||||||
CanUsage.LIVE -> {
|
"유료"
|
||||||
"유료"
|
} else {
|
||||||
}
|
"후원"
|
||||||
|
|
||||||
CanUsage.SPIN_ROULETTE -> {
|
|
||||||
"룰렛"
|
|
||||||
}
|
|
||||||
|
|
||||||
else -> {
|
|
||||||
"후원"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
val numberOfPeople = if (it.canUsage == CanUsage.LIVE) {
|
val numberOfPeople = if (it.canUsage == CanUsage.LIVE) {
|
||||||
|
|
|
@ -71,7 +71,7 @@ class RouletteService(
|
||||||
}
|
}
|
||||||
|
|
||||||
return GetRouletteResponse(
|
return GetRouletteResponse(
|
||||||
can = roulette?.can ?: 0,
|
can = roulette?.can ?: 5,
|
||||||
isActive = roulette?.isActive ?: false,
|
isActive = roulette?.isActive ?: false,
|
||||||
items = roulette?.items ?: listOf()
|
items = roulette?.items ?: listOf()
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue