From a7c073ada95a7042ab3cce42a9431e21882b6b99 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sun, 16 Jun 2024 10:43:38 +0800 Subject: [PATCH] 1 --- server/marketserver/api/v1/asset/asset.go | 4 ++-- server/marketserver/api/v1/market/market.go | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/server/marketserver/api/v1/asset/asset.go b/server/marketserver/api/v1/asset/asset.go index a652adab..bc3a079a 100644 --- a/server/marketserver/api/v1/asset/asset.go +++ b/server/marketserver/api/v1/asset/asset.go @@ -32,8 +32,8 @@ func (this *AssetApi) AccountAsset(c *gin.Context) { sql := fmt.Sprintf(` SELECT A.idx, A.net_id, A.token_type, A.token_id, A.contract_address, B.status 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.owner_address=? LIMIT %d`, - cursor, netId, pageSize + 1) +WHERE A.idx > %d AND A.net_id = %d AND A.owner_address=? `, + cursor, netId) if filterType == 1 { sql += "B.status = '" + constant.ORDER_STATUS_ACTIVE + "'" } else if filterType == 2 { diff --git a/server/marketserver/api/v1/market/market.go b/server/marketserver/api/v1/market/market.go index ce3533fc..43614851 100644 --- a/server/marketserver/api/v1/market/market.go +++ b/server/marketserver/api/v1/market/market.go @@ -57,6 +57,12 @@ func (this *MarketApi) ProductList(c *gin.Context) { SELECT * FROM t_order A WHERE idx > %d AND net_id = %d AND status="%s" `, cursor, netId, constant.ORDER_STATUS_ACTIVE) + if f5.IsTestEnv() { + sql = fmt.Sprintf(` +SELECT * FROM t_order A WHERE idx > %d AND net_id = %d +`, + cursor, netId) + } orderBy := "" {