From 56542a7bf1f2412989276f44b19fe354773ef433 Mon Sep 17 00:00:00 2001 From: Klaus Date: Mon, 19 May 2025 20:49:16 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EB=82=B4=EC=97=AD=20-=20=ED=8F=AC=EC=9D=B8=ED=8A=B8?= =?UTF-8?q?=EB=A5=BC=20=EC=96=B4=EB=94=94=EC=97=90=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=ED=96=88=EB=8A=94=EC=A7=80=20=EC=95=8C=EA=B8=B0=20=EC=9C=84?= =?UTF-8?q?=ED=95=B4=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EB=82=B4=EC=97=AD=20=EC=A0=80=EC=9E=A5=EC=8B=9C=20orderId=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/vividnext/sodalive/content/order/OrderService.kt | 2 +- .../kr/co/vividnext/sodalive/point/PointUsageService.kt | 4 ++-- src/main/kotlin/kr/co/vividnext/sodalive/point/UsePoint.kt | 3 ++- 3 files changed, 5 insertions(+), 4 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 255da15..68de04a 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 @@ -44,7 +44,7 @@ class OrderService( } val usedPoint = if (order.type == OrderType.RENTAL && content.isPointAvailable) { - pointUsageService.usePoint(member.id!!, order.can) + pointUsageService.usePoint(member.id!!, order.can, orderId = order.id) } else { 0 } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/point/PointUsageService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/point/PointUsageService.kt index ed02ca1..4aadd65 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/point/PointUsageService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/point/PointUsageService.kt @@ -8,7 +8,7 @@ class PointUsageService( private val memberPointRepository: MemberPointRepository, private val usePointRepository: UsePointRepository ) { - fun usePoint(memberId: Long, contentPrice: Int): Int { + fun usePoint(memberId: Long, contentPrice: Int, orderId: Long?): Int { val now = LocalDateTime.now() val maxUsablePoint = contentPrice * 10 @@ -33,7 +33,7 @@ class PointUsageService( if (used > 0) { memberPointRepository.saveAll(points) - usePointRepository.save(UsePoint(memberId = memberId, amount = used)) + usePointRepository.save(UsePoint(memberId = memberId, amount = used, orderId = orderId)) } return used diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/point/UsePoint.kt b/src/main/kotlin/kr/co/vividnext/sodalive/point/UsePoint.kt index afbeb7e..a2ba533 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/point/UsePoint.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/point/UsePoint.kt @@ -6,5 +6,6 @@ import javax.persistence.Entity @Entity data class UsePoint( val memberId: Long, - val amount: Int + val amount: Int, + val orderId: Long? = null ) : BaseEntity()