From 8a19d47445ec47806427154a21c734bfd3f1d9be Mon Sep 17 00:00:00 2001
From: yangduo <yangduo@kingsome.cn>
Date: Wed, 24 Jul 2024 14:28:03 +0800
Subject: [PATCH] activity query

---
 server/marketserver/api/v1/event/event.go | 12 +++++++++---
 server/marketserver/constant/constant.go  |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/server/marketserver/api/v1/event/event.go b/server/marketserver/api/v1/event/event.go
index f5fca878..48544a86 100644
--- a/server/marketserver/api/v1/event/event.go
+++ b/server/marketserver/api/v1/event/event.go
@@ -18,6 +18,12 @@ import (
 type EventApi struct {
 }
 
+var EVENTYPE = map[string]int32{
+	"mint":   1,
+	"lock":   2,
+	"unlock": 3,
+}
+
 func (ea *EventApi) TxQuery(c *gin.Context) {
 	netid := q5.SafeToInt32(c.Param("net_id"))
 	txhash := strings.ToLower(c.Param("txhash"))
@@ -133,7 +139,7 @@ func (ea *EventApi) ActivityQuery(c *gin.Context) {
 		Page    common.StreamPagination `json:"page"`
 		Rows    []struct {
 			Nft  interface{} `json:"nft"`
-			Type string      `json:"type"`
+			Type int32       `json:"type"`
 			From string      `json:"from"`
 			To   string      `json:"to"`
 			Date int32       `json:"date"`
@@ -161,7 +167,7 @@ func (ea *EventApi) ActivityQuery(c *gin.Context) {
 			p.Payload = map[string]string{}
 			p.Payload.(map[string]string)["type"] = ds.GetByName("event_name")
 			p.Payload.(map[string]string)["to"] = ds.GetByName("to_address")
-			p.Payload.(map[string]string)["from"] = ds.GetByName("from_address")
+			p.Payload.(map[string]string)["from"] = ds.GetByName("sender_address")
 			p.Payload.(map[string]string)["date"] = ds.GetByName("createtime")
 			q5.AppendSlice(&nfts, p)
 		})
@@ -174,7 +180,7 @@ func (ea *EventApi) ActivityQuery(c *gin.Context) {
 				if v, ok := jsonData.(map[string]interface{}); ok {
 					v := q5.MapClone(v)
 					tmpmap := val.Payload.(map[string]string)
-					p.Type = tmpmap["type"]
+					p.Type = EVENTYPE[strings.ToLower(tmpmap["type"])]
 					p.To = tmpmap["to"]
 					p.From = tmpmap["from"]
 					p.Date = q5.SafeToInt32(tmpmap["date"])
diff --git a/server/marketserver/constant/constant.go b/server/marketserver/constant/constant.go
index e650158a..eed5e807 100644
--- a/server/marketserver/constant/constant.go
+++ b/server/marketserver/constant/constant.go
@@ -1,9 +1,9 @@
 package constant
 
 const (
-	BCNFT_DB = "bcnftdb"
+	BCNFT_DB   = "bcnftdb"
 	BCEVENT_DB = "bceventdb"
-	GAME_DB = "gamedb"
+	GAME_DB    = "gamedb"
 )
 
 const (