server/game2006go
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2024-07-18 16:20:08 +08:00
parent b98744b83e
commit 38b7bcda87
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/backtask/service/nftutils.go
View File

@ -149,7 +149,7 @@ func NftExists(netId int32, contractAddress string, tokenId string) bool {
} }
func NftUpdateLock(netId int32, contractAddress string, tokenId string, func NftUpdateLock(netId int32, contractAddress string, tokenId string,
lockIdx int64, lockAddress string) bool { lockIdx int64, lockAddress string, lockSender string) bool {
nowTime := f5.GetApp().GetRealSeconds() nowTime := f5.GetApp().GetRealSeconds()
result := false result := false
f5.GetGoStyleDb().UpsertEx( f5.GetGoStyleDb().UpsertEx(
@ -163,6 +163,7 @@ func NftUpdateLock(netId int32, contractAddress string, tokenId string,
[][]string { [][]string {
{"last_lock_idx", q5.ToString(lockIdx)}, {"last_lock_idx", q5.ToString(lockIdx)},
{"last_lock_address", lockAddress}, {"last_lock_address", lockAddress},
{"last_lock_sender", lockSender},
{"last_lock_time", q5.ToString(nowTime)}, {"last_lock_time", q5.ToString(nowTime)},
}, },
[][]string {}, [][]string {},

3
server/backtask/task/nftlock.go
View File

@ -66,6 +66,7 @@ func (this* nftLock) repair(ds *f5.DataSet) bool {
netId := q5.ToInt32(ds.GetByName("net_id")) netId := q5.ToInt32(ds.GetByName("net_id"))
idx := q5.ToInt64(ds.GetByName("idx")) idx := q5.ToInt64(ds.GetByName("idx"))
lockTo := ds.GetByName("lock_to") lockTo := ds.GetByName("lock_to")
lockSender := ds.GetByName("lock_sender")
if nftSyncStatus == 0 && lockTo != "" { if nftSyncStatus == 0 && lockTo != "" {
p := new(lockReturnValues) p := new(lockReturnValues)
if q5.DecodeJson(ds.GetByName("return_values"), p) == nil { if q5.DecodeJson(ds.GetByName("return_values"), p) == nil {
@ -73,7 +74,7 @@ func (this* nftLock) repair(ds *f5.DataSet) bool {
contractAddress := strings.ToLower(p.Nft) contractAddress := strings.ToLower(p.Nft)
tokenId := val tokenId := val
if service.NftExists(netId, contractAddress, tokenId) { if service.NftExists(netId, contractAddress, tokenId) {
service.NftUpdateLock(netId, contractAddress, tokenId, idx, lockTo) service.NftUpdateLock(netId, contractAddress, tokenId, idx, lockTo, lockSender)
} }
} }
} }

7
server/marketserver/api/v1/nft/nft.go
View File

@ -18,7 +18,7 @@ func (this *NftApi) Unlock(c *gin.Context) {
reqJson := struct { reqJson := struct {
NetId interface{} `json:"net_id"` NetId interface{} `json:"net_id"`
ContractAddress string `json:"contract_address"` ContractAddress string `json:"contract_address"`
To string `json:"to"` //To string `json:"to"`
Tokens []struct { Tokens []struct {
TokenId string `json:"token_id"` TokenId string `json:"token_id"`
} `json:"tokens"` } `json:"tokens"`
@ -34,10 +34,11 @@ func (this *NftApi) Unlock(c *gin.Context) {
f5.RspErr(c, 1, "contract_address params error") f5.RspErr(c, 1, "contract_address params error")
return return
} }
/*
if reqJson.To == "" { if reqJson.To == "" {
f5.RspErr(c, 1, "to params error") f5.RspErr(c, 1, "to params error")
return return
} }*/
if len(reqJson.Tokens) != 1 { if len(reqJson.Tokens) != 1 {
f5.RspErr(c, 1, "tokens params error") f5.RspErr(c, 1, "tokens params error")
return return
@ -68,7 +69,7 @@ func (this *NftApi) Unlock(c *gin.Context) {
"account_address": accountAddress, "account_address": accountAddress,
"net_id": ds.GetByName("net_id"), "net_id": ds.GetByName("net_id"),
"nft_address": ds.GetByName("contract_address"), "nft_address": ds.GetByName("contract_address"),
"to_address": reqJson.To, //"to_address": reqJson.To,
"token_ids": ds.GetByName("token_id"), "token_ids": ds.GetByName("token_id"),
} }
rspObj := &struct { rspObj := &struct {