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

Compare commits

base: klaus:fa515ad39c2ca31fddc407e406dec5040e746ae4
Branches Tags
klaus:test
klaus:main
..
compare: klaus:f09673a7955c4450cae25ccf4f621ffb94481544
Branches Tags
klaus:main
klaus:test

No commits in common. "fa515ad39c2ca31fddc407e406dec5040e746ae4" and "f09673a7955c4450cae25ccf4f621ffb94481544" have entirely different histories.
fa515ad39c ... f09673a795

2 changed files with 14 additions and 9 deletions
Show Stats Expand all files Collapse all files

8
src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusQueryRepository.kt
View File

@ -5,7 +5,6 @@ import com.querydsl.jpa.impl.JPAQueryFactory
import kr.co.vividnext.sodalive.can.QCan.can1 import kr.co.vividnext.sodalive.can.QCan.can1
import kr.co.vividnext.sodalive.can.charge.ChargeStatus import kr.co.vividnext.sodalive.can.charge.ChargeStatus
import kr.co.vividnext.sodalive.can.charge.QCharge.charge import kr.co.vividnext.sodalive.can.charge.QCharge.charge
import kr.co.vividnext.sodalive.can.payment.PaymentGateway
import kr.co.vividnext.sodalive.can.payment.PaymentStatus import kr.co.vividnext.sodalive.can.payment.PaymentStatus
import kr.co.vividnext.sodalive.can.payment.QPayment.payment import kr.co.vividnext.sodalive.can.payment.QPayment.payment
import kr.co.vividnext.sodalive.member.QMember.member import kr.co.vividnext.sodalive.member.QMember.member
@ -51,11 +50,7 @@ class AdminChargeStatusQueryRepository(private val queryFactory: JPAQueryFactory
.fetch() .fetch()
} }
fun getChargeStatusDetail( fun getChargeStatusDetail(startDate: LocalDateTime, endDate: LocalDateTime): List<GetChargeStatusDetailQueryDto> {
startDate: LocalDateTime,
endDate: LocalDateTime,
paymentGateway: PaymentGateway
): List<GetChargeStatusDetailQueryDto> {
val formattedDate = Expressions.stringTemplate( val formattedDate = Expressions.stringTemplate(
"DATE_FORMAT({0}, {1})", "DATE_FORMAT({0}, {1})",
Expressions.dateTimeTemplate( Expressions.dateTimeTemplate(
@ -88,7 +83,6 @@ class AdminChargeStatusQueryRepository(private val queryFactory: JPAQueryFactory
.and(charge.createdAt.loe(endDate)) .and(charge.createdAt.loe(endDate))
.and(charge.status.eq(ChargeStatus.CHARGE)) .and(charge.status.eq(ChargeStatus.CHARGE))
.and(payment.status.eq(PaymentStatus.COMPLETE)) .and(payment.status.eq(PaymentStatus.COMPLETE))
.and(payment.paymentGateway.eq(paymentGateway))
) )
.orderBy(formattedDate.desc()) .orderBy(formattedDate.desc())
.fetch() .fetch()

15
src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusService.kt
View File

@ -74,14 +74,25 @@ class AdminChargeStatusService(val repository: AdminChargeStatusQueryRepository)
.withZoneSameInstant(ZoneId.of("UTC")) .withZoneSameInstant(ZoneId.of("UTC"))
.toLocalDateTime() .toLocalDateTime()
return repository.getChargeStatusDetail(startDate, endDate, paymentGateway) return repository.getChargeStatusDetail(startDate, endDate)
.asSequence() .asSequence()
.filter {
if (paymentGateway == PaymentGateway.APPLE_IAP) {
it.appleChargeAmount > 0
} else {
it.pgChargeAmount > 0
}
}
.map { .map {
GetChargeStatusDetailResponse( GetChargeStatusDetailResponse(
memberId = it.memberId, memberId = it.memberId,
nickname = it.nickname, nickname = it.nickname,
method = it.method, method = it.method,
amount = it.appleChargeAmount.toInt(), amount = if (paymentGateway == PaymentGateway.APPLE_IAP) {
it.appleChargeAmount.toInt()
} else {
it.pgChargeAmount
},
datetime = it.datetime datetime = it.datetime
) )
} }