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] 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']
                 )