klaus/sodalive-backend-spring-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test #317

Merged
klaus merged 2 commits from test into main 2025-05-20 10:26:17 +00:00
Conversation 0 Commits 2 Files Changed 3 +7
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt
View File

@@ -217,9 +217,14 @@ class MemberService(
.format(dateTimeFormatter) .format(dateTimeFormatter)
val chargeCount = chargeRepository.getChargeCount(memberId = member.id!!) val chargeCount = chargeRepository.getChargeCount(memberId = member.id!!)
val point = memberPointRepository.findByMemberIdAndExpiresAtAfterOrderByExpiresAtAsc(
memberId = member.id!!,
expiresAt = LocalDateTime.now()
).sumOf { it.point }
return GetMemberInfoResponse( return GetMemberInfoResponse(
can = member.getChargeCan(container) + member.getRewardCan(container), can = member.getChargeCan(container) + member.getRewardCan(container),
point = point,
isAuth = member.auth != null, isAuth = member.auth != null,
gender = gender, gender = gender,
signupDate = signUpDate, signupDate = signUpDate,

1
src/main/kotlin/kr/co/vividnext/sodalive/member/info/GetMemberInfoResponse.kt
View File

@@ -4,6 +4,7 @@ import kr.co.vividnext.sodalive.member.MemberRole
data class GetMemberInfoResponse( data class GetMemberInfoResponse(
val can: Int, val can: Int,
val point: Int,
val isAuth: Boolean, val isAuth: Boolean,
val gender: String?, val gender: String?,
val signupDate: String, val signupDate: String,

1
src/main/kotlin/kr/co/vividnext/sodalive/point/MemberPointRepository.kt
View File

@@ -24,6 +24,7 @@ class MemberPointQueryRepositoryImpl(
memberPoint.memberId.eq(memberId), memberPoint.memberId.eq(memberId),
memberPoint.expiresAt.goe(expiresAt) memberPoint.expiresAt.goe(expiresAt)
) )
.orderBy(memberPoint.expiresAt.asc())
.fetch() .fetch()
} }
} }