Adjusted property order and added balance

This commit is contained in:
dankl 2020-01-13 00:06:57 +01:00 committed by dankito
parent 3b628fea86
commit cdc720a511
2 changed files with 7 additions and 5 deletions

View File

@ -7,18 +7,19 @@ import java.util.*
open class AccountTransaction( open class AccountTransaction(
val amount: BigDecimal, val amount: BigDecimal,
val currency: String,
val usage: String,
val bookingDate: Date, val bookingDate: Date,
val usage: String,
val otherPartyName: String?, val otherPartyName: String?,
val otherPartyBankCode: String?, val otherPartyBankCode: String?,
val otherPartyAccountId: String?, val otherPartyAccountId: String?,
val bookingText: String?, val bookingText: String?,
val balance: BigDecimal?,
val currency: String,
val bankAccount: BankAccount val bankAccount: BankAccount
) { ) {
// for object deserializers // for object deserializers
internal constructor() : this(0.toBigDecimal(),"", "", Date(), null, null, null, null, BankAccount()) internal constructor() : this(BigDecimal.ZERO, Date(),"", null, null, null, null, BigDecimal.ZERO, "", BankAccount())
val showOtherPartyName: Boolean val showOtherPartyName: Boolean

View File

@ -104,13 +104,14 @@ open class fints4javaModelMapper {
open fun mapTransaction(bankAccount: BankAccount, transaction: net.dankito.fints.model.AccountTransaction): AccountTransaction { open fun mapTransaction(bankAccount: BankAccount, transaction: net.dankito.fints.model.AccountTransaction): AccountTransaction {
return AccountTransaction( return AccountTransaction(
transaction.amount, transaction.amount,
transaction.currency,
transaction.usage,
transaction.bookingDate, transaction.bookingDate,
transaction.usage,
transaction.otherPartyName, transaction.otherPartyName,
transaction.otherPartyBankCode, transaction.otherPartyBankCode,
transaction.otherPartyAccountId, transaction.otherPartyAccountId,
transaction.bookingText, transaction.bookingText,
transaction.closingBalance,
transaction.currency,
bankAccount bankAccount
) )
} }