diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php index ef1a1ee4..8c6dc71e 100644 --- a/webapp/controller/MarketController.class.php +++ b/webapp/controller/MarketController.class.php @@ -702,20 +702,23 @@ class MarketController extends BaseController { $t = $row['token_type']; switch($t) { - case Nft::HERO_TYPE: { - + case 1: { + $row['detail'] = Hero::toDtoInfo(Hero::findByTokenId2($row['token_id'])); } break; - case Nft::EQUIP_TYPE: { - + case 2: { + $row['detail'] = Gun::toDtoInfo(Gun::findByTokenId2($row['token_id'])); } break; - case Nft::CHIP_TYPE: { + case 3: { + $row['detail'] = Chip::toDto(Chip::getChipByTokenId($row['token_id'])); + } break; + case 4: { } break; default: { - } + } break; } - $row['details'] = $nft; + $row['info'] = $nft; array_push($nfts, $row); } @@ -788,7 +791,13 @@ class MarketController extends BaseController { $conn = myself()->_getMysql(''); $nft = Nft::getNft($nft_token); + error_log("sellMyNft ntfDetail token=".json_encode($nft)); $nftDetail = Nft::toDto($nft); + error_log('sellMyNft ntfDetail null'.json_encode($nftDetail)); + if ($nftDetail==null) { + // error_log('sellMyNft ntfDetail null'.$nftDetail."token=".$nft); + } + // echo json_encode($nftDetail), json_encode($nft); $r = SqlHelper::insert( $conn, @@ -800,8 +809,8 @@ class MarketController extends BaseController { 'modifytime' => myself()->_getNowTime(), 's_price' => $s_price, 'c_name' => $nftDetail['info']['name'], - 'c_job' => $nftDetail['info']['job'] ? $nftDetail['info']['job'] : -1, - 'c_lv' => $nftDetail['info']['level'], + 'c_job' => isset($nftDetail['info']['job']) ? $nftDetail['info']['job'] : -1, + 'c_lv' => isset($nftDetail['info']['level']) ? $nftDetail['info']['level'] : -1, 'c_id' => $nftDetail['item_id'], ) ); diff --git a/webapp/models/Nft.php b/webapp/models/Nft.php index 5b48ac53..39f18279 100644 --- a/webapp/models/Nft.php +++ b/webapp/models/Nft.php @@ -169,6 +169,7 @@ class Nft extends BaseModel { $row['token_type'] = self::FRAGMENT_TYPE; $row['token_state'] = 0; $row['tags'] = ''; + $row['item_id'] = $row['token_id']; } } } @@ -285,6 +286,10 @@ class Nft extends BaseModel { $nft['hide_attr'] = 1; } break; + case Nft::FRAGMENT_TYPE: + { + } + break; default: { return null;