Merge pull request 'fix(admin-charge-status-detail): pgChargeAmount와 can의 가격을 가져와서 사용하는 로직을 제거하고 payment에 기록된 가격으로 계산하도록 수정' (#347) from test into main

Reviewed-on: #347

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

@@ -74,7 +74,6 @@ class AdminChargeStatusQueryRepository(private val queryFactory: JPAQueryFactory
                     member.nickname,
                     payment.method.coalesce(""),
                     payment.price,
-                    can1.price,
                     payment.locale.coalesce(""),
                     formattedDate
                 )

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

@@ -69,17 +69,15 @@ class AdminChargeStatusService(val repository: AdminChargeStatusQueryRepository)
             .toLocalDateTime()
 
         return repository.getChargeStatusDetail(startDate, endDate, paymentGateway)
-            .asSequence()
             .map {
                 GetChargeStatusDetailResponse(
                     memberId = it.memberId,
                     nickname = it.nickname,
                     method = it.method,
-                    amount = it.appleChargeAmount.toInt(),
+                    amount = it.amount.toInt(),
                     locale = it.locale,
                     datetime = it.datetime
                 )
             }
-            .toList()
     }
 }

src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailQueryDto.kt

@@ -7,8 +7,7 @@ data class GetChargeStatusDetailQueryDto @QueryProjection constructor(
     val memberId: Long,
     val nickname: String,
     val method: String,
-    val appleChargeAmount: BigDecimal,
-    val pgChargeAmount: BigDecimal,
+    val amount: BigDecimal,
     val locale: String,
     val datetime: String
 )