From c866483a5526c412ec97de3f91be043d7b9e4733 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sun, 28 Jul 2024 08:16:18 +0800 Subject: [PATCH 01/18] 1 --- server/light_backtask/task/taskmgr.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/light_backtask/task/taskmgr.go b/server/light_backtask/task/taskmgr.go index d359400c..ec15dcea 100644 --- a/server/light_backtask/task/taskmgr.go +++ b/server/light_backtask/task/taskmgr.go @@ -19,13 +19,13 @@ func (this *taskMgr) Init() { this.sysMail.init() this.repairOrder.init() //this.refreshMeta.init() - //this.contribution.init() + this.contribution.init() this.chainActivity.init() } func (this *taskMgr) UnInit() { this.chainActivity.unInit() - //this.contribution.unInit() + this.contribution.unInit() //this.refreshMeta.unInit() this.repairOrder.unInit() this.sysMail.unInit() From 0670f694f008122d5fd9490026b16cbd65e80a5d Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 29 Jul 2024 11:00:06 +0800 Subject: [PATCH 02/18] 1 --- server/light_backtask/service/nftutils.go | 42 +++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/server/light_backtask/service/nftutils.go b/server/light_backtask/service/nftutils.go index 96030b97..f0d35e54 100644 --- a/server/light_backtask/service/nftutils.go +++ b/server/light_backtask/service/nftutils.go @@ -180,3 +180,45 @@ func NftUpdateLock(netId int32, contractAddress string, tokenId string, }) return result } + +func RepiarHeroQuality() error { + var resultErr error + nftQuality := [][]string{} + { + f5.GetGoStyleDb().OrmSelect( + constant.BCNFT_DB, + "t_nft", + [][]string{ + {"token_type", q5.ToString(jccommon.NFT_TYPE_CFHERO)}, + }, + func (err error, ds *f5.DataSet) { + resultErr = err + if err == nil { + for ds.Next() { + q5.AppendSlice(&nftQuality, + []string{ds.GetByName("token_id"), ds.GetByName("quality")}) + } + } + }) + if resultErr == nil { + f5.GetGoStyleDb().OrmSelect( + constant.BCNFT_DB, + "t_nft", + [][]string{ + {"token_type", q5.ToString(jccommon.NFT_TYPE_CFHERO_NORMAL)}, + }, + func (err error, ds *f5.DataSet) { + resultErr = err + if err == nil { + for ds.Next() { + q5.AppendSlice(&nftQuality, + []string{ds.GetByName("token_id"), ds.GetByName("quality")}) + } + } + }) + } + } + if resultErr == nil { + } + return resultErr +} From fd7bbaad030fa916fa10fe168d5f9a302ed2b4d7 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 29 Jul 2024 11:21:14 +0800 Subject: [PATCH 03/18] 1 --- server/light_backtask/service/nftutils.go | 34 ++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/server/light_backtask/service/nftutils.go b/server/light_backtask/service/nftutils.go index f0d35e54..918c24c7 100644 --- a/server/light_backtask/service/nftutils.go +++ b/server/light_backtask/service/nftutils.go @@ -218,7 +218,39 @@ func RepiarHeroQuality() error { }) } } - if resultErr == nil { + procBatchFunc := func(batch [][]string) { + if len(batch) <= 0 { + return + } + sql := "SELECT * FROM t_hero WHERE token_id IN (" + params := []string{} + tokenIdQualityHash := map[string]int32{} + for _, val := range batch { + sql += "?" + q5.AppendSlice(¶ms, val[0]) + tokenIdQualityHash[val[0]] = q5.ToInt32(val[1]) + } + f5.GetGoStyleDb().RawQuery( + constant.GAME_DB, + sql, + params, + func (err error, ds *f5.DataSet) { + + }) + } + if resultErr == nil && len(nftQuality) > 0 { + batchNftQuality := [][]string{} + for _, val := range nftQuality { + if len(batchNftQuality) < 100 { + q5.AppendSlice(&batchNftQuality, val) + } else { + procBatchFunc(batchNftQuality) + batchNftQuality = [][]string{} + } + } + if len(batchNftQuality) > 0 { + procBatchFunc(batchNftQuality) + } } return resultErr } From 0ca14626b94a7726e76fd5f3c2eeba695d01df8c Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 29 Jul 2024 11:23:55 +0800 Subject: [PATCH 04/18] 1 --- server/light_backtask/service/nftutils.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/server/light_backtask/service/nftutils.go b/server/light_backtask/service/nftutils.go index 918c24c7..562ad620 100644 --- a/server/light_backtask/service/nftutils.go +++ b/server/light_backtask/service/nftutils.go @@ -222,7 +222,7 @@ func RepiarHeroQuality() error { if len(batch) <= 0 { return } - sql := "SELECT * FROM t_hero WHERE token_id IN (" + sql := "SELECT token_id, quality FROM t_hero WHERE token_id IN (" params := []string{} tokenIdQualityHash := map[string]int32{} for _, val := range batch { @@ -235,7 +235,15 @@ func RepiarHeroQuality() error { sql, params, func (err error, ds *f5.DataSet) { - + if err != nil { + return + } + for ds.Next() { + tokenId := ds.GetByName("token_id") + quality := q5.ToInt32(ds.GetByName("quality")) + if val, ok := tokenIdQualityHash[tokenId]; ok && val != quality { + } + } }) } if resultErr == nil && len(nftQuality) > 0 { From 946147137512b337189b87d9069e33e3e4afb055 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 29 Jul 2024 11:28:10 +0800 Subject: [PATCH 05/18] 1 --- server/light_backtask/service/nftutils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/light_backtask/service/nftutils.go b/server/light_backtask/service/nftutils.go index 562ad620..dbb79ce8 100644 --- a/server/light_backtask/service/nftutils.go +++ b/server/light_backtask/service/nftutils.go @@ -222,7 +222,7 @@ func RepiarHeroQuality() error { if len(batch) <= 0 { return } - sql := "SELECT token_id, quality FROM t_hero WHERE token_id IN (" + sql := "SELECT token_id, hero_id, quality FROM t_hero WHERE token_id IN (" params := []string{} tokenIdQualityHash := map[string]int32{} for _, val := range batch { From 910861e955a886bbcb3001312bb437bdfd440509 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 29 Jul 2024 11:41:12 +0800 Subject: [PATCH 06/18] 1 --- server/jccommon/types.go | 22 ++++++++ server/light_backtask/service/nftutils.go | 61 ++++++++++++++++------- 2 files changed, 66 insertions(+), 17 deletions(-) diff --git a/server/jccommon/types.go b/server/jccommon/types.go index 9a5ac507..b248b822 100644 --- a/server/jccommon/types.go +++ b/server/jccommon/types.go @@ -1,5 +1,9 @@ package jccommon +import ( + "f5" +) + type ActivitySaleEvent struct { EventName string `json:"event_name"` EventId string `json:"event_id"` @@ -95,6 +99,24 @@ type UserStackingPo struct { Contracts []*ContractStackingPo `json:"contracts"` } +type NftIdentity struct { + NetId int32 + ContractAddress string + TokenId string +} + +type NftIdentityAndExtData struct { + NetId int32 + ContractAddress string + TokenId string + ItemId int32 + Quality int32 +} + +func (this *NftIdentityAndExtData) LoadFromDb(ds *f5.DataSet) { + +} + func NewNftStackingPo() *NftStackingPo { p := new(NftStackingPo) return p diff --git a/server/light_backtask/service/nftutils.go b/server/light_backtask/service/nftutils.go index dbb79ce8..f9a89303 100644 --- a/server/light_backtask/service/nftutils.go +++ b/server/light_backtask/service/nftutils.go @@ -183,7 +183,7 @@ func NftUpdateLock(netId int32, contractAddress string, tokenId string, func RepiarHeroQuality() error { var resultErr error - nftQuality := [][]string{} + nftDatas := []*jccommon.NftIdentityAndExtData{} { f5.GetGoStyleDb().OrmSelect( constant.BCNFT_DB, @@ -193,11 +193,13 @@ func RepiarHeroQuality() error { }, func (err error, ds *f5.DataSet) { resultErr = err - if err == nil { - for ds.Next() { - q5.AppendSlice(&nftQuality, - []string{ds.GetByName("token_id"), ds.GetByName("quality")}) - } + if err != nil { + return + } + for ds.Next() { + p := new(jccommon.NftIdentityAndExtData) + p.LoadFromDb(ds) + q5.AppendSlice(&nftDatas, p); } }) if resultErr == nil { @@ -209,27 +211,30 @@ func RepiarHeroQuality() error { }, func (err error, ds *f5.DataSet) { resultErr = err - if err == nil { - for ds.Next() { - q5.AppendSlice(&nftQuality, - []string{ds.GetByName("token_id"), ds.GetByName("quality")}) - } + if err != nil { + return + } + for ds.Next() { + p := new(jccommon.NftIdentityAndExtData) + p.LoadFromDb(ds) + q5.AppendSlice(&nftDatas, p); } }) } } - procBatchFunc := func(batch [][]string) { + procBatchFunc := func(batch []*jccommon.NftIdentityAndExtData) { if len(batch) <= 0 { return } sql := "SELECT token_id, hero_id, quality FROM t_hero WHERE token_id IN (" params := []string{} tokenIdQualityHash := map[string]int32{} + /* for _, val := range batch { sql += "?" q5.AppendSlice(¶ms, val[0]) tokenIdQualityHash[val[0]] = q5.ToInt32(val[1]) - } + }*/ f5.GetGoStyleDb().RawQuery( constant.GAME_DB, sql, @@ -246,14 +251,14 @@ func RepiarHeroQuality() error { } }) } - if resultErr == nil && len(nftQuality) > 0 { - batchNftQuality := [][]string{} - for _, val := range nftQuality { + if resultErr == nil && len(nftDatas) > 0 { + batchNftQuality := []*jccommon.NftIdentityAndExtData{} + for _, val := range nftDatas { if len(batchNftQuality) < 100 { q5.AppendSlice(&batchNftQuality, val) } else { procBatchFunc(batchNftQuality) - batchNftQuality = [][]string{} + batchNftQuality = []*jccommon.NftIdentityAndExtData{} } } if len(batchNftQuality) > 0 { @@ -262,3 +267,25 @@ func RepiarHeroQuality() error { } return resultErr } + +func updateNftItemIdQuality(netId int32, contractAddress string, tokenId string, + itemId int32, quality int32) error { + var resultErr error + f5.GetGoStyleDb().Update( + constant.BCNFT_DB, + "t_nft", + [][]string { + {"net_id", q5.ToString(netId)}, + {"contract_address", contractAddress}, + {"token_id", tokenId}, + {"item_id", q5.ToString(0)}, + }, + [][]string { + {"item_id", q5.ToString(itemId)}, + {"quality", q5.ToString(quality)}, + }, + func (err error, lastInsertId int64, rowsAffected int64) { + resultErr = err + }) + return resultErr +} From ebb7a03c2e91685e55dd5f5ceab90b7b4f7d538c Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 29 Jul 2024 11:44:04 +0800 Subject: [PATCH 07/18] 1 --- server/jccommon/types.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/jccommon/types.go b/server/jccommon/types.go index b248b822..7316cbee 100644 --- a/server/jccommon/types.go +++ b/server/jccommon/types.go @@ -1,6 +1,7 @@ package jccommon import ( + "q5" "f5" ) @@ -114,7 +115,11 @@ type NftIdentityAndExtData struct { } func (this *NftIdentityAndExtData) LoadFromDb(ds *f5.DataSet) { - + this.NetId = q5.ToInt32(ds.GetByName("net_id")) + this.ContractAddress = ds.GetByName("contract_address") + this.TokenId = ds.GetByName("token_id") + this.ItemId = q5.ToInt32(ds.GetByName("item_id")) + this.Quality = q5.ToInt32(ds.GetByName("quality")) } func NewNftStackingPo() *NftStackingPo { From b031b3fda2019f2e3210a19edf76e56d96284503 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 29 Jul 2024 11:48:58 +0800 Subject: [PATCH 08/18] 1 --- server/light_backtask/service/nftutils.go | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/server/light_backtask/service/nftutils.go b/server/light_backtask/service/nftutils.go index f9a89303..668e9b16 100644 --- a/server/light_backtask/service/nftutils.go +++ b/server/light_backtask/service/nftutils.go @@ -228,13 +228,19 @@ func RepiarHeroQuality() error { } sql := "SELECT token_id, hero_id, quality FROM t_hero WHERE token_id IN (" params := []string{} - tokenIdQualityHash := map[string]int32{} - /* - for _, val := range batch { - sql += "?" - q5.AppendSlice(¶ms, val[0]) - tokenIdQualityHash[val[0]] = q5.ToInt32(val[1]) - }*/ + tokenIdQualityHash := map[string]*jccommon.NftIdentityAndExtData{} + { + inited := false + for _, val := range batch { + if !inited { + sql += "?" + } else { + sql += ", ?" + } + q5.AppendSlice(¶ms, val.TokenId) + tokenIdQualityHash[val.TokenId] = val + } + } f5.GetGoStyleDb().RawQuery( constant.GAME_DB, sql, @@ -246,7 +252,7 @@ func RepiarHeroQuality() error { for ds.Next() { tokenId := ds.GetByName("token_id") quality := q5.ToInt32(ds.GetByName("quality")) - if val, ok := tokenIdQualityHash[tokenId]; ok && val != quality { + if val, ok := tokenIdQualityHash[tokenId]; ok && val.Quality != quality { } } }) From bcd5f914eb3b1a4d47f19c2b9dd66e6c48badebe Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 29 Jul 2024 11:52:04 +0800 Subject: [PATCH 09/18] 1 --- server/light_backtask/service/nftutils.go | 35 +++++++++-------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/server/light_backtask/service/nftutils.go b/server/light_backtask/service/nftutils.go index 668e9b16..3d5302e2 100644 --- a/server/light_backtask/service/nftutils.go +++ b/server/light_backtask/service/nftutils.go @@ -185,23 +185,24 @@ func RepiarHeroQuality() error { var resultErr error nftDatas := []*jccommon.NftIdentityAndExtData{} { + cb := func (err error, ds *f5.DataSet) { + resultErr = err + if err != nil { + return + } + for ds.Next() { + p := new(jccommon.NftIdentityAndExtData) + p.LoadFromDb(ds) + q5.AppendSlice(&nftDatas, p); + } + } f5.GetGoStyleDb().OrmSelect( constant.BCNFT_DB, "t_nft", [][]string{ {"token_type", q5.ToString(jccommon.NFT_TYPE_CFHERO)}, }, - func (err error, ds *f5.DataSet) { - resultErr = err - if err != nil { - return - } - for ds.Next() { - p := new(jccommon.NftIdentityAndExtData) - p.LoadFromDb(ds) - q5.AppendSlice(&nftDatas, p); - } - }) + cb) if resultErr == nil { f5.GetGoStyleDb().OrmSelect( constant.BCNFT_DB, @@ -209,17 +210,7 @@ func RepiarHeroQuality() error { [][]string{ {"token_type", q5.ToString(jccommon.NFT_TYPE_CFHERO_NORMAL)}, }, - func (err error, ds *f5.DataSet) { - resultErr = err - if err != nil { - return - } - for ds.Next() { - p := new(jccommon.NftIdentityAndExtData) - p.LoadFromDb(ds) - q5.AppendSlice(&nftDatas, p); - } - }) + cb) } } procBatchFunc := func(batch []*jccommon.NftIdentityAndExtData) { From b03cd8a4ac6f6564d6b9bda8e622430cac21da03 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 29 Jul 2024 11:55:17 +0800 Subject: [PATCH 10/18] 1 --- server/light_backtask/service/nftutils.go | 25 +++++++++++++++-------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/server/light_backtask/service/nftutils.go b/server/light_backtask/service/nftutils.go index 3d5302e2..762b66b1 100644 --- a/server/light_backtask/service/nftutils.go +++ b/server/light_backtask/service/nftutils.go @@ -242,30 +242,37 @@ func RepiarHeroQuality() error { } for ds.Next() { tokenId := ds.GetByName("token_id") + itemId := q5.ToInt32(ds.GetByName("hero_id")) quality := q5.ToInt32(ds.GetByName("quality")) - if val, ok := tokenIdQualityHash[tokenId]; ok && val.Quality != quality { + if val, ok := tokenIdQualityHash[tokenId]; ok && quality > val.Quality && itemId > 0 { + UpdateNftItemIdQuality( + val.NetId, + val.ContractAddress, + val.TokenId, + itemId, + quality) } } }) } if resultErr == nil && len(nftDatas) > 0 { - batchNftQuality := []*jccommon.NftIdentityAndExtData{} + batch := []*jccommon.NftIdentityAndExtData{} for _, val := range nftDatas { - if len(batchNftQuality) < 100 { - q5.AppendSlice(&batchNftQuality, val) + if len(batch) < 100 { + q5.AppendSlice(&batch, val) } else { - procBatchFunc(batchNftQuality) - batchNftQuality = []*jccommon.NftIdentityAndExtData{} + procBatchFunc(batch) + batch = []*jccommon.NftIdentityAndExtData{} } } - if len(batchNftQuality) > 0 { - procBatchFunc(batchNftQuality) + if len(batch) > 0 { + procBatchFunc(batch) } } return resultErr } -func updateNftItemIdQuality(netId int32, contractAddress string, tokenId string, +func UpdateNftItemIdQuality(netId int32, contractAddress string, tokenId string, itemId int32, quality int32) error { var resultErr error f5.GetGoStyleDb().Update( From 3abfe8e47e47ffafdb3ab992f95391e345f0d7ad Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 29 Jul 2024 11:57:28 +0800 Subject: [PATCH 11/18] 1 --- server/light_backtask/service/nftutils.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/light_backtask/service/nftutils.go b/server/light_backtask/service/nftutils.go index 762b66b1..2b2e5359 100644 --- a/server/light_backtask/service/nftutils.go +++ b/server/light_backtask/service/nftutils.go @@ -181,7 +181,7 @@ func NftUpdateLock(netId int32, contractAddress string, tokenId string, return result } -func RepiarHeroQuality() error { +func RepairAllHeroNftQuality() error { var resultErr error nftDatas := []*jccommon.NftIdentityAndExtData{} { @@ -213,6 +213,7 @@ func RepiarHeroQuality() error { cb) } } + f5.GetSysLog().Info("nftutils.RepairAllHeroNftQuality start") procBatchFunc := func(batch []*jccommon.NftIdentityAndExtData) { if len(batch) <= 0 { return @@ -269,6 +270,7 @@ func RepiarHeroQuality() error { procBatchFunc(batch) } } + f5.GetSysLog().Info("nftutils.RepairAllHeroNftQuality end err:%s", resultErr) return resultErr } From 6f63c339122d7823c9ea281b98765563e503a140 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 29 Jul 2024 11:58:18 +0800 Subject: [PATCH 12/18] 1 --- server/light_backtask/service/nftutils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/light_backtask/service/nftutils.go b/server/light_backtask/service/nftutils.go index 2b2e5359..013209e2 100644 --- a/server/light_backtask/service/nftutils.go +++ b/server/light_backtask/service/nftutils.go @@ -213,7 +213,7 @@ func RepairAllHeroNftQuality() error { cb) } } - f5.GetSysLog().Info("nftutils.RepairAllHeroNftQuality start") + f5.GetSysLog().Info("nftutils.RepairAllHeroNftQuality start len:%d", len(nftDatas)) procBatchFunc := func(batch []*jccommon.NftIdentityAndExtData) { if len(batch) <= 0 { return From 26e7ae373d75f9327e3135c859a817da06fa375b Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 29 Jul 2024 12:00:30 +0800 Subject: [PATCH 13/18] 1 --- server/light_backtask/service/nftutils.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/server/light_backtask/service/nftutils.go b/server/light_backtask/service/nftutils.go index 013209e2..f96ae197 100644 --- a/server/light_backtask/service/nftutils.go +++ b/server/light_backtask/service/nftutils.go @@ -246,12 +246,20 @@ func RepairAllHeroNftQuality() error { itemId := q5.ToInt32(ds.GetByName("hero_id")) quality := q5.ToInt32(ds.GetByName("quality")) if val, ok := tokenIdQualityHash[tokenId]; ok && quality > val.Quality && itemId > 0 { + f5.GetSysLog().Info("nftutils.RepairAllHeroNftQuality token_id:%s src_item_id:%d src_quality:%d new_item_id:%d, new_quality:%d", + val.TokenId, + val.ItemId, + val.Quality, + itemId, + quality) + /* UpdateNftItemIdQuality( val.NetId, val.ContractAddress, val.TokenId, itemId, quality) + */ } } }) From 68e61a759108707e70f6923b3d1c4198c7511680 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 29 Jul 2024 13:18:43 +0800 Subject: [PATCH 14/18] 1 --- server/light_backtask/service/nftutils.go | 2 ++ server/light_backtask/task/contribution.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/server/light_backtask/service/nftutils.go b/server/light_backtask/service/nftutils.go index f96ae197..273bf353 100644 --- a/server/light_backtask/service/nftutils.go +++ b/server/light_backtask/service/nftutils.go @@ -226,12 +226,14 @@ func RepairAllHeroNftQuality() error { for _, val := range batch { if !inited { sql += "?" + inited = true } else { sql += ", ?" } q5.AppendSlice(¶ms, val.TokenId) tokenIdQualityHash[val.TokenId] = val } + sql += ")" } f5.GetGoStyleDb().RawQuery( constant.GAME_DB, diff --git a/server/light_backtask/task/contribution.go b/server/light_backtask/task/contribution.go index 590adcf4..c1ad6439 100644 --- a/server/light_backtask/task/contribution.go +++ b/server/light_backtask/task/contribution.go @@ -4,6 +4,7 @@ import ( "q5" "f5" "mt" + "main/service" "jccommon" "main/constant" "time" @@ -71,6 +72,7 @@ func (this* contribution) unInit() { } func (this* contribution) stat(statTime int64, nowTime int64) { + service.RepairAllHeroNftQuality() for true { if this.internalStat(statTime, nowTime) { return From 1784fa4592459ff206c7e4a6a4dfc217c6c71ec3 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 29 Jul 2024 13:23:20 +0800 Subject: [PATCH 15/18] 1 --- server/light_backtask/service/nftutils.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/light_backtask/service/nftutils.go b/server/light_backtask/service/nftutils.go index 273bf353..776296a3 100644 --- a/server/light_backtask/service/nftutils.go +++ b/server/light_backtask/service/nftutils.go @@ -254,14 +254,12 @@ func RepairAllHeroNftQuality() error { val.Quality, itemId, quality) - /* UpdateNftItemIdQuality( val.NetId, val.ContractAddress, val.TokenId, itemId, quality) - */ } } }) From b747dfba0ec765e320947bd26bd8cc8ab2491004 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 29 Jul 2024 13:46:52 +0800 Subject: [PATCH 16/18] 1 --- server/light_backtask/service/nftutils.go | 1 - 1 file changed, 1 deletion(-) diff --git a/server/light_backtask/service/nftutils.go b/server/light_backtask/service/nftutils.go index 776296a3..fc8881eb 100644 --- a/server/light_backtask/service/nftutils.go +++ b/server/light_backtask/service/nftutils.go @@ -292,7 +292,6 @@ func UpdateNftItemIdQuality(netId int32, contractAddress string, tokenId string, {"net_id", q5.ToString(netId)}, {"contract_address", contractAddress}, {"token_id", tokenId}, - {"item_id", q5.ToString(0)}, }, [][]string { {"item_id", q5.ToString(itemId)}, From 6e391ae87a97e4e1a7c22c706042567f81608cf6 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 29 Jul 2024 14:14:20 +0800 Subject: [PATCH 17/18] 1 --- server/light_backtask/task/contribution.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/light_backtask/task/contribution.go b/server/light_backtask/task/contribution.go index c1ad6439..a2d5b985 100644 --- a/server/light_backtask/task/contribution.go +++ b/server/light_backtask/task/contribution.go @@ -100,10 +100,10 @@ func (this* contribution) internalStat(statTime int64, nowTime int64) bool { } { addressHash := new(q5.ConcurrentMap[string, *accountStacking]) - sqlTpl := "SELECT * FROM t_nft WHERE idx > %d AND token_type <> ? AND last_lock_time < ? AND owner_address IN (" + sqlTpl := "SELECT * FROM t_nft WHERE idx > %d AND token_type <> ? AND last_lock_time <= ? AND owner_address IN (" params := []string{ q5.ToString(jccommon.NFT_TYPE_GOLD_BULLION), - q5.ToString(statTime), + q5.ToString(statDaySeconds), } { inited := false From ce1e1d9496867d4d3e064d9b2b73a175d3464a3b Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 29 Jul 2024 14:27:39 +0800 Subject: [PATCH 18/18] 1 --- README.md | 7 +++++++ server/marketserver/api/v1/activity/stacking.go | 9 ++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7942fa39..f7fae30e 100644 --- a/README.md +++ b/README.md @@ -60,3 +60,10 @@ SMLogin # 参考 https://gorm.io/zh_CN/docs/ + +# bug + +0x8308b66adccf350e5956cf3cf3570dd744ede760 +t_staking_daily_settlement +10452 +idx: 10137 diff --git a/server/marketserver/api/v1/activity/stacking.go b/server/marketserver/api/v1/activity/stacking.go index 206b03f5..5f015acc 100644 --- a/server/marketserver/api/v1/activity/stacking.go +++ b/server/marketserver/api/v1/activity/stacking.go @@ -114,9 +114,12 @@ func (sa *StackingApi) ContributionQuery(c *gin.Context) { ContributionPoint string `json:"contribution_point"` }{} for ds.Next() { - obj.Date = q5.SafeToInt32(ds.GetByName("settle_date")) - obj.ContributionPoint = ds.GetByName("contribution") - rspObj.Rows = append(rspObj.Rows, obj) + contributionPoint := q5.ToFloat64(ds.GetByName("contribution")) + if contributionPoint > 0.00001 { + obj.Date = q5.SafeToInt32(ds.GetByName("settle_date")) + obj.ContributionPoint = ds.GetByName("contribution") + rspObj.Rows = append(rspObj.Rows, obj) + } } }) }