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

修改质押查询

Browse Source
This commit is contained in:
yangduo 2024-07-11 16:09:19 +08:00
parent f26b67b106
commit 041b126961
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/marketserver/api/v1/market/marketsecondary.go
View File

@ -40,7 +40,7 @@ func (this *MarketApi) LockList(c *gin.Context) {
pageSize := q5.AdjustRangeValue(q5.SafeToInt32(reqJson.PageSize), 1, 20) pageSize := q5.AdjustRangeValue(q5.SafeToInt32(reqJson.PageSize), 1, 20)
cursor := q5.SafeToInt64(reqJson.Cursor) cursor := q5.SafeToInt64(reqJson.Cursor)
sql := fmt.Sprintf(` sql := fmt.Sprintf(`
SELECT A.idx, A.net_id, A.token_type, A.token_id, A.contract_address, B.status, B.event_data FROM t_nft A LEFT JOIN t_order B SELECT A.idx, A.net_id, A.token_type, A.token_id, A.contract_address, A.last_lock_time, B.status, B.event_data FROM t_nft A LEFT JOIN t_order B
ON A.net_id = B.net_id AND A.contract_address = B.contract_address AND A.token_id = B.token_id ON A.net_id = B.net_id AND A.contract_address = B.contract_address AND A.token_id = B.token_id
WHERE A.idx > %d AND A.net_id = %d AND A.last_owner_address= '%s' AND A.owner_address != '%[3]s' AND A.last_owner_address = A.last_lock_address`, WHERE A.idx > %d AND A.net_id = %d AND A.last_owner_address= '%s' AND A.owner_address != '%[3]s' AND A.last_owner_address = A.last_lock_address`,
cursor, netId, owner) cursor, netId, owner)
@ -80,7 +80,7 @@ WHERE A.idx > %d AND A.net_id = %d AND A.last_owner_address= '%s' AND A.owner_ad
}{} }{}
q5.NewSlice(&rspObj.Rows, 0, 10) q5.NewSlice(&rspObj.Rows, 0, 10)
nfts := []*common.NftDto{} nfts := []*common.NftDto{}
orderBy := "" orderBy := " ORDER BY A.last_lock_time DESC "
f5.GetGoStyleDb().StreamPageQuery( f5.GetGoStyleDb().StreamPageQuery(
constant.BCNFT_DB, constant.BCNFT_DB,
pageSize, pageSize,
@ -99,6 +99,7 @@ WHERE A.idx > %d AND A.net_id = %d AND A.last_owner_address= '%s' AND A.owner_ad
p.ContractAddress = ds.GetByName("contract_address") p.ContractAddress = ds.GetByName("contract_address")
p.TokenId = ds.GetByName("token_id") p.TokenId = ds.GetByName("token_id")
p.Payload = map[string]interface{}{} p.Payload = map[string]interface{}{}
p.LockTime = q5.ToInt32(ds.GetByName("last_lock_time"))
q5.DecodeJson(ds.GetByName("event_data"), &p.Payload) q5.DecodeJson(ds.GetByName("event_data"), &p.Payload)
q5.AppendSlice(&nfts, p) q5.AppendSlice(&nfts, p)
}) })
@ -107,7 +108,15 @@ WHERE A.idx > %d AND A.net_id = %d AND A.last_owner_address= '%s' AND A.owner_ad
for _, val := range nfts { for _, val := range nfts {
p := q5.NewSliceElement(&rspObj.Rows) p := q5.NewSliceElement(&rspObj.Rows)
p.Event = val.Payload p.Event = val.Payload
p.Nft = val.NftCache.GetJsonData() jsonData := val.NftCache.GetJsonData()
if jsonData != nil {
if v, ok := jsonData.(map[string]interface{}); ok {
v := q5.MapClone(v)
v["last_lock_time"] = val.LockTime
jsonData = v
}
}
p.Nft = jsonData
} }
} }
c.JSON(200, rspObj) c.JSON(200, rspObj)

3
server/marketserver/common/types.go
View File

@ -1,10 +1,10 @@
package common package common
import ( import (
"q5"
"f5" "f5"
"fmt" "fmt"
"main/constant" "main/constant"
"q5"
) )
type NftHomeMeta struct { type NftHomeMeta struct {
@ -50,6 +50,7 @@ type NftDto struct {
Price string Price string
Payload interface{} Payload interface{}
Param1 int64 Param1 int64
LockTime int32
} }
type App interface { type App interface {