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 c0b4eef..b116762 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 @@ -185,6 +185,7 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) { member.nickname, Expressions.stringTemplate("substring({0}, 1, 10)", creatorCommunity.content), formattedDate, + creatorCommunity.price, useCan.id.count(), useCan.can.add(useCan.rewardCan).sum() ) 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 3ab85d2..d0d5a48 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 @@ -7,6 +7,7 @@ data class GetCalculateCommunityPostQueryData @QueryProjection constructor( val nickname: String, val title: String, val date: String, + val can: Int, val numberOfPurchase: Long, val totalCan: Int ) { @@ -21,6 +22,7 @@ data class GetCalculateCommunityPostQueryData @QueryProjection constructor( nickname = nickname, title = title, date = date, + can = can, numberOfPurchase = numberOfPurchase.toInt(), totalCan = totalCan, totalKrw = totalKrw, diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateCommunityPostResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateCommunityPostResponse.kt index d2adac5..04c3cfa 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateCommunityPostResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateCommunityPostResponse.kt @@ -6,6 +6,7 @@ data class GetCalculateCommunityPostResponse( @JsonProperty("nickname") val nickname: String, @JsonProperty("title") val title: String, @JsonProperty("date") val date: String, + @JsonProperty("can") val can: Int, @JsonProperty("numberOfPurchase") val numberOfPurchase: Int, @JsonProperty("totalCan") val totalCan: Int, @JsonProperty("totalKrw") val totalKrw: Int, 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 1673c98..7c534d4 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 @@ -273,6 +273,7 @@ class CreatorAdminCalculateQueryRepository(private val queryFactory: JPAQueryFac member.nickname, Expressions.stringTemplate("substring({0}, 1, 10)", creatorCommunity.content), formattedDate, + creatorCommunity.price, useCan.id.count(), useCan.can.add(useCan.rewardCan).sum() )