From e2fa126a6737647f0a2335470afd85c5c41dc62a Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 11 Jun 2024 16:53:24 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=BD=98?= =?UTF-8?q?=ED=85=90=EC=B8=A0,=20=EC=BB=A4=EB=AE=A4=EB=8B=88=ED=8B=B0=20?= =?UTF-8?q?=EC=A0=95=EC=82=B0=20-=20=ED=81=AC=EB=A6=AC=EC=97=90=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20=EC=A0=95=EC=82=B0=20=EC=B6=94=EA=B0=80=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=EA=B0=80=20=EC=9E=88=EC=9C=BC=EB=A9=B4=20?= =?UTF-8?q?=ED=95=B4=EB=8B=B9=20=EB=8D=B0=EC=9D=B4=ED=84=B0=EC=97=90=20?= =?UTF-8?q?=EC=9E=85=EB=A0=A5=EB=90=9C=20=EC=A0=95=EC=82=B0=EB=B9=84?= =?UTF-8?q?=EC=9C=A8=EB=A1=9C=20=EA=B3=84=EC=82=B0=EB=90=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AdminCalculateQueryRepository.kt | 20 +++++++++++++---- .../GetCalculateCommunityPostQueryData.kt | 9 ++++++-- .../calculate/GetCalculateContentQueryData.kt | 10 +++++++-- .../CreatorAdminCalculateQueryRepository.kt | 22 ++++++++++++++----- 4 files changed, 48 insertions(+), 13 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateQueryRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateQueryRepository.kt index fde456b..ac92331 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateQueryRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateQueryRepository.kt @@ -61,18 +61,27 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) { order.type, order.can, order.id.count(), - order.can.sum() + order.can.sum(), + creatorSettlementRatio.contentSettlementRatio ) ) .from(order) .innerJoin(order.audioContent, audioContent) .innerJoin(audioContent.member, member) + .leftJoin(creatorSettlementRatio) + .on(member.id.eq(creatorSettlementRatio.member.id)) .where( order.createdAt.goe(startDate) .and(order.createdAt.loe(endDate)) .and(order.isActive.isTrue) ) - .groupBy(audioContent.id, order.type, orderFormattedDate, order.can) + .groupBy( + audioContent.id, + order.type, + orderFormattedDate, + order.can, + creatorSettlementRatio.contentSettlementRatio + ) .orderBy(member.id.desc(), orderFormattedDate.desc(), audioContent.id.asc()) .fetch() } @@ -191,19 +200,22 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) { formattedDate, creatorCommunity.price, useCan.id.count(), - useCan.can.add(useCan.rewardCan).sum() + useCan.can.add(useCan.rewardCan).sum(), + creatorSettlementRatio.communitySettlementRatio ) ) .from(useCan) .innerJoin(useCan.communityPost, creatorCommunity) .innerJoin(creatorCommunity.member, member) + .leftJoin(creatorSettlementRatio) + .on(member.id.eq(creatorSettlementRatio.member.id)) .where( useCan.isRefund.isFalse .and(useCan.canUsage.eq(CanUsage.PAID_COMMUNITY_POST)) .and(useCan.createdAt.goe(startDate)) .and(useCan.createdAt.loe(endDate)) ) - .groupBy(formattedDate, creatorCommunity.id) + .groupBy(formattedDate, creatorCommunity.id, creatorSettlementRatio.communitySettlementRatio) .orderBy(member.id.asc(), formattedDate.desc()) .offset(offset) .limit(limit) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateCommunityPostQueryData.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateCommunityPostQueryData.kt index d0d5a48..4bd63db 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateCommunityPostQueryData.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateCommunityPostQueryData.kt @@ -9,12 +9,17 @@ data class GetCalculateCommunityPostQueryData @QueryProjection constructor( val date: String, val can: Int, val numberOfPurchase: Long, - val totalCan: Int + val totalCan: Int, + val settlementRatio: Int? ) { fun toGetCalculateCommunityPostResponse(): GetCalculateCommunityPostResponse { val totalKrw = totalCan * 100 val paymentFee = totalKrw * 0.066f - val settlementAmount = (totalKrw.toFloat() - paymentFee) * 0.7 + val settlementAmount = if (settlementRatio != null) { + (totalKrw.toFloat() - paymentFee) * (settlementRatio.toFloat() / 100.0f) + } else { + (totalKrw.toFloat() - paymentFee) * 0.7f + } val tax = settlementAmount * 0.033 val depositAmount = settlementAmount - tax diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateContentQueryData.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateContentQueryData.kt index d26e17d..b886d53 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateContentQueryData.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateContentQueryData.kt @@ -20,7 +20,9 @@ data class GetCalculateContentQueryData @QueryProjection constructor( // 인원 val numberOfPeople: Long, // 합계 - val totalCan: Int + val totalCan: Int, + // 정산비율 + val settlementRatio: Int? ) { fun toGetCalculateContentResponse(): GetCalculateContentResponse { val orderTypeStr = if (orderType == OrderType.RENTAL) { @@ -36,7 +38,11 @@ data class GetCalculateContentQueryData @QueryProjection constructor( val paymentFee = totalKrw * 0.066f // 정산금액 = (원화 - 결제수수료) 의 70% - val settlementAmount = (totalKrw.toFloat() - paymentFee) * 0.7 + val settlementAmount = if (settlementRatio != null) { + (totalKrw.toFloat() - paymentFee) * (settlementRatio.toFloat() / 100.0f) + } else { + (totalKrw.toFloat() - paymentFee) * 0.7f + } // 원천세 = 정산금액의 3.3% val tax = settlementAmount * 0.033 diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateQueryRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateQueryRepository.kt index ef433f5..7f56747 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateQueryRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateQueryRepository.kt @@ -59,7 +59,7 @@ class CreatorAdminCalculateQueryRepository(private val queryFactory: JPAQueryFac .and(liveRoom.beginDateTime.loe(endDate)) .and(liveRoom.member.id.eq(memberId)) ) - .groupBy(liveRoom.id, useCan.canUsage) + .groupBy(liveRoom.id, useCan.canUsage, creatorSettlementRatio.liveSettlementRatio) .orderBy(liveRoom.id.desc(), useCan.canUsage.desc(), formattedDate.desc()) .fetch() } @@ -105,19 +105,28 @@ class CreatorAdminCalculateQueryRepository(private val queryFactory: JPAQueryFac order.type, order.can, order.id.count(), - order.can.sum() + order.can.sum(), + creatorSettlementRatio.contentSettlementRatio ) ) .from(order) .innerJoin(order.audioContent, audioContent) .innerJoin(audioContent.member, member) + .leftJoin(creatorSettlementRatio) + .on(member.id.eq(creatorSettlementRatio.member.id)) .where( order.createdAt.goe(startDate) .and(order.createdAt.loe(endDate)) .and(order.isActive.isTrue) .and(order.creator.id.eq(memberId)) ) - .groupBy(audioContent.id, order.type, orderFormattedDate, order.can) + .groupBy( + audioContent.id, + order.type, + orderFormattedDate, + order.can, + creatorSettlementRatio.contentSettlementRatio + ) .offset(offset) .limit(limit) .orderBy(member.id.desc(), orderFormattedDate.desc(), audioContent.id.asc()) @@ -279,12 +288,15 @@ class CreatorAdminCalculateQueryRepository(private val queryFactory: JPAQueryFac formattedDate, creatorCommunity.price, useCan.id.count(), - useCan.can.add(useCan.rewardCan).sum() + useCan.can.add(useCan.rewardCan).sum(), + creatorSettlementRatio.communitySettlementRatio ) ) .from(useCan) .innerJoin(useCan.communityPost, creatorCommunity) .innerJoin(creatorCommunity.member, member) + .leftJoin(creatorSettlementRatio) + .on(member.id.eq(creatorSettlementRatio.member.id)) .where( useCan.isRefund.isFalse .and(useCan.canUsage.eq(CanUsage.PAID_COMMUNITY_POST)) @@ -292,7 +304,7 @@ class CreatorAdminCalculateQueryRepository(private val queryFactory: JPAQueryFac .and(useCan.createdAt.loe(endDate)) .and(creatorCommunity.member.id.eq(memberId)) ) - .groupBy(formattedDate, creatorCommunity.id) + .groupBy(formattedDate, creatorCommunity.id, creatorSettlementRatio.communitySettlementRatio) .orderBy(member.id.asc(), formattedDate.desc()) .offset(offset) .limit(limit)