From 2f2cf14c5a6fc4635179ab0743a4abfb22483394 Mon Sep 17 00:00:00 2001 From: KK Date: Wed, 29 Jun 2022 09:33:08 +0800 Subject: [PATCH 1/2] bug --- internal/api/manage/withdrawals/query.go | 37 +++++++++++------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/internal/api/manage/withdrawals/query.go b/internal/api/manage/withdrawals/query.go index d8127f3..88b6242 100755 --- a/internal/api/manage/withdrawals/query.go +++ b/internal/api/manage/withdrawals/query.go @@ -193,11 +193,12 @@ func QueryWaitcomplete(c *gin.Context) { var array []user.Withdraw dbc.DB.Limit(10).Offset(p.Page*10).Order("created_at desc").Find(&array, where, p.MinMoney, p.MaxMoney, p.ID, p.Name) type moneyType struct { - Monet float32 `gorm:"column:all_amount"` + Monet float32 `gorm:"column:all_amount"` + ActualAmountCount decimal.Decimal `gorm:"column:actual_amount_count"` } - var moneyAll []moneyType - dbc.DB.Table((&user.Withdraw{}).TableName()).Select("sum(amount) as all_amount").Where(where, p.MinMoney, p.MaxMoney, p.ID, p.Name).Scan(&moneyAll) + var moneyAll moneyType + dbc.DB.Table((&user.Withdraw{}).TableName()).Select("sum(amount) as all_amount, sum(actual_amount) as actual_amount_count").Where(where, p.MinMoney, p.MaxMoney, p.ID, p.Name).Scan(&moneyAll) for key, _info := range array { information := user.Information{} @@ -206,14 +207,12 @@ func QueryWaitcomplete(c *gin.Context) { array[key].UserTrueNo = information.IDCard array[key].UserPhone = information.Mobile } - money := float32(0.0) - if len(moneyAll) > 0 { - money = moneyAll[0].Monet - } + back.Suc(c, "", gin.H{ - "total": count, - "list": array, - "money": money, + "total": count, + "list": array, + "money": moneyAll.Monet, + "actualAmountCount": moneyAll.ActualAmountCount, }) } @@ -308,11 +307,12 @@ func QueryComplete(c *gin.Context) { dbc.DB.Limit(10).Offset(p.Page*10).Order("created_at desc").Find(&array, where, p.MinMoney, p.MaxMoney, p.ID, p.Name) type moneyType struct { - Monet float32 `gorm:"column:all_amount"` + Monet float32 `gorm:"column:all_amount"` + ActualAmountCount decimal.Decimal `gorm:"column:actual_amount_count"` } - var moneyAll []moneyType - dbc.DB.Table((&user.Withdraw{}).TableName()).Select("sum(amount) as all_amount").Where(where, p.MinMoney, p.MaxMoney, p.ID, p.Name).Scan(&moneyAll) + var moneyAll moneyType + dbc.DB.Table((&user.Withdraw{}).TableName()).Select("sum(amount) as all_amount, sum(actual_amount) as actual_amount_count").Where(where, p.MinMoney, p.MaxMoney, p.ID, p.Name).Scan(&moneyAll) for key, _info := range array { information := user.Information{} @@ -321,13 +321,10 @@ func QueryComplete(c *gin.Context) { array[key].UserTrueNo = information.IDCard array[key].UserPhone = information.Mobile } - money := float32(0.0) - if len(moneyAll) > 0 { - money = moneyAll[0].Monet - } back.Suc(c, "", gin.H{ - "total": count, - "list": array, - "money": money, + "total": count, + "list": array, + "money": moneyAll.Monet, + "actualAmountCount": moneyAll.ActualAmountCount, }) } From 4c63e43d5945edb898a20df8e45c6acd17efcf57 Mon Sep 17 00:00:00 2001 From: KK Date: Wed, 29 Jun 2022 09:37:54 +0800 Subject: [PATCH 2/2] bug --- internal/api/manage/withdrawals/query.go | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/internal/api/manage/withdrawals/query.go b/internal/api/manage/withdrawals/query.go index 88b6242..bd303cf 100755 --- a/internal/api/manage/withdrawals/query.go +++ b/internal/api/manage/withdrawals/query.go @@ -248,11 +248,12 @@ func QueryFail(c *gin.Context) { var array []user.Withdraw dbc.DB.Limit(10).Offset(p.Page*10).Order("created_at desc").Find(&array, where, p.MinMoney, p.MaxMoney, p.ID, p.Name) type moneyType struct { - Monet float32 `gorm:"column:all_amount"` + Monet float32 `gorm:"column:all_amount"` + ActualAmountCount decimal.Decimal `gorm:"column:actual_amount_count"` } - var moneyAll []moneyType - dbc.DB.Table((&user.Withdraw{}).TableName()).Select("sum(amount) as all_amount").Where(where, p.MinMoney, p.MaxMoney, p.ID, p.Name).Scan(&moneyAll) + var moneyAll moneyType + dbc.DB.Table((&user.Withdraw{}).TableName()).Select("sum(amount) as all_amount, sum(actual_amount) as actual_amount_count").Where(where, p.MinMoney, p.MaxMoney, p.ID, p.Name).Scan(&moneyAll) for key, _info := range array { information := user.Information{} @@ -261,14 +262,11 @@ func QueryFail(c *gin.Context) { array[key].UserTrueNo = information.IDCard array[key].UserPhone = information.Mobile } - money := float32(0.0) - if len(moneyAll) > 0 { - money = moneyAll[0].Monet - } back.Suc(c, "", gin.H{ - "total": count, - "list": array, - "money": money, + "total": count, + "list": array, + "money": moneyAll.Monet, + "actualAmountCount": moneyAll.ActualAmountCount, }) }