From c6e3cac572b8993e8f0eb89749ecd8910309eea9 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 4 Nov 2022 16:51:29 +0800
Subject: [PATCH 1/2] 1b

---
 .../controller/BlockChainController.class.php | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/webapp/controller/BlockChainController.class.php b/webapp/controller/BlockChainController.class.php
index 6d3ccb7b..2b94b5a8 100644
--- a/webapp/controller/BlockChainController.class.php
+++ b/webapp/controller/BlockChainController.class.php
@@ -103,7 +103,28 @@ class BlockChainController extends BaseAuthedController {
                 myself()->_rspErr(1, 'gun not found');
                 return;
             }
-
+            if ($gunDb['token_id']) {
+                myself()->_rspErr(1, 'already activated');
+                return;
+            }
+            $tokenId = $gunDb['active_token_id'];
+            if (!$tokenId) {
+                $tokenId = BuyRecord::genOrderId
+                         (
+                             2006,
+                             phpcommon\BC_FUNC_CREATION,
+                             myself()->_getNowTime(),
+                             myself()->_getOpenId()
+                         );
+                Gun::Update($gunDb['gun_uniid'],
+                             array(
+                                 'active_token_id' => $tokenId,
+                                 'active_count' => function () {
+                                     return 'active_count + 1';
+                                 }
+                             ));
+            }
+            $this->internalActivate721Nft($tokenId, Nft::GUN_TYPE, $gunDb['gun_uniid'], $gunDb['gun_id']);
         }
         break;
         default:

From b45a1d1327efc675f81b5d9fe5aab45ab404a825 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 4 Nov 2022 17:28:39 +0800
Subject: [PATCH 2/2] 1

---
 webapp/controller/BlockChainController.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/webapp/controller/BlockChainController.class.php b/webapp/controller/BlockChainController.class.php
index 2b94b5a8..10294832 100644
--- a/webapp/controller/BlockChainController.class.php
+++ b/webapp/controller/BlockChainController.class.php
@@ -156,7 +156,7 @@ class BlockChainController extends BaseAuthedController {
         {
             $nft1 = Hero::findByTokenId($tokenId1);
             $nft2 = Hero::findByTokenId($tokenId2);
-            if (!$nft1 || $nft2) {
+            if (!$nft1 || !$nft2) {
                 myself()->_rspErr(1, 'token paramater error');
                 return;
             }
@@ -174,7 +174,7 @@ class BlockChainController extends BaseAuthedController {
                 array(
                     'action' => Transaction::EVOLVE_721_ACTION_TYPE,
                     'tokenId' => $nft1['token_id'],
-                    'itemType' => $type,
+                    'tokenType' => Nft::HERO_TYPE,
                     'itemUniId' => $nft1['hero_uniid'],
                     'itemId' => $nft1['hero_id']
                 )
@@ -185,7 +185,7 @@ class BlockChainController extends BaseAuthedController {
         {
             $nft1 = Gun::findByTokenId($tokenId1);
             $nft2 = Gun::findByTokenId($tokenId2);
-            if (!$nft1 || $nft2) {
+            if (!$nft1 || !$nft2) {
                 myself()->_rspErr(1, 'token paramater error');
                 return;
             }
@@ -203,7 +203,7 @@ class BlockChainController extends BaseAuthedController {
                 array(
                     'action' => Transaction::EVOLVE_721_ACTION_TYPE,
                     'tokenId' => $nft1['token_id'],
-                    'itemType' => $type,
+                    'tokenType' => Nft::GUN_TYPE,
                     'itemUniId' => $nft1['gun_uniid'],
                     'itemId' => $nft1['gun_id']
                 )