From fcbd809691f38b9fedf108779ceffb248a4b7489 Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 20 May 2025 16:56:34 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=EC=9C=A0=EC=A0=80=20=ED=8F=AC?= =?UTF-8?q?=EC=9D=B8=ED=8A=B8=20=EC=A1=B0=ED=9A=8C=EC=8B=9C=20=EC=9C=A0?= =?UTF-8?q?=ED=9A=A8=EA=B8=B0=EA=B0=84=EC=9D=84=20=EA=B8=B0=EC=A4=80?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=98=A4=EB=A6=84=EC=B0=A8=EC=88=9C=20?= =?UTF-8?q?=EC=A0=95=EB=A0=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/vividnext/sodalive/point/MemberPointRepository.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/point/MemberPointRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/point/MemberPointRepository.kt index d8aec5d..f2309c8 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/point/MemberPointRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/point/MemberPointRepository.kt @@ -24,6 +24,7 @@ class MemberPointQueryRepositoryImpl( memberPoint.memberId.eq(memberId), memberPoint.expiresAt.goe(expiresAt) ) + .orderBy(memberPoint.expiresAt.asc()) .fetch() } } -- 2.40.1 From b92810efd2529f10c786f12efb0c993292446ee5 Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 20 May 2025 17:56:51 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=EC=95=B1=20=EC=8B=A4=ED=96=89?= =?UTF-8?q?=EC=8B=9C=20=EC=B2=98=EC=9D=8C=20=EC=8B=A4=ED=96=89=ED=95=98?= =?UTF-8?q?=EB=8A=94=20=EC=9C=A0=EC=A0=80=20=EC=A0=95=EB=B3=B4=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20API=20-=20point=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/kr/co/vividnext/sodalive/member/MemberService.kt | 5 +++++ .../vividnext/sodalive/member/info/GetMemberInfoResponse.kt | 1 + 2 files changed, 6 insertions(+) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt index ad71bec..97db6e2 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt @@ -217,9 +217,14 @@ class MemberService( .format(dateTimeFormatter) val chargeCount = chargeRepository.getChargeCount(memberId = member.id!!) + val point = memberPointRepository.findByMemberIdAndExpiresAtAfterOrderByExpiresAtAsc( + memberId = member.id!!, + expiresAt = LocalDateTime.now() + ).sumOf { it.point } return GetMemberInfoResponse( can = member.getChargeCan(container) + member.getRewardCan(container), + point = point, isAuth = member.auth != null, gender = gender, signupDate = signUpDate, diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/info/GetMemberInfoResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/info/GetMemberInfoResponse.kt index e55cd60..4a5554f 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/member/info/GetMemberInfoResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/info/GetMemberInfoResponse.kt @@ -4,6 +4,7 @@ import kr.co.vividnext.sodalive.member.MemberRole data class GetMemberInfoResponse( val can: Int, + val point: Int, val isAuth: Boolean, val gender: String?, val signupDate: String, -- 2.40.1