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

Compare commits

base: klaus:16328f73d9c28559a1c5b4ff8f997f584d38cea9
Branches Tags
klaus:test
klaus:main
..
compare: klaus:e0d4f53cf4d2486049ad0eabb95b73acc4e9cf62
Branches Tags
klaus:main
klaus:test

No commits in common. "16328f73d9c28559a1c5b4ff8f997f584d38cea9" and "e0d4f53cf4d2486049ad0eabb95b73acc4e9cf62" have entirely different histories.
16328f73d9 ... e0d4f53cf4

6 changed files with 6 additions and 33 deletions
Show Stats Expand all files Collapse all files

1
src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateQueryRepository.kt
View File

@ -129,7 +129,6 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) {
QGetCalculateContentDonationQueryData(
member.nickname,
audioContent.title,
audioContent.price,
getFormattedDate(audioContent.createdAt),
donationFormattedDate,
useCan.id.count(),

17
src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateService.kt
View File

@ -195,7 +195,7 @@ class AdminCalculateService(private val repository: AdminCalculateQueryRepositor
@Transactional(readOnly = true)
@Cacheable(
cacheNames = ["cache_ttl_3_hours"],
key = "'calculateContentDonationList2:' + " + "#startDateStr + ':' + #endDateStr"
key = "'calculateContentDonationList:' + " + "#startDateStr + ':' + #endDateStr"
)
fun getCalculateContentDonationList(
startDateStr: String,
@ -222,14 +222,8 @@ class AdminCalculateService(private val repository: AdminCalculateQueryRepositor
// 결제수수료 : 6.6%
val paymentFee = totalKrw * 0.066f
// 정산금액
// 유료콘텐츠 (원화 - 결제수수료) 의 90%
// 무료콘텐츠 (원화 - 결제수수료) 의 70%
val settlementAmount = if (it.price > 0) {
(totalKrw.toFloat() - paymentFee) * 0.9
} else {
(totalKrw.toFloat() - paymentFee) * 0.7
}
// 정산금액 = (원화 - 결제수수료) 의 70%
val settlementAmount = (totalKrw.toFloat() - paymentFee) * 0.7
// 원천세 = 정산금액의 3.3%
val tax = settlementAmount * 0.033
@ -240,11 +234,6 @@ class AdminCalculateService(private val repository: AdminCalculateQueryRepositor
GetCalculateContentDonationResponse(
nickname = it.nickname,
title = it.title,
paidOrFree = if (it.price > 0) {
"유료"
} else {
"무료"
},
registrationDate = it.registrationDate,
donationDate = it.donationDate,
numberOfDonation = it.numberOfDonation.toInt(),

2
src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateContentDonationQueryData.kt
View File

@ -7,8 +7,6 @@ data class GetCalculateContentDonationQueryData @QueryProjection constructor(
val nickname: String,
// 콘텐츠 제목
val title: String,
// 콘텐츠 가격
val price: Int,
// 콘텐츠 등록 날짜
val registrationDate: String,
// 후원 날짜

1
src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateContentDonationResponse.kt
View File

@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonProperty
data class GetCalculateContentDonationResponse(
@JsonProperty("nickname") val nickname: String,
@JsonProperty("title") val title: String,
@JsonProperty("paidOrFree") val paidOrFree: String,
@JsonProperty("registrationDate") val registrationDate: String,
@JsonProperty("donationDate") val donationDate: String,
@JsonProperty("numberOfDonation") val numberOfDonation: Int,

1
src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateQueryRepository.kt
View File

@ -224,7 +224,6 @@ class CreatorAdminCalculateQueryRepository(private val queryFactory: JPAQueryFac
QGetCalculateContentDonationQueryData(
member.nickname,
audioContent.title,
audioContent.price,
getFormattedDate(audioContent.createdAt),
donationFormattedDate,
useCan.id.count(),

17
src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateService.kt
View File

@ -210,7 +210,7 @@ class CreatorAdminCalculateService(private val repository: CreatorAdminCalculate
@Transactional(readOnly = true)
@Cacheable(
cacheNames = ["cache_ttl_3_hours"],
key = "'creatorCalculateContentDonationList2:' + " +
key = "'creatorCalculateContentDonationList:' + " +
"#startDateStr + ':' + #endDateStr + ':' + #memberId + ':' + #offset + ':' + #limit"
)
fun getCalculateContentDonationList(
@ -242,14 +242,8 @@ class CreatorAdminCalculateService(private val repository: CreatorAdminCalculate
// 결제수수료 : 6.6%
val paymentFee = totalKrw * 0.066f
// 정산금액
// 유료콘텐츠 (원화 - 결제수수료) 의 90%
// 무료콘텐츠 (원화 - 결제수수료) 의 70%
val settlementAmount = if (it.price > 0) {
(totalKrw.toFloat() - paymentFee) * 0.9
} else {
(totalKrw.toFloat() - paymentFee) * 0.7
}
// 정산금액 = (원화 - 결제수수료) 의 70%
val settlementAmount = (totalKrw.toFloat() - paymentFee) * 0.7
// 원천세 = 정산금액의 3.3%
val tax = settlementAmount * 0.033
@ -260,11 +254,6 @@ class CreatorAdminCalculateService(private val repository: CreatorAdminCalculate
GetCalculateContentDonationResponse(
nickname = it.nickname,
title = it.title,
paidOrFree = if (it.price > 0) {
"유료"
} else {
"무료"
},
registrationDate = it.registrationDate,
donationDate = it.donationDate,
numberOfDonation = it.numberOfDonation.toInt(),