feat(calculate): 일반 정산에 국가별 가중 금액을 반영한다
This commit is contained in:
+16
-5
@@ -8,8 +8,14 @@ data class GetCalculateByCreatorQueryData @QueryProjection constructor(
|
||||
val creatorId: Long,
|
||||
val nickname: String,
|
||||
val totalCan: Int,
|
||||
val settlementRatio: Int?
|
||||
val settlementRatio: Int?,
|
||||
val newPolicyCan: Int = 0,
|
||||
val newPolicyWeightedRatioCan: Long = 0
|
||||
) {
|
||||
@QueryProjection
|
||||
constructor(creatorId: Long, nickname: String, totalCan: Int, settlementRatio: Int?) :
|
||||
this(creatorId, nickname, totalCan, settlementRatio, 0, 0)
|
||||
|
||||
fun toGetCalculateByCreator(): GetCalculateByCreatorItem {
|
||||
// 원화 = totalCoin * 100 ( 캔 1개 = 100원 )
|
||||
val totalKrw = BigDecimal(totalCan).multiply(BigDecimal(100))
|
||||
@@ -17,12 +23,17 @@ data class GetCalculateByCreatorQueryData @QueryProjection constructor(
|
||||
// 결제수수료 : 6.6%
|
||||
val paymentFee = totalKrw.multiply(BigDecimal(0.066))
|
||||
|
||||
// 정산금액 = (원화 - 결제수수료) 의 70%
|
||||
val settlementAmount = if (settlementRatio != null) {
|
||||
totalKrw.subtract(paymentFee).multiply(BigDecimal(settlementRatio).divide(BigDecimal(100.0)))
|
||||
// 구정책과 신정책 기여액은 합산한 뒤 각 응답 필드에서 반올림한다.
|
||||
val oldPolicyKrw = BigDecimal(totalCan - newPolicyCan).multiply(BigDecimal(100))
|
||||
val oldPolicyNet = oldPolicyKrw.subtract(oldPolicyKrw.multiply(BigDecimal(0.066)))
|
||||
val oldSettlementAmount = if (settlementRatio != null) {
|
||||
oldPolicyNet.multiply(BigDecimal(settlementRatio).divide(BigDecimal(100.0)))
|
||||
} else {
|
||||
totalKrw.subtract(paymentFee).multiply(BigDecimal(0.7))
|
||||
oldPolicyNet.multiply(BigDecimal(0.7))
|
||||
}
|
||||
val settlementAmount = oldSettlementAmount.add(
|
||||
BigDecimal(newPolicyWeightedRatioCan).multiply(BigDecimal.ONE.subtract(BigDecimal(0.066)))
|
||||
)
|
||||
|
||||
// 원천세 = 정산금액의 3.3%
|
||||
val tax = settlementAmount.multiply(BigDecimal(0.033))
|
||||
|
||||
+23
-5
@@ -11,8 +11,21 @@ data class GetCalculateCommunityPostQueryData @QueryProjection constructor(
|
||||
val can: Int,
|
||||
val numberOfPurchase: Long,
|
||||
val totalCan: Int,
|
||||
val settlementRatio: Int?
|
||||
val settlementRatio: Int?,
|
||||
val newPolicyCan: Int = 0,
|
||||
val newPolicyWeightedRatioCan: Long = 0
|
||||
) {
|
||||
@QueryProjection
|
||||
constructor(
|
||||
nickname: String,
|
||||
title: String,
|
||||
date: String,
|
||||
can: Int,
|
||||
numberOfPurchase: Long,
|
||||
totalCan: Int,
|
||||
settlementRatio: Int?
|
||||
) : this(nickname, title, date, can, numberOfPurchase, totalCan, settlementRatio, 0, 0)
|
||||
|
||||
fun toGetCalculateCommunityPostResponse(): GetCalculateCommunityPostResponse {
|
||||
// 원화 = totalCoin * 100 ( 캔 1개 = 100원 )
|
||||
val totalKrw = BigDecimal(totalCan).multiply(BigDecimal(100))
|
||||
@@ -20,12 +33,17 @@ data class GetCalculateCommunityPostQueryData @QueryProjection constructor(
|
||||
// 결제수수료 : 6.6%
|
||||
val paymentFee = totalKrw.multiply(BigDecimal(0.066))
|
||||
|
||||
// 정산금액 = (원화 - 결제수수료) 의 70%
|
||||
val settlementAmount = if (settlementRatio != null) {
|
||||
totalKrw.subtract(paymentFee).multiply(BigDecimal(settlementRatio).divide(BigDecimal(100.0)))
|
||||
// 구정책과 신정책 기여액은 합산한 뒤 각 응답 필드에서 반올림한다.
|
||||
val oldPolicyKrw = BigDecimal(totalCan - newPolicyCan).multiply(BigDecimal(100))
|
||||
val oldPolicyNet = oldPolicyKrw.subtract(oldPolicyKrw.multiply(BigDecimal(0.066)))
|
||||
val oldSettlementAmount = if (settlementRatio != null) {
|
||||
oldPolicyNet.multiply(BigDecimal(settlementRatio).divide(BigDecimal(100.0)))
|
||||
} else {
|
||||
totalKrw.subtract(paymentFee).multiply(BigDecimal(0.7))
|
||||
oldPolicyNet.multiply(BigDecimal(0.7))
|
||||
}
|
||||
val settlementAmount = oldSettlementAmount.add(
|
||||
BigDecimal(newPolicyWeightedRatioCan).multiply(BigDecimal.ONE.subtract(BigDecimal(0.066)))
|
||||
)
|
||||
|
||||
// 원천세 = 정산금액의 3.3%
|
||||
val tax = settlementAmount.multiply(BigDecimal(0.033))
|
||||
|
||||
+20
-5
@@ -18,8 +18,21 @@ data class GetCalculateContentDonationQueryData @QueryProjection constructor(
|
||||
// 인원
|
||||
val numberOfDonation: Long,
|
||||
// 합계
|
||||
val totalCan: Int
|
||||
val totalCan: Int,
|
||||
val newPolicyCan: Int = 0,
|
||||
val newPolicyWeightedRatioCan: Long = 0
|
||||
) {
|
||||
@QueryProjection
|
||||
constructor(
|
||||
nickname: String,
|
||||
title: String,
|
||||
price: Int,
|
||||
registrationDate: String,
|
||||
donationDate: String,
|
||||
numberOfDonation: Long,
|
||||
totalCan: Int
|
||||
) : this(nickname, title, price, registrationDate, donationDate, numberOfDonation, totalCan, 0, 0)
|
||||
|
||||
companion object {
|
||||
private val KRW_PER_CAN = BigDecimal("100")
|
||||
private val PAYMENT_FEE_RATE = BigDecimal("0.066")
|
||||
@@ -34,10 +47,12 @@ data class GetCalculateContentDonationQueryData @QueryProjection constructor(
|
||||
// 결제수수료 : 6.6%
|
||||
val paymentFee = totalKrw.multiply(PAYMENT_FEE_RATE)
|
||||
|
||||
// 정산금액
|
||||
// 유료콘텐츠 (원화 - 결제수수료) 의 70%
|
||||
// 무료콘텐츠 (원화 - 결제수수료) 의 70%
|
||||
val settlementAmount = totalKrw.subtract(paymentFee).multiply(SETTLEMENT_RATE)
|
||||
// 구정책과 신정책 기여액은 합산한 뒤 각 응답 필드에서 반올림한다.
|
||||
val oldPolicyKrw = BigDecimal(totalCan - newPolicyCan).multiply(KRW_PER_CAN)
|
||||
val oldSettlementAmount = oldPolicyKrw.subtract(oldPolicyKrw.multiply(PAYMENT_FEE_RATE)).multiply(SETTLEMENT_RATE)
|
||||
val settlementAmount = oldSettlementAmount.add(
|
||||
BigDecimal(newPolicyWeightedRatioCan).multiply(BigDecimal.ONE.subtract(PAYMENT_FEE_RATE))
|
||||
)
|
||||
|
||||
// 원천세 = 정산금액의 3.3%
|
||||
val tax = settlementAmount.multiply(TAX_RATE)
|
||||
|
||||
+39
-5
@@ -25,8 +25,37 @@ data class GetCalculateContentQueryData @QueryProjection constructor(
|
||||
// 포인트
|
||||
val totalPoint: Int,
|
||||
// 정산비율
|
||||
val settlementRatio: Int?
|
||||
val settlementRatio: Int?,
|
||||
val newPolicyCan: Int = 0,
|
||||
val newPolicyWeightedRatioCan: Long = 0
|
||||
) {
|
||||
@QueryProjection
|
||||
constructor(
|
||||
nickname: String,
|
||||
title: String,
|
||||
registrationDate: String,
|
||||
saleDate: String,
|
||||
orderType: OrderType,
|
||||
orderPrice: Int,
|
||||
numberOfPeople: Long,
|
||||
totalCan: Int,
|
||||
totalPoint: Int,
|
||||
settlementRatio: Int?
|
||||
) : this(
|
||||
nickname,
|
||||
title,
|
||||
registrationDate,
|
||||
saleDate,
|
||||
orderType,
|
||||
orderPrice,
|
||||
numberOfPeople,
|
||||
totalCan,
|
||||
totalPoint,
|
||||
settlementRatio,
|
||||
0,
|
||||
0
|
||||
)
|
||||
|
||||
fun toGetCalculateContentResponse(): GetCalculateContentResponse {
|
||||
val orderTypeStr = if (totalPoint > 0) {
|
||||
"포인트"
|
||||
@@ -42,12 +71,17 @@ data class GetCalculateContentQueryData @QueryProjection constructor(
|
||||
// 결제수수료 : 6.6%
|
||||
val paymentFee = totalKrw.multiply(BigDecimal(0.066))
|
||||
|
||||
// 정산금액 = (원화 - 결제수수료) 의 70%
|
||||
val settlementAmount = if (settlementRatio != null) {
|
||||
totalKrw.subtract(paymentFee).multiply(BigDecimal(settlementRatio).divide(BigDecimal(100.0)))
|
||||
// 구정책과 신정책 기여액은 합산한 뒤 각 응답 필드에서 반올림한다.
|
||||
val oldPolicyKrw = BigDecimal(totalCan - newPolicyCan).multiply(BigDecimal(100))
|
||||
val oldPolicyNet = oldPolicyKrw.subtract(oldPolicyKrw.multiply(BigDecimal(0.066)))
|
||||
val oldSettlementAmount = if (settlementRatio != null) {
|
||||
oldPolicyNet.multiply(BigDecimal(settlementRatio).divide(BigDecimal(100.0)))
|
||||
} else {
|
||||
totalKrw.subtract(paymentFee).multiply(BigDecimal(0.7))
|
||||
oldPolicyNet.multiply(BigDecimal(0.7))
|
||||
}
|
||||
val settlementAmount = oldSettlementAmount.add(
|
||||
BigDecimal(newPolicyWeightedRatioCan).multiply(BigDecimal.ONE.subtract(BigDecimal(0.066)))
|
||||
)
|
||||
|
||||
// 원천세 = 정산금액의 3.3%
|
||||
val tax = settlementAmount.multiply(BigDecimal(0.033))
|
||||
|
||||
+25
-5
@@ -20,8 +20,23 @@ data class GetCalculateLiveQueryData @QueryProjection constructor(
|
||||
// 합계
|
||||
val totalAmount: Int,
|
||||
// 정산비율
|
||||
val settlementRatio: Int?
|
||||
val settlementRatio: Int?,
|
||||
val newPolicyCan: Int = 0,
|
||||
val newPolicyWeightedRatioCan: Long = 0
|
||||
) {
|
||||
@QueryProjection
|
||||
constructor(
|
||||
nickname: String,
|
||||
date: String,
|
||||
title: String,
|
||||
roomId: Long,
|
||||
entranceFee: Int,
|
||||
canUsage: CanUsage,
|
||||
memberCount: Long,
|
||||
totalAmount: Int,
|
||||
settlementRatio: Int?
|
||||
) : this(nickname, date, title, roomId, entranceFee, canUsage, memberCount, totalAmount, settlementRatio, 0, 0)
|
||||
|
||||
fun toGetCalculateLiveResponse(): GetCalculateLiveResponse {
|
||||
val canUsageStr = when (canUsage) {
|
||||
CanUsage.LIVE -> {
|
||||
@@ -53,12 +68,17 @@ data class GetCalculateLiveQueryData @QueryProjection constructor(
|
||||
// 결제수수료 : 6.6%
|
||||
val paymentFee = totalKrw.multiply(BigDecimal(0.066))
|
||||
|
||||
// 정산금액 = (원화 - 결제수수료) 의 70%
|
||||
val settlementAmount = if (settlementRatio != null) {
|
||||
totalKrw.subtract(paymentFee).multiply(BigDecimal(settlementRatio).divide(BigDecimal(100.0)))
|
||||
// 구정책과 신정책 기여액은 합산한 뒤 각 응답 필드에서 반올림한다.
|
||||
val oldPolicyKrw = BigDecimal(totalAmount - newPolicyCan).multiply(BigDecimal(100))
|
||||
val oldPolicyNet = oldPolicyKrw.subtract(oldPolicyKrw.multiply(BigDecimal(0.066)))
|
||||
val oldSettlementAmount = if (settlementRatio != null) {
|
||||
oldPolicyNet.multiply(BigDecimal(settlementRatio).divide(BigDecimal(100.0)))
|
||||
} else {
|
||||
totalKrw.subtract(paymentFee).multiply(BigDecimal(0.7))
|
||||
oldPolicyNet.multiply(BigDecimal(0.7))
|
||||
}
|
||||
val settlementAmount = oldSettlementAmount.add(
|
||||
BigDecimal(newPolicyWeightedRatioCan).multiply(BigDecimal.ONE.subtract(BigDecimal(0.066)))
|
||||
)
|
||||
|
||||
// 원천세 = 정산금액의 3.3%
|
||||
val tax = settlementAmount.multiply(BigDecimal(0.033))
|
||||
|
||||
+27
-5
@@ -24,8 +24,25 @@ data class GetCumulativeSalesByContentQueryData @QueryProjection constructor(
|
||||
// 포인트
|
||||
val totalPoint: Int,
|
||||
// 정산비율
|
||||
val settlementRatio: Int?
|
||||
val settlementRatio: Int?,
|
||||
val newPolicyCan: Int = 0,
|
||||
val newPolicyWeightedRatioCan: Long = 0
|
||||
) {
|
||||
@QueryProjection
|
||||
constructor(
|
||||
nickname: String,
|
||||
title: String,
|
||||
registrationDate: String,
|
||||
orderType: OrderType,
|
||||
orderPrice: Int,
|
||||
numberOfPeople: Long,
|
||||
totalCan: Int,
|
||||
totalPoint: Int,
|
||||
settlementRatio: Int?
|
||||
) : this(
|
||||
nickname, title, registrationDate, orderType, orderPrice, numberOfPeople, totalCan, totalPoint, settlementRatio, 0, 0
|
||||
)
|
||||
|
||||
fun toCumulativeSalesByContentItem(): CumulativeSalesByContentItem {
|
||||
val orderTypeStr = if (totalPoint > 0) {
|
||||
"포인트"
|
||||
@@ -41,12 +58,17 @@ data class GetCumulativeSalesByContentQueryData @QueryProjection constructor(
|
||||
// 결제수수료 : 6.6%
|
||||
val paymentFee = totalKrw.multiply(BigDecimal(0.066))
|
||||
|
||||
// 정산금액 = (원화 - 결제수수료) 의 70%
|
||||
val settlementAmount = if (settlementRatio != null) {
|
||||
totalKrw.subtract(paymentFee).multiply(BigDecimal(settlementRatio).divide(BigDecimal(100.0)))
|
||||
// 구정책과 신정책 기여액은 합산한 뒤 각 응답 필드에서 반올림한다.
|
||||
val oldPolicyKrw = BigDecimal(totalCan - newPolicyCan).multiply(BigDecimal(100))
|
||||
val oldPolicyNet = oldPolicyKrw.subtract(oldPolicyKrw.multiply(BigDecimal(0.066)))
|
||||
val oldSettlementAmount = if (settlementRatio != null) {
|
||||
oldPolicyNet.multiply(BigDecimal(settlementRatio).divide(BigDecimal(100.0)))
|
||||
} else {
|
||||
totalKrw.subtract(paymentFee).multiply(BigDecimal(0.7))
|
||||
oldPolicyNet.multiply(BigDecimal(0.7))
|
||||
}
|
||||
val settlementAmount = oldSettlementAmount.add(
|
||||
BigDecimal(newPolicyWeightedRatioCan).multiply(BigDecimal.ONE.subtract(BigDecimal(0.066)))
|
||||
)
|
||||
|
||||
// 원천세 = 정산금액의 3.3%
|
||||
val tax = settlementAmount.multiply(BigDecimal(0.033))
|
||||
|
||||
+101
@@ -0,0 +1,101 @@
|
||||
package kr.co.vividnext.sodalive.v2.settlement
|
||||
|
||||
import kr.co.vividnext.sodalive.admin.calculate.GetCalculateByCreatorQueryData
|
||||
import kr.co.vividnext.sodalive.admin.calculate.GetCalculateCommunityPostQueryData
|
||||
import kr.co.vividnext.sodalive.admin.calculate.GetCalculateContentDonationQueryData
|
||||
import kr.co.vividnext.sodalive.admin.calculate.GetCalculateContentQueryData
|
||||
import kr.co.vividnext.sodalive.admin.calculate.GetCalculateLiveQueryData
|
||||
import kr.co.vividnext.sodalive.admin.calculate.GetCumulativeSalesByContentQueryData
|
||||
import kr.co.vividnext.sodalive.can.use.CanUsage
|
||||
import kr.co.vividnext.sodalive.content.order.OrderType
|
||||
import org.junit.jupiter.api.Assertions.assertEquals
|
||||
import org.junit.jupiter.api.DisplayName
|
||||
import org.junit.jupiter.params.ParameterizedTest
|
||||
import org.junit.jupiter.params.provider.CsvSource
|
||||
|
||||
class CountrySettlementCalculationTest {
|
||||
@ParameterizedTest
|
||||
@CsvSource(
|
||||
"2,1,75,,200,13,135,4,131",
|
||||
"3,2,125,,300,20,182,6,176",
|
||||
"2,2,150,,200,13,140,5,135",
|
||||
"0,0,0,,0,0,0,0,0",
|
||||
"-2,-1,-75,,-200,-13,-135,-4,-131",
|
||||
"100,0,0,,10000,660,6538,216,6322"
|
||||
)
|
||||
@DisplayName("여섯 일반 매핑은 구정책과 신정책 기여액을 합한 뒤 필드별로 반올림한다")
|
||||
fun shouldCombineUnroundedContributions(
|
||||
total: Int,
|
||||
newCan: Int,
|
||||
weighted: Long,
|
||||
ratio: Int?,
|
||||
krw: Int,
|
||||
fee: Int,
|
||||
settlement: Int,
|
||||
tax: Int,
|
||||
deposit: Int
|
||||
) {
|
||||
val amounts = mapAmounts(total, newCan, weighted, ratio)
|
||||
|
||||
amounts.forEach { assertEquals(listOf(krw, fee, settlement, tax, deposit), it) }
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@CsvSource("2,1,75,80,145,5,140", "100,0,0,80,7472,247,7225")
|
||||
@DisplayName("개별 구정책 비율은 신정책 기여액에 다시 적용하지 않는다")
|
||||
fun shouldPreserveIndividualLegacyRatio(
|
||||
total: Int,
|
||||
newCan: Int,
|
||||
weighted: Long,
|
||||
ratio: Int,
|
||||
settlement: Int,
|
||||
tax: Int,
|
||||
deposit: Int
|
||||
) {
|
||||
val amounts = mapAmounts(total, newCan, weighted, ratio)
|
||||
|
||||
amounts.dropLast(1).forEach { assertEquals(listOf(settlement, tax, deposit), it.drop(2)) }
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@CsvSource("125,,8172,8173", "10,75,700,654")
|
||||
@DisplayName("Double 기반 구정책 반올림과 콘텐츠 후원의 정확한 십진 상수 차이를 보존한다")
|
||||
fun shouldPreserveLegacyDecimalArtifacts(total: Int, ratio: Int?, expected: Int, donationExpected: Int) {
|
||||
val amounts = mapAmounts(total, 0, 0, ratio)
|
||||
|
||||
assertEquals(List(5) { expected } + donationExpected, amounts.map { it[2] })
|
||||
}
|
||||
|
||||
private fun mapAmounts(total: Int, newCan: Int, weighted: Long, ratio: Int?): List<List<Int>> {
|
||||
val live = GetCalculateLiveQueryData(
|
||||
"creator", "2026-11-18", "live", 1, 1, CanUsage.LIVE, 1, total, ratio, newCan, weighted
|
||||
).toGetCalculateLiveResponse()
|
||||
val content = GetCalculateContentQueryData(
|
||||
"creator", "content", "2026-11-18", "2026-11-18", OrderType.KEEP, 1, 1, total, 0, ratio, newCan, weighted
|
||||
).toGetCalculateContentResponse()
|
||||
val community = GetCalculateCommunityPostQueryData(
|
||||
"creator", "post", "2026-11-18", 1, 1, total, ratio, newCan, weighted
|
||||
).toGetCalculateCommunityPostResponse()
|
||||
val creator = GetCalculateByCreatorQueryData(1, "creator", total, ratio, newCan, weighted).toGetCalculateByCreator()
|
||||
val cumulative = GetCumulativeSalesByContentQueryData(
|
||||
"creator", "content", "2026-11-18", OrderType.KEEP, 1, 1, total, 0, ratio, newCan, weighted
|
||||
).toCumulativeSalesByContentItem()
|
||||
val donation = GetCalculateContentDonationQueryData(
|
||||
"creator", "content", 1, "2026-11-18", "2026-11-18", 1, total, newCan, weighted
|
||||
).toGetCalculateContentDonationResponse()
|
||||
return listOf(
|
||||
listOf(live.totalKrw, live.paymentFee, live.settlementAmount, live.tax, live.depositAmount),
|
||||
listOf(content.totalKrw, content.paymentFee, content.settlementAmount, content.tax, content.depositAmount),
|
||||
listOf(community.totalKrw, community.paymentFee, community.settlementAmount, community.tax, community.depositAmount),
|
||||
listOf(creator.totalKrw, creator.paymentFee, creator.settlementAmount, creator.tax, creator.depositAmount),
|
||||
listOf(
|
||||
cumulative.totalKrw,
|
||||
cumulative.paymentFee,
|
||||
cumulative.settlementAmount,
|
||||
cumulative.tax,
|
||||
cumulative.depositAmount
|
||||
),
|
||||
listOf(donation.totalKrw, donation.paymentFee, donation.settlementAmount, donation.tax, donation.depositAmount)
|
||||
)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user