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

fix bug

Browse Source
This commit is contained in:
MaysWind
2021-01-10 20:24:47 +08:00
parent d1dc5e73b7
commit a470752d42
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/transactions.go
+7 -7
View File
@@ -128,8 +128,8 @@ func (s *TransactionService) GetTransactionsInMonthByPage(uid int64, year int, m
endTime := startTime.AddDate(0, 1, 0)
startUnixTime := startTime.Unix()
endUnixTime := endTime.Unix()
startTransactionTime := utils.GetMinTransactionTimeFromUnixTime(startTime.Unix())
endTransactionTime := utils.GetMinTransactionTimeFromUnixTime(endTime.Unix())
var transactions []*models.Transaction
@@ -137,8 +137,8 @@ func (s *TransactionService) GetTransactionsInMonthByPage(uid int64, year int, m
conditionParams := make([]interface{}, 0, 16)
conditionParams = append(conditionParams, uid)
conditionParams = append(conditionParams, false)
conditionParams = append(conditionParams, startUnixTime)
conditionParams = append(conditionParams, endUnixTime)
conditionParams = append(conditionParams, startTransactionTime)
conditionParams = append(conditionParams, endTransactionTime)
if models.TRANSACTION_DB_TYPE_MODIFY_BALANCE <= transactionType && transactionType <= models.TRANSACTION_DB_TYPE_EXPENSE {
condition = condition + " AND type=?"
@@ -227,10 +227,10 @@ func (s *TransactionService) GetMonthTransactionCount(uid int64, year int64, mon
endTime := startTime.AddDate(0, 1, 0)
startUnixTime := startTime.Unix()
endUnixTime := endTime.Unix()
startTransactionTime := utils.GetMinTransactionTimeFromUnixTime(startTime.Unix())
endTransactionTime := utils.GetMinTransactionTimeFromUnixTime(endTime.Unix())
return s.UserDataDB(uid).Where("uid=? AND deleted=? AND transaction_time>=? AND transaction_time<?", uid, false, startUnixTime, endUnixTime).Count(&models.Transaction{})
return s.UserDataDB(uid).Where("uid=? AND deleted=? AND transaction_time>=? AND transaction_time<?", uid, false, startTransactionTime, endTransactionTime).Count(&models.Transaction{})
}
// CreateTransaction saves a new transaction to database