Compare commits
No commits in common. "487d3c9d6ec8ba44e58c980b13434253ee5b79cf" and "ae6171e84416ef4ec9d2557c46b00ced114b4dd6" have entirely different histories.
487d3c9d6e
...
ae6171e844
|
@ -35,7 +35,6 @@ data class AudioContent(
|
||||||
@Enumerated(value = EnumType.STRING)
|
@Enumerated(value = EnumType.STRING)
|
||||||
val type: AudioContentType = AudioContentType.INDIVIDUAL,
|
val type: AudioContentType = AudioContentType.INDIVIDUAL,
|
||||||
val isGeneratePreview: Boolean = true,
|
val isGeneratePreview: Boolean = true,
|
||||||
var isOnlyRental: Boolean = false,
|
|
||||||
var isAdult: Boolean = false,
|
var isAdult: Boolean = false,
|
||||||
var isCommentAvailable: Boolean = true
|
var isCommentAvailable: Boolean = true
|
||||||
) : BaseEntity() {
|
) : BaseEntity() {
|
||||||
|
|
|
@ -486,7 +486,6 @@ class AudioContentService(
|
||||||
duration = audioContent.duration ?: "",
|
duration = audioContent.duration ?: "",
|
||||||
isAdult = audioContent.isAdult,
|
isAdult = audioContent.isAdult,
|
||||||
isMosaic = audioContent.isAdult && member.auth == null,
|
isMosaic = audioContent.isAdult && member.auth == null,
|
||||||
isOnlyRental = audioContent.isOnlyRental,
|
|
||||||
existOrdered = isExistsBundleAudioContent || isExistsAudioContent,
|
existOrdered = isExistsBundleAudioContent || isExistsAudioContent,
|
||||||
orderType = orderType,
|
orderType = orderType,
|
||||||
remainingTime = remainingTime,
|
remainingTime = remainingTime,
|
||||||
|
|
|
@ -16,7 +16,6 @@ data class GetAudioContentDetailResponse(
|
||||||
val duration: String,
|
val duration: String,
|
||||||
val isAdult: Boolean,
|
val isAdult: Boolean,
|
||||||
val isMosaic: Boolean,
|
val isMosaic: Boolean,
|
||||||
val isOnlyRental: Boolean,
|
|
||||||
val existOrdered: Boolean,
|
val existOrdered: Boolean,
|
||||||
val orderType: OrderType?,
|
val orderType: OrderType?,
|
||||||
val remainingTime: String?,
|
val remainingTime: String?,
|
||||||
|
|
|
@ -52,7 +52,7 @@ data class Order(
|
||||||
override fun prePersist() {
|
override fun prePersist() {
|
||||||
super.prePersist()
|
super.prePersist()
|
||||||
if (type == OrderType.RENTAL) {
|
if (type == OrderType.RENTAL) {
|
||||||
endDate = startDate.plusDays(15)
|
endDate = startDate.plusDays(7)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue