From 36fbd33dab73d5768c45f1582cd69aa6d0be3397 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 5 Jul 2024 11:08:14 +0800
Subject: [PATCH] 1

---
 server/backtask/task/nftlock.go | 17 ++++++++++++++++-
 server/jccommon/constant.go     |  4 ++--
 server/jccommon/utils.go        |  8 ++++----
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/server/backtask/task/nftlock.go b/server/backtask/task/nftlock.go
index ad203192..e534c30d 100644
--- a/server/backtask/task/nftlock.go
+++ b/server/backtask/task/nftlock.go
@@ -38,7 +38,7 @@ func (this* nftLock) process() {
 		},
 		func (lastIdx int64) string {
 			sql := fmt.Sprintf(`
-SELECT * FROM t_nft_lock_event WHERE idx > %d AND nft_sync_status = 0 LIMIT 100`,
+SELECT * FROM t_nft_lock_event WHERE idx > %d AND (nft_sync_status = 0 OR nft_use_status = 0) LIMIT 100`,
 				lastIdx,
 			)
 			return sql
@@ -56,6 +56,7 @@ SELECT * FROM t_nft_lock_event WHERE idx > %d AND nft_sync_status = 0 LIMIT 100`
 
 func (this* nftLock) repair(ds *f5.DataSet) bool {
 	nftSyncStatus := q5.ToInt32(ds.GetByName("nft_sync_status"))
+	nftUseStatus := q5.ToInt32(ds.GetByName("nft_use_status"))
 	netId := q5.ToInt32(ds.GetByName("net_id"))
 	idx := q5.ToInt64(ds.GetByName("idx"))
 	lockTo := ds.GetByName("lock_to")
@@ -71,5 +72,19 @@ func (this* nftLock) repair(ds *f5.DataSet) bool {
 			}
 		}
 	}
+	if nftUseStatus == 0 {
+		/*
+		goldContractMeta := mt.Table.Contract.GetByNetIdName(netId, jccommon.)
+		p := new(lockReturnValues)
+		if q5.DecodeJson(ds.GetByName("return_values"), p) == nil {
+			for _, val := range p.TokenIds {
+				contractAddress := strings.ToLower(p.Nft)
+				tokenId := val
+				if service.NftExists(netId, contractAddress, tokenId) {
+					service.NftUpdateLock(netId, contractAddress, tokenId, idx, lockTo)
+				}
+			}
+		}*/
+	}
 	return true
 }
diff --git a/server/jccommon/constant.go b/server/jccommon/constant.go
index 2ebcfaea..f1ec865b 100644
--- a/server/jccommon/constant.go
+++ b/server/jccommon/constant.go
@@ -47,8 +47,8 @@ const (
 )
 
 const (
-	V_ITEM_GOLD_BULLION_1W = 10017
-	V_ITEM_GOLD_BULLION_10W = 10018
+	V_ITEM_GOLD_BULLION_1K = 10017
+	V_ITEM_GOLD_BULLION_1W = 10018
 )
 
 const (
diff --git a/server/jccommon/utils.go b/server/jccommon/utils.go
index 73860a00..591f3fc4 100644
--- a/server/jccommon/utils.go
+++ b/server/jccommon/utils.go
@@ -6,11 +6,11 @@ import (
 
 func GetGoldBullionGoldNum(itemId int32) int32 {
 	switch itemId {
-	case V_ITEM_GOLD_BULLION_1W: {
-		return 10000
+	case V_ITEM_GOLD_BULLION_1K: {
+		return 1000
 	}
-	case V_ITEM_GOLD_BULLION_10W: {
-		return 10000 * 10
+	case V_ITEM_GOLD_BULLION_1W: {
+		return 10000 * 1
 	}
 	default: {
 		return 0