From 106065bcda8e4583713b0535419ec2b4e912e9d9 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sat, 29 Jun 2024 16:51:13 +0800 Subject: [PATCH] 1 --- server/marketserver/api/v1/asset/asset.go | 2 +- server/marketserver/common/types.go | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/server/marketserver/api/v1/asset/asset.go b/server/marketserver/api/v1/asset/asset.go index 3af4e225..8e68f04e 100644 --- a/server/marketserver/api/v1/asset/asset.go +++ b/server/marketserver/api/v1/asset/asset.go @@ -36,7 +36,7 @@ WHERE A.idx > %d AND A.net_id = %d AND A.owner_address=? `, if filterType == 1 { sql += " AND B.status = '" + jccommon.ORDER_STATUS_ACTIVE + "' " } else if filterType == 2 { - sql += " AND B.status <> '" + jccommon.ORDER_STATUS_ACTIVE + "' " + sql += " AND (B.status IS NULL OR B.status <> '" + jccommon.ORDER_STATUS_ACTIVE + "') " } subFilters := []f5.DbQueryFilter{} { diff --git a/server/marketserver/common/types.go b/server/marketserver/common/types.go index 1021837d..6a7fd575 100644 --- a/server/marketserver/common/types.go +++ b/server/marketserver/common/types.go @@ -19,6 +19,7 @@ type StreamPagination struct { NextCursor string `json:"next_cursor"` PreviousCursor string `json:"previous_cursor"` Remaining int32 `json:"remaining"` + Count int32 `json:"count"` } type ShopCartGoods struct { @@ -70,6 +71,7 @@ func (this* StreamPagination) FillPage(page *f5.StreamPagination) { if page.PreviousCursor != 0 { this.PreviousCursor = q5.ToString(page.PreviousCursor) } + this.Count = page.Count this.Remaining = page.Remaining }