크리에이터 콘텐츠 정산 - API 추가 #78
| @@ -93,6 +93,7 @@ class AdminCalculateService(private val repository: AdminCalculateQueryRepositor | |||||||
|  |  | ||||||
|         return repository |         return repository | ||||||
|             .getCalculateContentList(startDate, endDate) |             .getCalculateContentList(startDate, endDate) | ||||||
|  |             .asSequence() | ||||||
|             .map { |             .map { | ||||||
|                 val orderTypeStr = if (it.orderType == OrderType.RENTAL) { |                 val orderTypeStr = if (it.orderType == OrderType.RENTAL) { | ||||||
|                     "대여" |                     "대여" | ||||||
|   | |||||||
| @@ -3,6 +3,7 @@ package kr.co.vividnext.sodalive.creator.admin.calculate | |||||||
| import kr.co.vividnext.sodalive.common.ApiResponse | import kr.co.vividnext.sodalive.common.ApiResponse | ||||||
| import kr.co.vividnext.sodalive.common.SodaException | import kr.co.vividnext.sodalive.common.SodaException | ||||||
| import kr.co.vividnext.sodalive.member.Member | import kr.co.vividnext.sodalive.member.Member | ||||||
|  | import org.springframework.data.domain.Pageable | ||||||
| import org.springframework.security.access.prepost.PreAuthorize | import org.springframework.security.access.prepost.PreAuthorize | ||||||
| import org.springframework.security.core.annotation.AuthenticationPrincipal | import org.springframework.security.core.annotation.AuthenticationPrincipal | ||||||
| import org.springframework.web.bind.annotation.GetMapping | import org.springframework.web.bind.annotation.GetMapping | ||||||
| @@ -23,4 +24,23 @@ class CreatorAdminCalculateController(private val service: CreatorAdminCalculate | |||||||
|         if (member == null) throw SodaException("로그인 정보를 확인해주세요.") |         if (member == null) throw SodaException("로그인 정보를 확인해주세요.") | ||||||
|         ApiResponse.ok(service.getCalculateLive(startDateStr, endDateStr, member)) |         ApiResponse.ok(service.getCalculateLive(startDateStr, endDateStr, member)) | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  |     @GetMapping("/content-list") | ||||||
|  |     fun getCalculateContentList( | ||||||
|  |         @RequestParam startDateStr: String, | ||||||
|  |         @RequestParam endDateStr: String, | ||||||
|  |         @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?, | ||||||
|  |         pageable: Pageable | ||||||
|  |     ) = run { | ||||||
|  |         if (member == null) throw SodaException("로그인 정보를 확인해주세요.") | ||||||
|  |         ApiResponse.ok( | ||||||
|  |             service.getCalculateContentList( | ||||||
|  |                 startDateStr, | ||||||
|  |                 endDateStr, | ||||||
|  |                 member.id!!, | ||||||
|  |                 pageable.offset, | ||||||
|  |                 pageable.pageSize.toLong() | ||||||
|  |             ) | ||||||
|  |         ) | ||||||
|  |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,12 +1,18 @@ | |||||||
| package kr.co.vividnext.sodalive.creator.admin.calculate | package kr.co.vividnext.sodalive.creator.admin.calculate | ||||||
|  |  | ||||||
|  | import com.querydsl.core.types.dsl.DateTimePath | ||||||
| import com.querydsl.core.types.dsl.Expressions | import com.querydsl.core.types.dsl.Expressions | ||||||
|  | import com.querydsl.core.types.dsl.StringTemplate | ||||||
| import com.querydsl.jpa.impl.JPAQueryFactory | import com.querydsl.jpa.impl.JPAQueryFactory | ||||||
|  | import kr.co.vividnext.sodalive.admin.calculate.GetCalculateContentQueryData | ||||||
| import kr.co.vividnext.sodalive.admin.calculate.GetCalculateLiveQueryData | import kr.co.vividnext.sodalive.admin.calculate.GetCalculateLiveQueryData | ||||||
|  | import kr.co.vividnext.sodalive.admin.calculate.QGetCalculateContentQueryData | ||||||
| import kr.co.vividnext.sodalive.admin.calculate.QGetCalculateLiveQueryData | import kr.co.vividnext.sodalive.admin.calculate.QGetCalculateLiveQueryData | ||||||
| import kr.co.vividnext.sodalive.can.use.QUseCan.useCan | import kr.co.vividnext.sodalive.can.use.QUseCan.useCan | ||||||
| import kr.co.vividnext.sodalive.can.use.QUseCanCalculate.useCanCalculate | import kr.co.vividnext.sodalive.can.use.QUseCanCalculate.useCanCalculate | ||||||
| import kr.co.vividnext.sodalive.can.use.UseCanCalculateStatus | import kr.co.vividnext.sodalive.can.use.UseCanCalculateStatus | ||||||
|  | import kr.co.vividnext.sodalive.content.QAudioContent.audioContent | ||||||
|  | import kr.co.vividnext.sodalive.content.order.QOrder.order | ||||||
| import kr.co.vividnext.sodalive.live.room.QLiveRoom.liveRoom | import kr.co.vividnext.sodalive.live.room.QLiveRoom.liveRoom | ||||||
| import kr.co.vividnext.sodalive.member.QMember.member | import kr.co.vividnext.sodalive.member.QMember.member | ||||||
| import org.springframework.stereotype.Repository | import org.springframework.stereotype.Repository | ||||||
| @@ -58,4 +64,82 @@ class CreatorAdminCalculateQueryRepository(private val queryFactory: JPAQueryFac | |||||||
|             .orderBy(formattedDate.desc()) |             .orderBy(formattedDate.desc()) | ||||||
|             .fetch() |             .fetch() | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  |     fun getCalculateContentListTotalCount( | ||||||
|  |         startDate: LocalDateTime, | ||||||
|  |         endDate: LocalDateTime, | ||||||
|  |         memberId: Long | ||||||
|  |     ): Int { | ||||||
|  |         val orderFormattedDate = getFormattedDate(order.createdAt) | ||||||
|  |         return queryFactory | ||||||
|  |             .select(audioContent.id) | ||||||
|  |             .from(useCanCalculate) | ||||||
|  |             .innerJoin(useCanCalculate.useCan, useCan) | ||||||
|  |             .innerJoin(useCan.order, order) | ||||||
|  |             .innerJoin(order.audioContent, audioContent) | ||||||
|  |             .innerJoin(audioContent.member, member) | ||||||
|  |             .where( | ||||||
|  |                 useCanCalculate.status.eq(UseCanCalculateStatus.RECEIVED) | ||||||
|  |                     .and(useCanCalculate.recipientCreatorId.eq(memberId)) | ||||||
|  |                     .and(order.createdAt.goe(startDate)) | ||||||
|  |                     .and(order.createdAt.loe(endDate)) | ||||||
|  |             ) | ||||||
|  |             .groupBy(audioContent.id, order.type, orderFormattedDate, order.can) | ||||||
|  |             .orderBy(member.id.desc(), orderFormattedDate.desc(), audioContent.id.asc()) | ||||||
|  |             .fetch() | ||||||
|  |             .size | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     fun getCalculateContentList( | ||||||
|  |         startDate: LocalDateTime, | ||||||
|  |         endDate: LocalDateTime, | ||||||
|  |         memberId: Long, | ||||||
|  |         offset: Long = 0, | ||||||
|  |         limit: Long = 20 | ||||||
|  |     ): List<GetCalculateContentQueryData> { | ||||||
|  |         val orderFormattedDate = getFormattedDate(order.createdAt) | ||||||
|  |         return queryFactory | ||||||
|  |             .select( | ||||||
|  |                 QGetCalculateContentQueryData( | ||||||
|  |                     member.nickname, | ||||||
|  |                     audioContent.title, | ||||||
|  |                     getFormattedDate(audioContent.createdAt), | ||||||
|  |                     orderFormattedDate, | ||||||
|  |                     order.type, | ||||||
|  |                     order.can, | ||||||
|  |                     order.id.count(), | ||||||
|  |                     order.can.sum() | ||||||
|  |                 ) | ||||||
|  |             ) | ||||||
|  |             .from(useCanCalculate) | ||||||
|  |             .innerJoin(useCanCalculate.useCan, useCan) | ||||||
|  |             .innerJoin(useCan.order, order) | ||||||
|  |             .innerJoin(order.audioContent, audioContent) | ||||||
|  |             .innerJoin(audioContent.member, member) | ||||||
|  |             .where( | ||||||
|  |                 useCanCalculate.status.eq(UseCanCalculateStatus.RECEIVED) | ||||||
|  |                     .and(useCanCalculate.recipientCreatorId.eq(memberId)) | ||||||
|  |                     .and(order.createdAt.goe(startDate)) | ||||||
|  |                     .and(order.createdAt.loe(endDate)) | ||||||
|  |             ) | ||||||
|  |             .groupBy(audioContent.id, order.type, orderFormattedDate, order.can) | ||||||
|  |             .orderBy(member.id.desc(), orderFormattedDate.desc(), audioContent.id.asc()) | ||||||
|  |             .offset(offset) | ||||||
|  |             .limit(limit) | ||||||
|  |             .fetch() | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     private fun getFormattedDate(dateTimePath: DateTimePath<LocalDateTime>): StringTemplate { | ||||||
|  |         return Expressions.stringTemplate( | ||||||
|  |             "DATE_FORMAT({0}, {1})", | ||||||
|  |             Expressions.dateTimeTemplate( | ||||||
|  |                 LocalDateTime::class.java, | ||||||
|  |                 "CONVERT_TZ({0},{1},{2})", | ||||||
|  |                 dateTimePath, | ||||||
|  |                 "UTC", | ||||||
|  |                 "Asia/Seoul" | ||||||
|  |             ), | ||||||
|  |             "%Y-%m-%d" | ||||||
|  |         ) | ||||||
|  |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,7 +1,9 @@ | |||||||
| package kr.co.vividnext.sodalive.creator.admin.calculate | package kr.co.vividnext.sodalive.creator.admin.calculate | ||||||
|  |  | ||||||
|  | import kr.co.vividnext.sodalive.admin.calculate.GetCalculateContentResponse | ||||||
| import kr.co.vividnext.sodalive.admin.calculate.GetCalculateLiveResponse | import kr.co.vividnext.sodalive.admin.calculate.GetCalculateLiveResponse | ||||||
| import kr.co.vividnext.sodalive.can.use.CanUsage | import kr.co.vividnext.sodalive.can.use.CanUsage | ||||||
|  | import kr.co.vividnext.sodalive.content.order.OrderType | ||||||
| import kr.co.vividnext.sodalive.member.Member | import kr.co.vividnext.sodalive.member.Member | ||||||
| import org.springframework.stereotype.Service | import org.springframework.stereotype.Service | ||||||
| import java.time.LocalDate | import java.time.LocalDate | ||||||
| @@ -72,4 +74,68 @@ class CreatorAdminCalculateService(private val repository: CreatorAdminCalculate | |||||||
|             } |             } | ||||||
|             .toList() |             .toList() | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  |     fun getCalculateContentList( | ||||||
|  |         startDateStr: String, | ||||||
|  |         endDateStr: String, | ||||||
|  |         memberId: Long, | ||||||
|  |         offset: Long, | ||||||
|  |         limit: Long | ||||||
|  |     ): GetCalculateContentListResponse { | ||||||
|  |         val dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd") | ||||||
|  |         val startDate = LocalDate.parse(startDateStr, dateTimeFormatter).atTime(0, 0, 0) | ||||||
|  |             .atZone(ZoneId.of("Asia/Seoul")) | ||||||
|  |             .withZoneSameInstant(ZoneId.of("UTC")) | ||||||
|  |             .toLocalDateTime() | ||||||
|  |  | ||||||
|  |         val endDate = LocalDate.parse(endDateStr, dateTimeFormatter).atTime(23, 59, 59) | ||||||
|  |             .atZone(ZoneId.of("Asia/Seoul")) | ||||||
|  |             .withZoneSameInstant(ZoneId.of("UTC")) | ||||||
|  |             .toLocalDateTime() | ||||||
|  |  | ||||||
|  |         val totalCount = repository.getCalculateContentListTotalCount(startDate, endDate, memberId) | ||||||
|  |         val items = repository.getCalculateContentList(startDate, endDate, memberId, offset, limit) | ||||||
|  |             .asSequence() | ||||||
|  |             .map { | ||||||
|  |                 val orderTypeStr = if (it.orderType == OrderType.RENTAL) { | ||||||
|  |                     "대여" | ||||||
|  |                 } else { | ||||||
|  |                     "소장" | ||||||
|  |                 } | ||||||
|  |  | ||||||
|  |                 // 원화 = totalCoin * 100 ( 캔 1개 = 100원 ) | ||||||
|  |                 val totalKrw = it.totalCan * 100 | ||||||
|  |  | ||||||
|  |                 // 결제수수료 : 6.6% | ||||||
|  |                 val paymentFee = totalKrw * 0.066f | ||||||
|  |  | ||||||
|  |                 // 정산금액 = (원화 - 결제수수료) 의 70% | ||||||
|  |                 val settlementAmount = (totalKrw.toFloat() - paymentFee) * 0.7 | ||||||
|  |  | ||||||
|  |                 // 원천세 = 정산금액의 3.3% | ||||||
|  |                 val tax = settlementAmount * 0.033 | ||||||
|  |  | ||||||
|  |                 // 입금액 | ||||||
|  |                 val depositAmount = settlementAmount - tax | ||||||
|  |  | ||||||
|  |                 GetCalculateContentResponse( | ||||||
|  |                     nickname = it.nickname, | ||||||
|  |                     title = it.title, | ||||||
|  |                     registrationDate = it.registrationDate, | ||||||
|  |                     saleDate = it.saleDate, | ||||||
|  |                     orderType = orderTypeStr, | ||||||
|  |                     orderPrice = it.orderPrice, | ||||||
|  |                     numberOfPeople = it.numberOfPeople.toInt(), | ||||||
|  |                     totalCan = it.totalCan, | ||||||
|  |                     totalKrw = totalKrw, | ||||||
|  |                     paymentFee = paymentFee.roundToInt(), | ||||||
|  |                     settlementAmount = settlementAmount.roundToInt(), | ||||||
|  |                     tax = tax.roundToInt(), | ||||||
|  |                     depositAmount = depositAmount.roundToInt() | ||||||
|  |                 ) | ||||||
|  |             } | ||||||
|  |             .toList() | ||||||
|  |  | ||||||
|  |         return GetCalculateContentListResponse(totalCount, items) | ||||||
|  |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -0,0 +1,9 @@ | |||||||
|  | package kr.co.vividnext.sodalive.creator.admin.calculate | ||||||
|  |  | ||||||
|  | import com.fasterxml.jackson.annotation.JsonProperty | ||||||
|  | import kr.co.vividnext.sodalive.admin.calculate.GetCalculateContentResponse | ||||||
|  |  | ||||||
|  | data class GetCalculateContentListResponse( | ||||||
|  |     @JsonProperty("totalCount") val totalCount: Int, | ||||||
|  |     @JsonProperty("items") val items: List<GetCalculateContentResponse> | ||||||
|  | ) | ||||||
		Reference in New Issue
	
	Block a user