From 080fa40d842e755cef52af05e0c2c81a451d3e33 Mon Sep 17 00:00:00 2001 From: yangduo Date: Thu, 11 Jul 2024 19:54:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E6=8A=BC=E6=9F=A5=E8=AF=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../marketserver/api/v1/market/marketsecondary.go | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/server/marketserver/api/v1/market/marketsecondary.go b/server/marketserver/api/v1/market/marketsecondary.go index e5ca66ed..6a0924f5 100644 --- a/server/marketserver/api/v1/market/marketsecondary.go +++ b/server/marketserver/api/v1/market/marketsecondary.go @@ -45,18 +45,11 @@ func (this *MarketApi) LockList(c *gin.Context) { 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`, +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`, cursor, netId) + params := []string{owner,owner} subFilters := []f5.DbQueryFilter{} - { - inSub := `A.last_owner_address= '` + owner + `'` - q5.AppendSlice(&subFilters, f5.GetDbFilter().Custom(inSub).And()) - inSub = `A.owner_address != '` + owner + `'` - q5.AppendSlice(&subFilters, f5.GetDbFilter().Custom(inSub).And()) - inSub = `A.last_owner_address = A.last_lock_address` - q5.AppendSlice(&subFilters, f5.GetDbFilter().Custom(inSub).And()) - } { itemIds := map[int32]int32{} @@ -121,8 +114,7 @@ WHERE A.idx > %d AND A.net_id = %d`, pageSize, cursor, sql, - []string{ - }, + params, f5.GetDbFilter().Comp(subFilters...), orderBy, func (err error, pagination *f5.StreamPagination) {