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, 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() } }