From e09e75a8d7e61af43a560f946eb5bd3f4fe18938 Mon Sep 17 00:00:00 2001
From: songliang <songliang@kingsome.cn>
Date: Mon, 19 Dec 2022 15:20:34 +0800
Subject: [PATCH] ...

---
 webapp/controller/MarketController.class.php | 11 +++++++++++
 webapp/models/Chip.php                       |  6 ++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php
index 0ffac7c9..4846ebaa 100644
--- a/webapp/controller/MarketController.class.php
+++ b/webapp/controller/MarketController.class.php
@@ -583,6 +583,17 @@ 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;
                         }
+                        if (!empty($row['detail']['chip_ids'])) {
+                            $row['detail']['chips_info'] = array();
+                            $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);
+                            }
+                        }
                         array_push($nfts, $row);
                     }
                     switch ($order_method) {
diff --git a/webapp/models/Chip.php b/webapp/models/Chip.php
index 0beb4d70..2374b3f4 100644
--- a/webapp/models/Chip.php
+++ b/webapp/models/Chip.php
@@ -415,8 +415,10 @@ class Chip extends BaseModel
             case 1:{
                 foreach ($chipIdsArr as $val){
                     $chip = self::getChipByTokenId($val);
-                    $lucky = FormulaService::getChipLuckyValue($chip['chip_grade']);
-                    $MaxStrength+=FormulaService::Hero_Chip_NFT_Maximum_Physical_Strength($chip['chip_grade'],$lucky)*FormulaService::Hero_Chip_PSA_Value($chip)*FormulaService::Hero_Chip_GAC_PS_Value($chip['chip_grade']);
+                    if ($chip) {
+                        $lucky = FormulaService::getChipLuckyValue($chip['chip_grade']);
+                        $MaxStrength+=FormulaService::Hero_Chip_NFT_Maximum_Physical_Strength($chip['chip_grade'],$lucky)*FormulaService::Hero_Chip_PSA_Value($chip)*FormulaService::Hero_Chip_GAC_PS_Value($chip['chip_grade']);
+                    }
                 }
             }
             break;