From a470752d42499b9eb316070445a01e2415c84c3c Mon Sep 17 00:00:00 2001 From: MaysWind Date: Sun, 10 Jan 2021 20:24:47 +0800 Subject: [PATCH] fix bug --- pkg/services/transactions.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/services/transactions.go b/pkg/services/transactions.go index 3e33a2d1..94d63ab4 100644 --- a/pkg/services/transactions.go +++ b/pkg/services/transactions.go @@ -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=? AND transaction_time