Merge pull request #128 from decert-me/fix/claim_collection

Fix 领取合集判断是否完成错误
decert-me · Feb 28, 2024 · 7f42f0e · 7f42f0e
2 parents 756f1b0 + 4b5e8fb
commit 7f42f0e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/internal/app/dao/user_challenge_claim.go b/internal/app/dao/user_challenge_claim.go
@@ -2,6 +2,7 @@ package dao
 
 import (
 	"backend-go/internal/app/model"
+	"errors"
 	"gorm.io/gorm"
 )
 
@@ -30,7 +31,7 @@ func (d *Dao) HasClaimedFinish(address string, tokenID string) (status uint8, er
 	var userChallenges model.UserChallenges
 	err = d.db.Model(&model.UserChallenges{}).Where("address = ? AND token_id = ?", address, tokenID).First(&userChallenges).Error
 	if err != nil {
-		if err == gorm.ErrRecordNotFound {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return 0, nil
 		} else {
 			return 0, err

diff --git a/internal/app/service/collection.go b/internal/app/service/collection.go
@@ -35,7 +35,7 @@ func (s *Service) CollectionClaim(r request.CollectionClaimRequest, address stri
 	}
 	for _, quest := range questList {
 		// 查询是否完成
-		status, err := s.dao.HasClaimed(address, quest.TokenId)
+		status, err := s.dao.HasClaimedFinish(address, quest.TokenId)
 		if err != nil {
 			return err
 		}

diff --git a/internal/app/service/collection_v2.go b/internal/app/service/collection_v2.go
@@ -25,7 +25,7 @@ func (s *Service) CollectionClaimV2(r request.CollectionClaimRequest, address st
 	}
 	for _, quest := range questList {
 		// 查询是否完成
-		status, err := s.dao.HasClaimed(address, quest.TokenId)
+		status, err := s.dao.HasClaimedFinish(address, quest.TokenId)
 		if err != nil {
 			return err
 		}