From b70c939eaa029c7360c568167614f58cba6ccbc9 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 27 Jun 2024 20:48:53 +0800 Subject: [PATCH] 1 --- database/maildb.sql | 3 ++- server/marketserver/api/v1/market/market.go | 14 +++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/database/maildb.sql b/database/maildb.sql index 7500aab8..16d7255c 100644 --- a/database/maildb.sql +++ b/database/maildb.sql @@ -57,7 +57,8 @@ CREATE TABLE `t_mail` ( `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', UNIQUE KEY `idx` (`idx`), UNIQUE KEY `unikey` (`unikey`), - PRIMARY KEY (`mail_id`) + UNIQUE KEY `mail_id` (`mail_id`), + PRIMARY KEY (`idx`) ) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; /*!40101 SET character_set_client = @saved_cs_client */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; diff --git a/server/marketserver/api/v1/market/market.go b/server/marketserver/api/v1/market/market.go index 156fc848..a8488e91 100644 --- a/server/marketserver/api/v1/market/market.go +++ b/server/marketserver/api/v1/market/market.go @@ -209,10 +209,14 @@ SELECT * FROM t_sale 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 []struct{ + Event interface{} `json:"event"` + Nft interface{} `json:"nft"` + InShopCart int32 `json:"in_shopcart"` + } `json:"rows"` }{ - Rows : []interface{}{}, } + q5.NewSlice(&rspObj.Rows, 0, 10) orderBy := "" nfts := []*common.NftDto{} f5.GetGoStyleDb().StreamPageQuery( @@ -231,12 +235,16 @@ SELECT * FROM t_sale 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)