From 4059e1545021978f4bda0bf10694958f160594d0 Mon Sep 17 00:00:00 2001 From: li Date: Fri, 22 Apr 2022 09:53:43 +0800 Subject: [PATCH] fix: --- controller/user_share_card.go | 2 +- model/model_test.go | 2 ++ model/share_card.go | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/controller/user_share_card.go b/controller/user_share_card.go index c888f4f..e73b1d7 100644 --- a/controller/user_share_card.go +++ b/controller/user_share_card.go @@ -665,7 +665,7 @@ func CardIssueCreate(c *gin.Context) { return } if !shareCardRetrieveCard.ReceiptTime.IsZero() && shareCardRetrieveCard.ReceiptTime. - AddDate(0, 0, 2).After(time.Now()) { + AddDate(0, 0, 2).Before(time.Now()) { logger.Error("receipt time is over 48 hour:") RespJson(c, status.IssueFeedbackReceiptTimeOver48Hour, nil) return diff --git a/model/model_test.go b/model/model_test.go index 9172f1e..26c65ea 100644 --- a/model/model_test.go +++ b/model/model_test.go @@ -156,6 +156,8 @@ func InitDBProd() { DBProd.AutoMigrate( &RedeemCode{}, &UserRedeemCode{}, + &GameCardGoods{}, + &UserShareCardBill{}, &ShareCardBillGame{}, diff --git a/model/share_card.go b/model/share_card.go index 1dd39cc..9bfeeb7 100644 --- a/model/share_card.go +++ b/model/share_card.go @@ -453,7 +453,9 @@ func GetUserShareCardGameList(uid uint32, page, pageSize int, label string) ([]G Count int `json:"count"` } var count GameCount - countSql := strings.Replace(sql, "SELECT *", "SELECT COUNT(*) ", -1) + countSql := strings.Replace(sql, "SELECT *", "SELECT COUNT(*) AS count ", -1) + //countSql := strings.Replace(sql, "SELECT *", "SELECT COUNT(*) ", -1) + fmt.Println("countSql:", countSql) err := DB.Raw(countSql).Scan(&count).Error //count, err := qs.Count() if err != nil {