feat: 마이페이지 - 포인트 추가
This commit is contained in:
parent
ca704f38b9
commit
3940282ed8
|
@ -42,6 +42,7 @@ import kr.co.vividnext.sodalive.member.stipulation.StipulationRepository
|
||||||
import kr.co.vividnext.sodalive.member.tag.MemberCreatorTag
|
import kr.co.vividnext.sodalive.member.tag.MemberCreatorTag
|
||||||
import kr.co.vividnext.sodalive.member.tag.MemberTagRepository
|
import kr.co.vividnext.sodalive.member.tag.MemberTagRepository
|
||||||
import kr.co.vividnext.sodalive.member.token.MemberTokenRepository
|
import kr.co.vividnext.sodalive.member.token.MemberTokenRepository
|
||||||
|
import kr.co.vividnext.sodalive.point.MemberPointRepository
|
||||||
import kr.co.vividnext.sodalive.utils.generateFileName
|
import kr.co.vividnext.sodalive.utils.generateFileName
|
||||||
import kr.co.vividnext.sodalive.utils.generatePassword
|
import kr.co.vividnext.sodalive.utils.generatePassword
|
||||||
import org.springframework.beans.factory.annotation.Value
|
import org.springframework.beans.factory.annotation.Value
|
||||||
|
@ -77,6 +78,7 @@ class MemberService(
|
||||||
private val memberTagRepository: MemberTagRepository,
|
private val memberTagRepository: MemberTagRepository,
|
||||||
private val liveReservationRepository: LiveReservationRepository,
|
private val liveReservationRepository: LiveReservationRepository,
|
||||||
private val chargeRepository: ChargeRepository,
|
private val chargeRepository: ChargeRepository,
|
||||||
|
private val memberPointRepository: MemberPointRepository,
|
||||||
|
|
||||||
private val orderService: OrderService,
|
private val orderService: OrderService,
|
||||||
private val emailService: SendEmailService,
|
private val emailService: SendEmailService,
|
||||||
|
@ -262,6 +264,11 @@ class MemberService(
|
||||||
limit = 4
|
limit = 4
|
||||||
)
|
)
|
||||||
|
|
||||||
|
val totalPoint = memberPointRepository.findByMemberIdAndExpiresAtAfterOrderByExpiresAtAsc(
|
||||||
|
memberId = member.id!!,
|
||||||
|
expiresAt = LocalDateTime.now()
|
||||||
|
).sumOf { it.point }
|
||||||
|
|
||||||
return MyPageResponse(
|
return MyPageResponse(
|
||||||
nickname = member.nickname,
|
nickname = member.nickname,
|
||||||
profileUrl = if (member.profileImage != null) {
|
profileUrl = if (member.profileImage != null) {
|
||||||
|
@ -271,6 +278,7 @@ class MemberService(
|
||||||
},
|
},
|
||||||
chargeCan = member.getChargeCan(container = container),
|
chargeCan = member.getChargeCan(container = container),
|
||||||
rewardCan = member.getRewardCan(container = container),
|
rewardCan = member.getRewardCan(container = container),
|
||||||
|
point = totalPoint,
|
||||||
youtubeUrl = member.youtubeUrl,
|
youtubeUrl = member.youtubeUrl,
|
||||||
instagramUrl = member.instagramUrl,
|
instagramUrl = member.instagramUrl,
|
||||||
websiteUrl = member.websiteUrl,
|
websiteUrl = member.websiteUrl,
|
||||||
|
|
|
@ -7,6 +7,7 @@ data class MyPageResponse(
|
||||||
val profileUrl: String,
|
val profileUrl: String,
|
||||||
val chargeCan: Int,
|
val chargeCan: Int,
|
||||||
val rewardCan: Int,
|
val rewardCan: Int,
|
||||||
|
val point: Int,
|
||||||
val youtubeUrl: String?,
|
val youtubeUrl: String?,
|
||||||
val instagramUrl: String?,
|
val instagramUrl: String?,
|
||||||
val websiteUrl: String? = null,
|
val websiteUrl: String? = null,
|
||||||
|
|
Loading…
Reference in New Issue