From 5857abbe05375537a37e9df619de3bb8a7045f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BD=A6=E5=8E=98=E5=AD=90?= Date: Sun, 11 Dec 2022 16:05:32 +0800 Subject: [PATCH] =?UTF-8?q?fix=F0=9F=9B=A0=EF=B8=8F:=20=E4=BF=AE=E6=94=B9g?= =?UTF-8?q?et=20bill=E4=BC=A0=E8=BE=93=E7=9A=84bill=20type=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=B8=BAint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/cn/fadinglight/routes/BillRoutes.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/cn/fadinglight/routes/BillRoutes.kt b/src/main/kotlin/cn/fadinglight/routes/BillRoutes.kt index 01679f4..31e0ab8 100644 --- a/src/main/kotlin/cn/fadinglight/routes/BillRoutes.kt +++ b/src/main/kotlin/cn/fadinglight/routes/BillRoutes.kt @@ -1,9 +1,11 @@ package cn.fadinglight.routes import cn.fadinglight.libs.Resp +import cn.fadinglight.models.Bill import cn.fadinglight.services.BillServiceImpl import cn.fadinglight.vo.BillVO import cn.fadinglight.vo.bill +import cn.fadinglight.vo.vo import io.ktor.http.* import io.ktor.server.application.* import io.ktor.server.request.* @@ -20,11 +22,11 @@ fun Route.billRoute() { val month = call.parameters["month"] val day = call.parameters["day"] if (month is String && day is String) { - billService.getManyBills(year, month, day) + billService.getManyBills(year, month, day).map(Bill::vo) } else if (month is String) { - billService.getManyBills(year, month) + billService.getManyBills(year, month).map(Bill::vo) } else { - billService.getManyBills(year) + billService.getManyBills(year).map(Bill::vo) } }.onSuccess { call.respond(Resp.Ok(it).json())