diff --git a/server/marketserver/api/v1/market/marketsecondary.go b/server/marketserver/api/v1/market/marketsecondary.go index 8b08538b..7e98fda7 100644 --- a/server/marketserver/api/v1/market/marketsecondary.go +++ b/server/marketserver/api/v1/market/marketsecondary.go @@ -8,13 +8,14 @@ import ( . "main/global" "net/http" "q5" + "strings" "github.com/gin-gonic/gin" ) func (this *MarketApi) LockList(c *gin.Context) { netId := q5.ToInt64(c.Param("net_id")) - owner := c.Param("owner_address") + owner := strings.ToLower(c.Param("owner_address")) reqJson := struct { PageSize interface{} `json:"page_size"` Cursor interface{} `json:"cursor"` @@ -39,8 +40,9 @@ func (this *MarketApi) LockList(c *gin.Context) { pageSize := q5.AdjustRangeValue(q5.SafeToInt32(reqJson.PageSize), 1, 20) cursor := q5.SafeToInt64(reqJson.Cursor) sql := fmt.Sprintf(` -SELECT * FROM t_nft WHERE idx > %d AND net_id = %d AND owner_address = '%s' AND owner_address = last_lock_address -`, +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 +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`, cursor, netId, owner) subFilters := []f5.DbQueryFilter{} @@ -97,6 +99,7 @@ SELECT * FROM t_nft WHERE idx > %d AND net_id = %d AND owner_address = '%s' AND p.ContractAddress = ds.GetByName("contract_address") p.TokenId = ds.GetByName("token_id") p.Payload = map[string]interface{}{} + q5.DecodeJson(ds.GetByName("event_data"), &p.Payload) q5.AppendSlice(&nfts, p) }) GetCacheMgr().GetNfts(nfts)