test #139

Merged
klaus merged 14 commits from test into main 2024-03-08 13:40:27 +00:00
2 changed files with 21 additions and 19 deletions
Showing only changes of commit c66421b45d - Show all commits

View File

@ -8,5 +8,5 @@ data class EditLiveRoomInfoRequest(
val timezone: String?,
val menuPanId: Long = 0,
val menuPan: String = "",
val isActiveMenuPan: Boolean
val isActiveMenuPan: Boolean? = null
)

View File

@ -674,27 +674,29 @@ class LiveRoomService(
.toLocalDateTime()
}
if (request.isActiveMenuPan) {
if (request.menuPanId > 0) {
menuService.updateLiveMenu(
memberId = member.id!!,
request = UpdateLiveMenuRequest(
id = request.menuPanId,
menu = request.menuPan,
isActive = true
if (request.isActiveMenuPan != null) {
if (request.isActiveMenuPan) {
if (request.menuPanId > 0) {
menuService.updateLiveMenu(
memberId = member.id!!,
request = UpdateLiveMenuRequest(
id = request.menuPanId,
menu = request.menuPan,
isActive = true
)
)
)
} else {
menuService.createLiveMenu(
memberId = member.id!!,
request = CreateLiveMenuRequest(
menu = request.menuPan,
isActive = true
)
)
}
} else {
menuService.createLiveMenu(
memberId = member.id!!,
request = CreateLiveMenuRequest(
menu = request.menuPan,
isActive = true
)
)
menuService.deactivateAll(memberId = member.id!!)
}
} else {
menuService.deactivateAll(memberId = member.id!!)
}
}
}