From 1b649537ae60456845bc4271dd67a79a05359b0c Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 22 Jul 2024 11:44:17 +0800 Subject: [PATCH] 1 --- server/jccommon/constant.go | 1 + server/marketserver/api/v1/nft/nft.go | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/server/jccommon/constant.go b/server/jccommon/constant.go index adfe0f79..98a46c5f 100644 --- a/server/jccommon/constant.go +++ b/server/jccommon/constant.go @@ -31,6 +31,7 @@ const ( CONTRACT_NAME_CFHero = "CFHero" CONTRACT_NAME_CFNormalHero = "CFHero_normal" CONTRACT_NAME_GoldBrick = "GoldBrick" + CONTRACT_NAME_FounderTag = "FounderTag" CONTRACT_NAME_NFTLock = "NFTLock" ) diff --git a/server/marketserver/api/v1/nft/nft.go b/server/marketserver/api/v1/nft/nft.go index b4e5720c..7720fd2b 100644 --- a/server/marketserver/api/v1/nft/nft.go +++ b/server/marketserver/api/v1/nft/nft.go @@ -27,9 +27,19 @@ func (this *NftApi) Unlock(c *gin.Context) { return } lockMeta := mt.Table.Contract.GetByNetIdName(q5.SafeToInt32(reqJson.NetId), jccommon.CONTRACT_NAME_NFTLock) - heroMeta := mt.Table.Contract.GetByNetIdName(q5.SafeToInt32(reqJson.NetId), jccommon.CONTRACT_NAME_CFHero) - normalHeroMeta := mt.Table.Contract.GetByNetIdName(q5.SafeToInt32(reqJson.NetId), jccommon.CONTRACT_NAME_CFNormalHero) - if (heroMeta == nil && normalHeroMeta == nil) || lockMeta == nil { + if lockMeta == nil { + f5.RspErr(c, 1, "lock contract_address not found") + return + } + nftMeta := mt.Table.Contract.GetByNetIdAddress(q5.SafeToInt32(reqJson.NetId), + strings.ToLower(reqJson.ContractAddress)) + if nftMeta == nil { + f5.RspErr(c, 1, "contract_address params error") + return + } + if !(nftMeta.GetName() == jccommon.CONTRACT_NAME_CFHero || + nftMeta.GetName() == jccommon.CONTRACT_NAME_CFNormalHero || + nftMeta.GetName() == jccommon.CONTRACT_NAME_FounderTag) { f5.RspErr(c, 1, "contract_address params error") return } @@ -43,7 +53,7 @@ func (this *NftApi) Unlock(c *gin.Context) { "t_nft", [][]string{ {"net_id", q5.SafeToString(reqJson.NetId)}, - {"contract_address", reqJson.ContractAddress}, + {"contract_address", strings.ToLower(reqJson.ContractAddress)}, {"token_id", reqJson.Tokens[0].TokenId}, {"owner_address", strings.ToLower(lockMeta.GetAddress())}, },