From 00cdf8f96776b17cd97e9cf375f01c65be7d4b28 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 12 Dec 2022 17:17:11 +0800 Subject: [PATCH 1/4] ... --- webapp/controller/MarketController.class.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php index 8c6dc71e..c35448c9 100644 --- a/webapp/controller/MarketController.class.php +++ b/webapp/controller/MarketController.class.php @@ -573,7 +573,7 @@ class MarketController extends BaseController { case 1: { $rows = Nft::getNftListByType($account, $type); foreach ($rows as &$row) { - $nftDb = Nft::getNft($row['token_id']); + $nftDb = Nft::findNftByOwner($account, $row['token_id']); $row['info'] = Nft::toDto($nftDb); $row['detail'] = Hero::toDtoInfo(Hero::findByTokenId2($row['token_id'])); if (in_array($row['info']['info']['job'], $job)==false) continue; @@ -599,7 +599,7 @@ class MarketController extends BaseController { case 2: { $rows = Nft::getNftListByType($account, $type); foreach ($rows as &$row) { - $nftDb = Nft::getNft($row['token_id']); + $nftDb = Nft::findNftByOwner($account, $row['token_id']); $row['info'] = Nft::toDto($nftDb); $row['detail'] = Gun::toDtoInfo(Gun::findByTokenId2($row['token_id'])); if ($row['detail']['gun_lv']<$lv) continue; @@ -693,7 +693,7 @@ class MarketController extends BaseController { $nfts = array(); for ($x = $start; $x < $page_end; $x++) { $row = $rows[$x]; - $nftDb = Nft::getNft($row['token_id']); + $nftDb = Nft::findNftByOwner($row['owner_address'], $row['token_id']); if (!$nftDb) { myself()->_rspErr(1, 'nft not exists'); return; @@ -790,7 +790,7 @@ class MarketController extends BaseController { $conn = myself()->_getMysql(''); - $nft = Nft::getNft($nft_token); + $nft = Nft::findNftByOwner($account, $nft_token); error_log("sellMyNft ntfDetail token=".json_encode($nft)); $nftDetail = Nft::toDto($nft); error_log('sellMyNft ntfDetail null'.json_encode($nftDetail)); @@ -804,6 +804,7 @@ class MarketController extends BaseController { 't_market_store', array( 'token_id' => $nft_token, + 'owner_address' => $nftDetail['owner_address'], 'token_type' => $nftDetail['type'], 'createtime' => myself()->_getNowTime(), 'modifytime' => myself()->_getNowTime(), @@ -814,7 +815,6 @@ class MarketController extends BaseController { 'c_id' => $nftDetail['item_id'], ) ); - echo json_encode($r); $this->_rspOk(); } From b5642b2b70d00b609ce80530225eb861489bedb6 Mon Sep 17 00:00:00 2001 From: songliang Date: Mon, 12 Dec 2022 17:17:25 +0800 Subject: [PATCH 2/4] ... --- doc/Market.py | 4 ++-- webapp/controller/MarketController.class.php | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/Market.py b/doc/Market.py index e1afbb7e..ef5f8e91 100644 --- a/doc/Market.py +++ b/doc/Market.py @@ -315,7 +315,7 @@ class Market(object): ['page_size', 0, '分页大小'], ['order_method', 0, '排序方式 0:默认排序(当前指向1) 1:上架时间 2:价格 3:星级质量 4:等级 5:能量值 6:生命值 7:攻击力 8:防御力'], ['order_asc', 0, '排序方向, 0:从小到大 1:从大到小'], - ['type', 0, '物品类型 1:英雄 2:武器 3:芯片'], + ['type', 0, '物品类型 1:英雄 2:武器 3:芯片 5:碎片'], ['job_filters', '', '职业过滤(用|分割)'], ['search_filters', '', '搜索过滤(用|分割)'], ['lv_filter', 0, '等级过滤'], @@ -341,7 +341,7 @@ class Market(object): ['page_size', 0, '分页大小'], ['order_method', 0, '排序方式 0:默认排序(当前指向1) 1:等级 2:能量值 3:星级 4:tokenid'], ['order_asc', 0, '排序方向, 0:从小到大 1:从大到小'], - ['type', 0, '物品类型 1:英雄 2:武器 3:芯片'], + ['type', 0, '物品类型 1:英雄 2:武器 3:芯片 5:碎片'], ['job_filters', '', '职业过滤(用|分割)'], ['search_filters', '', '搜索过滤(用|分割)'], ['lv_filter', 0, '等级过滤'], diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php index c35448c9..57efa247 100644 --- a/webapp/controller/MarketController.class.php +++ b/webapp/controller/MarketController.class.php @@ -570,7 +570,7 @@ class MarketController extends BaseController { }; $nfts = array(); switch ($type) { - case 1: { + case Nft::HERO_TYPE: { $rows = Nft::getNftListByType($account, $type); foreach ($rows as &$row) { $nftDb = Nft::findNftByOwner($account, $row['token_id']); @@ -590,13 +590,13 @@ class MarketController extends BaseController { case 2: usort($nfts, $sortByTili); break; - case 3: + case 3: usort($nfts, $sortByStar); break; } } break; - case 2: { + case Nft::EQUIP_TYPE: { $rows = Nft::getNftListByType($account, $type); foreach ($rows as &$row) { $nftDb = Nft::findNftByOwner($account, $row['token_id']); @@ -621,7 +621,7 @@ class MarketController extends BaseController { } } break; - case 3: { + case Nft::CHIP_TYPE: { $rows = Nft::getNft1155List($account, $type); foreach ($rows as &$row) { $row['detail'] = Chip::toDto(Chip::getChipByTokenId($row['token_id'])); @@ -641,7 +641,7 @@ class MarketController extends BaseController { } } break; - case 4: { + case Nft::FRAGMENT_TYPE: { $rows = Nft::getNft1155List($account, $type); usort($nfts, $sortByTokenId); $nfts = $rows; @@ -702,16 +702,16 @@ class MarketController extends BaseController { $t = $row['token_type']; switch($t) { - case 1: { + case Nft::HERO_TYPE: { $row['detail'] = Hero::toDtoInfo(Hero::findByTokenId2($row['token_id'])); } break; - case 2: { + case Nft::EQUIP_TYPE: { $row['detail'] = Gun::toDtoInfo(Gun::findByTokenId2($row['token_id'])); } break; - case 3: { + case Nft::CHIP_TYPE: { $row['detail'] = Chip::toDto(Chip::getChipByTokenId($row['token_id'])); } break; - case 4: { + case Nft::FRAGMENT_TYPE: { } break; default: { From caf75579b92f3c6bbe21232edb6782bf7516221c Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 12 Dec 2022 17:56:42 +0800 Subject: [PATCH 3/4] ... --- webapp/controller/MarketController.class.php | 2 ++ webapp/models/Nft.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php index 57efa247..aee8d57c 100644 --- a/webapp/controller/MarketController.class.php +++ b/webapp/controller/MarketController.class.php @@ -643,6 +643,7 @@ class MarketController extends BaseController { break; case Nft::FRAGMENT_TYPE: { $rows = Nft::getNft1155List($account, $type); + error_log("fragment:".json_encode($rows)."type=".$type."account=".$account); usort($nfts, $sortByTokenId); $nfts = $rows; } @@ -691,6 +692,7 @@ class MarketController extends BaseController { } $nfts = array(); + for ($x = $start; $x < $page_end; $x++) { $row = $rows[$x]; $nftDb = Nft::findNftByOwner($row['owner_address'], $row['token_id']); diff --git a/webapp/models/Nft.php b/webapp/models/Nft.php index ef33df8d..98cc0a7d 100644 --- a/webapp/models/Nft.php +++ b/webapp/models/Nft.php @@ -124,7 +124,7 @@ class Nft extends BaseModel { $sql = "select * from t_nft1155 where owner_address=:owner_address and token_id>10000000 and balance>0"; }; break; - case 4:{ + case 5:{ $sql = "select * from t_nft1155 where owner_address=:owner_address and token_id<10000000 and balance>0"; }; break; From 1efab4d701b20aefe20551a9b94f6409b388b1c9 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 12 Dec 2022 17:59:46 +0800 Subject: [PATCH 4/4] ... --- webapp/controller/MarketController.class.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php index aee8d57c..3be14b33 100644 --- a/webapp/controller/MarketController.class.php +++ b/webapp/controller/MarketController.class.php @@ -161,7 +161,6 @@ class MarketController extends BaseController { $originalPrice * $goodsMeta['discount'] : $originalPrice; $discountPrice .= MarketService::PRICE_PAD; - error_log('price:' . $price . ' discountPrice:' . $discountPrice); if (!$discountPrice || strcmp($price, $discountPrice) != 0) { myself()->_rspErr(500, 'price error'); return; @@ -643,7 +642,6 @@ class MarketController extends BaseController { break; case Nft::FRAGMENT_TYPE: { $rows = Nft::getNft1155List($account, $type); - error_log("fragment:".json_encode($rows)."type=".$type."account=".$account); usort($nfts, $sortByTokenId); $nfts = $rows; } @@ -793,14 +791,7 @@ class MarketController extends BaseController { $conn = myself()->_getMysql(''); $nft = Nft::findNftByOwner($account, $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, 't_market_store',