From c0586493c0ba4f1a49d2bb306390a67ca5cef50e Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 3 Jul 2024 21:09:43 +0800
Subject: [PATCH 1/2] 1

---
 webapp/models/Nft.php          | 1 +
 webapp/services/NftService.php | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/webapp/models/Nft.php b/webapp/models/Nft.php
index 533836c8..98aa21d3 100644
--- a/webapp/models/Nft.php
+++ b/webapp/models/Nft.php
@@ -128,6 +128,7 @@ class Nft extends BaseModel
                 array_push($nftList, $row);
             }
         );
+        error_log(json_encode($nftList));
         return $nftList;
     }
 
diff --git a/webapp/services/NftService.php b/webapp/services/NftService.php
index 526992e2..d00ae375 100644
--- a/webapp/services/NftService.php
+++ b/webapp/services/NftService.php
@@ -84,7 +84,12 @@ class NftService extends BaseService {
         self::loadNft($openId, $name);
         $nftHash = getXVal(self::$userData[$openId], $name . 'Hash', array());
         $nftDb = getXVal($nftHash, $tokenId);
-        return $nftDb && $nftDb['owner_address'] == $openId;
+        //return $nftDb && $nftDb['owner_address'] == $openId;
+        if (empty($nftDb)) {
+            return null;
+        }
+        return $nftDb['owner_address'] == LOCK_CONTRACT_ADDRESS &&
+                                       $nftDb['last_lock_address'] == $openId;
     }
 
     private static function loadNft($openId, $name)

From b7133f85fc49ee35c3745189963e440124c356f1 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 3 Jul 2024 22:44:30 +0800
Subject: [PATCH 2/2] 1

---
 webapp/controller/OutAppNftController.class.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/webapp/controller/OutAppNftController.class.php b/webapp/controller/OutAppNftController.class.php
index c71b1dba..04188386 100644
--- a/webapp/controller/OutAppNftController.class.php
+++ b/webapp/controller/OutAppNftController.class.php
@@ -319,8 +319,6 @@ class OutAppNftController extends BaseController {
                     $info['detail']['max_mining_days'] = $heroAtteMeta['validTime'];
                     $info['detail']['wealth'] = floor($wealth * (1+$wealth_rate));
                     $info['detail']['lucky'] = floor($lucky * (1+$lucky_rate));
-                    $info['detail']['wealth'] = '';
-                    $info['detail']['lucky'] = '';
                     $info['detail']['hp'] = $heroAbility['hp'];
                     $info['detail']['atk'] = $heroAbility['attack'];
                     $info['detail']['def'] = $heroAbility['defence'];