diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php
index 3b928121..f8bfe8eb 100644
--- a/webapp/controller/MarketController.class.php
+++ b/webapp/controller/MarketController.class.php
@@ -583,17 +583,7 @@ class MarketController extends BaseController {
                             $searchLower = array_map('strtolower', $search);
                             if (!(in_array(strtolower($row['detail']['hero_name']), $searchLower) || in_array(strtolower($row['detail']['token_id']), $searchLower))) continue;
                         }
-                        $row['detail']['chips_info'] = array();
-                        if (!empty($row['detail']['chip_ids'])) {
-                            $chips = explode('|', $row['detail']['chip_ids']);
-                            foreach ($chips as $chip) {
-                                $chip_info = "";
-                                if (!empty($chip)) {
-                                    $chip_info = Chip::toDto(Chip::getChipByTokenId($chip));    
-                                }
-                                array_push($row['detail']['chips_info'], $chip_info);
-                            }
-                        }
+                        $row['detail'] = $this->appendChipsInfo($row['detail']);
                         array_push($nfts, $row);
                     }
                     switch ($order_method) {
@@ -622,17 +612,7 @@ class MarketController extends BaseController {
                             $searchLower = array_map('strtolower', $search);
                             if (!(in_array(strtolower($row['detail']['gun_name']), $searchLower) || in_array(strtolower($row['detail']['token_id']), $searchLower))) continue;
                         }
-                        $row['detail']['chips_info'] = array();
-                        if (!empty($row['detail']['chip_ids'])) {
-                            $chips = explode('|', $row['detail']['chip_ids']);
-                            foreach ($chips as $chip) {
-                                $chip_info = "";
-                                if (!empty($chip)) {
-                                    $chip_info = Chip::toDto(Chip::getChipByTokenId($chip));    
-                                }
-                                array_push($row['detail']['chips_info'], $chip_info);
-                            }
-                        }
+                        $row['detail'] = $this->appendChipsInfo($row['detail']);
                         array_push($nfts, $row);
                     }
                     switch ($order_method) {
@@ -960,10 +940,10 @@ class MarketController extends BaseController {
         $token_id = $nftRowInfo['token_id'];
         switch($t) {
             case Nft::HERO_TYPE: {
-                return Hero::toDtoInfo(Hero::findByTokenId2($token_id));
+                return $this->appendChipsInfo(Hero::toDtoInfo(Hero::findByTokenId2($token_id)));
             } break;
             case Nft::EQUIP_TYPE: {
-                return Gun::toDtoInfo(Gun::findByTokenId2($token_id));
+                return $this->appendChipsInfo(Gun::toDtoInfo(Gun::findByTokenId2($token_id)));
             } break;
             case Nft::CHIP_TYPE: {
                 return Chip::toDto(Chip::getChipByTokenId($token_id));
@@ -976,4 +956,20 @@ class MarketController extends BaseController {
         }
         return array('unknown' => 'unknown game data type, cannot find data');
     }
+
+
+    private function appendChipsInfo($detail) {
+        $detail['chips_info'] = array();
+        if (!empty($detail['chip_ids'])) {
+            $chips = explode('|', $detail['chip_ids']);
+            foreach ($chips as $chip) {
+                $chip_info = "";
+                if (!empty($chip)) {
+                    $chip_info = Chip::toDto(Chip::getChipByTokenId($chip));
+                }
+                array_push($detail['chips_info'], $chip_info);
+            }
+        }
+        return $detail;
+    }
 }