From 16bb6b64fbb023eb9b21d7d58e2d1b254544ff53 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 11 Jul 2023 17:06:22 +0800
Subject: [PATCH] 1

---
 .../UserMinterFactory/activate721nft.js       | 46 ++++++++-----------
 .../events/common/BaseEventProcess.js         |  2 +-
 2 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/server/web3dbspider/services/events/UserMinterFactory/activate721nft.js b/server/web3dbspider/services/events/UserMinterFactory/activate721nft.js
index 93337f2..7dface4 100644
--- a/server/web3dbspider/services/events/UserMinterFactory/activate721nft.js
+++ b/server/web3dbspider/services/events/UserMinterFactory/activate721nft.js
@@ -2,7 +2,6 @@ const log = require('j7/log');
 const app = require('j7/app');
 const bcutils = require('j7/bcutils');
 const utils = require('j7/utils');
-const j7event = require('j7/event');
 const constant = require('common/constant');
 const bcconst = require('common/bcconst');
 const bchelper = require('common/bchelper');
@@ -21,7 +20,7 @@ event TokenMinted(
 
 class Activate721Nft extends BaseEventProcess {
 
-  async start(event) {
+  async start() {
     const returnValues = this.getReturnValues();
     const transId = returnValues['nonce'];
     const to = returnValues['to'];
@@ -61,40 +60,31 @@ class Activate721Nft extends BaseEventProcess {
       return;
     }
     await this.updateGameDbInfo(transId, itemUniId, itemId, tokenId, tokenType);
+    const nowTime = utils.getUtcTime();
+    const fieldList = [
+      ['token_id', tokenId],
+      ['token_type', tokenType],
+      ['item_id', itemId],
+      ['owner_address', bcutils.toNormalAddress(owner)],
+      ['creator_address', bcutils.toNormalAddress(owner)],
+      ['confirm_block_number', this.getBlockNumber()],
+      ['createtime', nowTime],
+      ['modifytime', nowTime],
+    ];
     const {err} = await this.bcNftConn(
-      'ormSelectOne',
+      'upsert',
       't_nft',
       [
         ['token_id', tokenId],
         ['net_id', this.getNetId()],
         ['contract_address', this.getContractAddress()],
-      ]
+      ],
+      [
+      ],
+      fieldList
     );
     if (err) {
-      log.error('processEvent:' + err);
-      throw 'processEvent:' + err;
-    }
-    if (!row) {
-      const nowTime = utils.getUtcTime();
-      const fieldList = [
-        ['token_id', tokenId],
-        ['token_type', tokenType],
-        ['item_id', itemId],
-        ['owner_address', bcutils.toNormalAddress(owner)],
-        ['creator_address', bcutils.toNormalAddress(owner)],
-        ['confirm_block_number', this.getBlockNumber()],
-        ['createtime', nowTime],
-        ['modifytime', nowTime],
-      ];
-      const {err} = await this.bcNftConn(
-        'insert',
-        't_nft',
-        fieldList
-      );
-      if (err) {
-        log.error('processEvent:' + err);
-        throw 'processEvent:' + err;
-      }
+      this.throwError('mintNft transId:' + transId);
     }
   }
 
diff --git a/server/web3dbspider/services/events/common/BaseEventProcess.js b/server/web3dbspider/services/events/common/BaseEventProcess.js
index cfe752e..281f47d 100644
--- a/server/web3dbspider/services/events/common/BaseEventProcess.js
+++ b/server/web3dbspider/services/events/common/BaseEventProcess.js
@@ -11,7 +11,7 @@ class BaseEventProcess {
 
   constructor(proc, conn, eventDb) {
     this.eventProc = proc;
-    this.conn = conn;
+    //this.conn = conn;
     this.eventDb = eventDb;
     this.returnValues = utils.jsonDecode(this.getEventDb()['return_values']);
     this.bcEventConn = null;