From 7c3b7cffc2a949db091143953107d0cce6fbb885 Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 22 Apr 2025 23:39:48 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=BD=98=ED=85=90=EC=B8=A0=20=EC=A3=BC?= =?UTF-8?q?=EB=AC=B8=20-=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EA=B2=B0?= =?UTF-8?q?=EC=A0=9C=20=ED=9B=84=20=EC=B6=94=EA=B0=80=20=EA=B2=B0=EC=A0=9C?= =?UTF-8?q?=EB=A5=BC=20=ED=95=B4=EC=95=BC=ED=95=98=EB=8A=94=20=EC=BA=94?= =?UTF-8?q?=EC=9D=B4=20=EB=82=A8=EC=95=84=20=EC=9E=88=EB=8A=94=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=EC=97=90=EB=A7=8C=20=EC=BA=94=EC=9D=84=20=EA=B2=B0?= =?UTF-8?q?=EC=A0=9C=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=20(?= =?UTF-8?q?=EB=82=A8=EC=95=84=20=EC=9E=88=EB=8A=94=20=EC=BA=94=EC=9D=B4=20?= =?UTF-8?q?=EC=97=86=EB=8A=94=EB=8D=B0=20=EA=B2=B0=EC=A0=9C=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=EA=B0=80=20=EB=90=98=EC=84=9C=200=EC=BA=94=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=8D=B0=EC=9D=B4=ED=84=B0=EA=B0=80=20=EC=8C=93?= =?UTF-8?q?=EC=9D=B4=EB=8A=94=20=EA=B2=83=20=EB=B0=A9=EC=A7=80)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/content/order/OrderService.kt | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/order/OrderService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/order/OrderService.kt index 2e0f446..255da15 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/order/OrderService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/order/OrderService.kt @@ -50,13 +50,20 @@ class OrderService( } order.point = usedPoint - canPaymentService.spendCan( - memberId = member.id!!, - needCan = order.can - (usedPoint / 10), - canUsage = CanUsage.ORDER_CONTENT, - order = order, - container = container - ) + val remainingCan = order.can - (usedPoint / 10) + if (order.type == OrderType.RENTAL && content.isPointAvailable && usedPoint > 0) { + order.can = remainingCan + } + + if (remainingCan > 0) { + canPaymentService.spendCan( + memberId = member.id!!, + needCan = remainingCan, + canUsage = CanUsage.ORDER_CONTENT, + order = order, + container = container + ) + } } private fun orderContent(orderType: OrderType, content: AudioContent, member: Member): Order {