From 79c70f743b97a9cb1b7a5ef25ecebaa6127ef7be Mon Sep 17 00:00:00 2001 From: yangduo Date: Fri, 12 Jul 2024 10:56:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A8=E6=8A=BC=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/marketserver/api/v1/market/marketsecondary.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/server/marketserver/api/v1/market/marketsecondary.go b/server/marketserver/api/v1/market/marketsecondary.go index 6a0924f5..95f3007c 100644 --- a/server/marketserver/api/v1/market/marketsecondary.go +++ b/server/marketserver/api/v1/market/marketsecondary.go @@ -43,9 +43,8 @@ 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 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 -WHERE A.idx > %d AND A.net_id = %d AND A.last_owner_address = ? AND A.owner_address != ? AND A.last_owner_address = A.last_lock_address`, + SELECT * FROM t_nft + WHERE idx > %d AND net_id = %d AND last_owner_address = ? AND owner_address != ? AND last_owner_address = last_lock_address`, cursor, netId) params := []string{owner,owner} @@ -61,7 +60,7 @@ WHERE A.idx > %d AND A.net_id = %d AND A.last_owner_address = ? AND A.owner_addr itemIds[itemId] = 1 } if len(itemIds) > 0 { - inSub := `A.item_id IN (` + inSub := `item_id IN (` i := 0 for key, _ := range(itemIds) { if i == 0 { @@ -82,7 +81,7 @@ WHERE A.idx > %d AND A.net_id = %d AND A.last_owner_address = ? AND A.owner_addr heroRanks[rank] = 1 } if len(heroRanks) > 0 { - inSub := `B.hero_quality IN (` + inSub := `quality IN (` i := 0 for key, _ := range(heroRanks) { if i == 0 { @@ -108,7 +107,7 @@ WHERE A.idx > %d AND A.net_id = %d AND A.last_owner_address = ? AND A.owner_addr }{} q5.NewSlice(&rspObj.Rows, 0, 10) nfts := []*common.NftDto{} - orderBy := " ORDER BY A.last_lock_time DESC " + orderBy := " ORDER BY last_lock_time DESC " f5.GetGoStyleDb().StreamPageQuery( constant.BCNFT_DB, pageSize, @@ -127,7 +126,6 @@ WHERE A.idx > %d AND A.net_id = %d AND A.last_owner_address = ? AND A.owner_addr p.TokenId = ds.GetByName("token_id") p.Payload = map[string]interface{}{} p.LockTime = q5.ToInt32(ds.GetByName("last_lock_time")) - q5.DecodeJson(ds.GetByName("event_data"), &p.Payload) q5.AppendSlice(&nfts, p) }) GetCacheMgr().GetNfts(nfts)