mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-19 01:04:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

code refactor

Browse Source
This commit is contained in:
MaysWind
2024-10-30 01:05:04 +08:00
parent 92a78f6f12
commit 90ea462206
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/transactions.go
-8
View File
@@ -689,10 +689,6 @@ func (a *TransactionsApi) TransactionCreateHandler(c *core.WebContext) (any, *er
return nil, errs.ErrTransactionDestinationAmountCannotBeSet return nil, errs.ErrTransactionDestinationAmountCannotBeSet
} }
if transactionCreateReq.Type == models.TRANSACTION_TYPE_TRANSFER && (transactionCreateReq.SourceAmount < 0 || transactionCreateReq.DestinationAmount < 0) {
return nil, errs.ErrTransferTransactionAmountCannotBeLessThanZero
}
uid := c.GetCurrentUid() uid := c.GetCurrentUid()
user, err := a.users.GetUserById(c, uid) user, err := a.users.GetUserById(c, uid)
@@ -823,10 +819,6 @@ func (a *TransactionsApi) TransactionModifyHandler(c *core.WebContext) (any, *er
return nil, errs.ErrTransactionTypeInvalid return nil, errs.ErrTransactionTypeInvalid
} }
if transaction.Type == models.TRANSACTION_DB_TYPE_TRANSFER_OUT && (transactionModifyReq.SourceAmount < 0 || transactionModifyReq.DestinationAmount < 0) {
return nil, errs.ErrTransferTransactionAmountCannotBeLessThanZero
}
allTransactionTagIds, err := a.transactionTags.GetAllTagIdsOfTransactions(c, uid, []int64{transaction.TransactionId}) allTransactionTagIds, err := a.transactionTags.GetAllTagIdsOfTransactions(c, uid, []int64{transaction.TransactionId})
if err != nil { if err != nil {
pkg/services/transactions.go
+10
View File
@@ -599,6 +599,11 @@ func (s *TransactionService) ModifyTransaction(c core.Context, transaction *mode
return errs.ErrTransactionSourceAndDestinationAmountNotEqual return errs.ErrTransactionSourceAndDestinationAmountNotEqual
} }
if (transaction.Type == models.TRANSACTION_DB_TYPE_TRANSFER_OUT || transaction.Type == models.TRANSACTION_DB_TYPE_TRANSFER_IN) &&
(transaction.Amount < 0 || transaction.RelatedAccountAmount < 0) {
return errs.ErrTransferTransactionAmountCannotBeLessThanZero
}
oldSourceAccount, oldDestinationAccount, err := s.getOldAccountModels(sess, transaction, oldTransaction, sourceAccount, destinationAccount) oldSourceAccount, oldDestinationAccount, err := s.getOldAccountModels(sess, transaction, oldTransaction, sourceAccount, destinationAccount)
if err != nil { if err != nil {
@@ -1566,6 +1571,11 @@ func (s *TransactionService) doCreateTransaction(sess *xorm.Session, transaction
return errs.ErrTransactionSourceAndDestinationAmountNotEqual return errs.ErrTransactionSourceAndDestinationAmountNotEqual
} }
if (transaction.Type == models.TRANSACTION_DB_TYPE_TRANSFER_OUT || transaction.Type == models.TRANSACTION_DB_TYPE_TRANSFER_IN) &&
(transaction.Amount < 0 || transaction.RelatedAccountAmount < 0) {
return errs.ErrTransferTransactionAmountCannotBeLessThanZero
}
// Get and verify category // Get and verify category
err = s.isCategoryValid(sess, transaction) err = s.isCategoryValid(sess, transaction)