diff --git a/server/marketserver/api/v1/market/market.go b/server/marketserver/api/v1/market/market.go index c56dd6ec..05af83bf 100644 --- a/server/marketserver/api/v1/market/market.go +++ b/server/marketserver/api/v1/market/market.go @@ -60,6 +60,7 @@ SELECT * FROM t_order A WHERE idx > %d AND net_id = %d } orderBy := "" + /* { for _, val := range reqJson.Sort.Fields { if val.Name == "price" && orderBy == "" { @@ -71,7 +72,7 @@ SELECT * FROM t_order A WHERE idx > %d AND net_id = %d } } } - } + }*/ subFilters := []f5.DbQueryFilter{} { priceMin := q5.SafeToString(reqJson.Filter.PriceMin) @@ -131,10 +132,12 @@ SELECT * FROM t_order A WHERE idx > %d AND net_id = %d ErrCode int32 `json:"errcode"` ErrMsg string `json:"errmsg"` Page common.StreamPagination `json:"page"` - Rows []interface{} `json:"rows"` - }{ - Rows : []interface{}{}, - } + Rows []struct{ + Event interface{} `json:"event"` + Nft interface{} `json:"nft"` + } `json:"rows"` + }{} + q5.NewSlice(&rspObj.Rows, 0, 10) nfts := []*common.NftDto{} f5.GetGoStyleDb().StreamPageQuery( constant.BCNFT_DB, @@ -153,12 +156,16 @@ SELECT * FROM t_order A WHERE idx > %d AND net_id = %d p.NetId = q5.ToInt32(ds.GetByName("net_id")) 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) { for _, val := range nfts { - q5.AppendSlice(&rspObj.Rows, val.NftCache.GetJsonData()) + p := q5.NewSliceElement(&rspObj.Rows) + p.Event = val.Payload + p.Nft = val.NftCache.GetJsonData() } } c.JSON(200, rspObj) diff --git a/server/marketserver/common/types.go b/server/marketserver/common/types.go index 1d3dbe05..bdf9ea6c 100644 --- a/server/marketserver/common/types.go +++ b/server/marketserver/common/types.go @@ -71,6 +71,7 @@ type NftDto struct { ContractAddress string TokenId string NftCache NftCache + Payload interface{} } type App interface { diff --git a/server/nftserver/mt/Contract.go b/server/nftserver/mt/Contract.go new file mode 100644 index 00000000..8c3d302d --- /dev/null +++ b/server/nftserver/mt/Contract.go @@ -0,0 +1,31 @@ +package mt + +import ( +) + +type Contract struct { +} + +type ContractTable struct { +} + + +func (this *ContractTable) IsNoLoad() bool { + return false +} + +func (this *ContractTable) Load() { + +} + +func (this *ContractTable) PreInit1() { + +} + +func (this *ContractTable) ElementsInit(int) { + +} + +func (this *ContractTable) PostInit1() { + +} diff --git a/server/nftserver/mt/export.go b/server/nftserver/mt/export.go index 6a18f3bd..1ec7e865 100644 --- a/server/nftserver/mt/export.go +++ b/server/nftserver/mt/export.go @@ -9,6 +9,7 @@ type table struct { NftDb *NftDbTable Config *ConfigTable NftHomeMeta *NftHomeMetaTable + Contract *ContractTable } var Table = f5.New(func(this *table) { @@ -31,4 +32,7 @@ var Table = f5.New(func(this *table) { this.FileName = "../config/nft_home_meta.json" this.PrimKey = "name" }) + + this.Contract = new(ContractTable) + })