This commit is contained in:
aozhiwei 2022-12-12 11:51:24 +08:00
parent a4b4c32e17
commit 9e8b3fe729

View File

@ -542,7 +542,7 @@ class MarketController extends BaseController {
myself()->_rspOk(); myself()->_rspOk();
} }
private function getNftListByAccountAndType($account, $type, $order_method, $order_asc) private function getNftListByAccountAndType($account, $type, $order_method, $order_asc, $job, $search, $lv)
{ {
$sortByLevel = function ($a, $b) use ($order_asc) { $sortByLevel = function ($a, $b) use ($order_asc) {
return ($order_asc == 1 ? 1 : -1) * ($b['detail']['hero_lv'] - $a['detail']['hero_lv']); return ($order_asc == 1 ? 1 : -1) * ($b['detail']['hero_lv'] - $a['detail']['hero_lv']);
@ -576,16 +576,17 @@ class MarketController extends BaseController {
$nftDb = Nft::getNft($row['token_id']); $nftDb = Nft::getNft($row['token_id']);
$row['info'] = Nft::toDto($nftDb); $row['info'] = Nft::toDto($nftDb);
$row['detail'] = Hero::toDtoInfo(Hero::findByTokenId2($row['token_id'])); $row['detail'] = Hero::toDtoInfo(Hero::findByTokenId2($row['token_id']));
array_push($nfts, $row);
} }
switch ($order_method) { switch ($order_method) {
case 1: case 1:
usort($rows, $sortByLevel); usort($nfts, $sortByLevel);
break; break;
case 2: case 2:
usort($rows, $sortByTili); usort($nfts, $sortByTili);
break; break;
case 3: case 3:
usort($rows, $sortByStar); usort($nfts, $sortByStar);
break; break;
} }
} }
@ -596,6 +597,7 @@ class MarketController extends BaseController {
$nftDb = Nft::getNft($row['token_id']); $nftDb = Nft::getNft($row['token_id']);
$row['info'] = Nft::toDto($nftDb); $row['info'] = Nft::toDto($nftDb);
$row['detail'] = Gun::toDtoInfo(Gun::findByTokenId2($row['token_id'])); $row['detail'] = Gun::toDtoInfo(Gun::findByTokenId2($row['token_id']));
array_push($nfts, $row);
} }
switch ($order_method) { switch ($order_method) {
case 1: case 1:
@ -614,6 +616,7 @@ class MarketController extends BaseController {
$rows = Nft::getNft1155List($account, $type); $rows = Nft::getNft1155List($account, $type);
foreach ($rows as &$row) { foreach ($rows as &$row) {
$row['detail'] = Chip::toDto(Chip::getChipByTokenId($row['token_id'])); $row['detail'] = Chip::toDto(Chip::getChipByTokenId($row['token_id']));
array_push($nfts, $row);
} }
switch ($order_method) { switch ($order_method) {
case 1: case 1:
@ -628,13 +631,14 @@ class MarketController extends BaseController {
case 4: { case 4: {
$rows = Nft::getNft1155List($account, $type); $rows = Nft::getNft1155List($account, $type);
usort($rows, $sortByTokenId); usort($rows, $sortByTokenId);
$nfts = $rows;
} }
break; break;
default: { default: {
$rows = array();
} }
} }
return $rows; return $nfts;
} }
public function listSellNfts() public function listSellNfts()
@ -726,7 +730,7 @@ class MarketController extends BaseController {
$lv_filter = getReqVal('lv_filter', 15); $lv_filter = getReqVal('lv_filter', 15);
$account = '0x9a4d9dd2bfcad659975f0f5a480625c7929e9385'; $account = '0x9a4d9dd2bfcad659975f0f5a480625c7929e9385';
$rows = $this->getNftListByAccountAndType($account, $type, $order_method, $order_asc); $rows = $this->getNftListByAccountAndType($account, $type, $order_method, $order_asc, $job_filter_array, $search_filter_array, $lv_filter);
$total = count($rows); $total = count($rows);
$page_end = $start + $page_size; $page_end = $start + $page_size;