[#35] 결제 스키마 재정의 & 예약 조회 페이지 개선 #36

Merged
pricelees merged 37 commits from refactor/#35 into main 2025-08-22 06:43:16 +00:00
Showing only changes of commit 4108dcd01a - Show all commits

View File

@ -12,7 +12,7 @@ open class PaymentDetailEntity(
id: Long,
open val paymentId: Long,
open val netAmount: Int,
open val suppliedAmount: Int,
open val vat: Int,
@Transient
@ -24,7 +24,7 @@ open class PaymentDetailEntity(
class PaymentCardDetailEntity(
id: Long,
paymentId: Long,
netAmount: Int,
suppliedAmount: Int,
vat: Int,
@Enumerated(EnumType.STRING)
@ -48,26 +48,27 @@ class PaymentCardDetailEntity(
val easypayProviderCode: EasyPayCompanyCode?,
val easypayDiscountAmount: Int?
) : PaymentDetailEntity(id, paymentId, netAmount, vat)
) : PaymentDetailEntity(id, paymentId, suppliedAmount, vat)
@Entity
@Table(name = "payment_bank_transfer_detail")
class PaymentBankTransferDetailEntity(
id: Long,
paymentId: Long,
netAmount: Int,
suppliedAmount: Int,
vat: Int,
@Enumerated(EnumType.STRING)
val bankCode: BankCode
) : PaymentDetailEntity(id, paymentId, netAmount, vat)
val bankCode: BankCode,
val settlementStatus: String,
) : PaymentDetailEntity(id, paymentId, suppliedAmount, vat)
@Entity
@Table(name = "payment_easypay_prepaid_detail")
class PaymentEasypayPrepaidDetailEntity(
id: Long,
paymentId: Long,
netAmount: Int,
suppliedAmount: Int,
vat: Int,
@Enumerated(EnumType.STRING)
@ -75,4 +76,4 @@ class PaymentEasypayPrepaidDetailEntity(
val amount: Int,
val discountAmount: Int
) : PaymentDetailEntity(id, paymentId, netAmount, vat)
) : PaymentDetailEntity(id, paymentId, suppliedAmount, vat)