From 83fb84719678ac1c5eb59263ad18d0057939716e Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 21 Aug 2023 15:20:01 +0800
Subject: [PATCH] 1

---
 webapp/controller/MarketController.class.php  | 19 ++++++++++++++++---
 webapp/controller/ToolsController.class.php   |  5 +++++
 webapp/models/Market.php                      |  2 +-
 webapp/models/Nft.php                         |  1 +
 .../services/callback/MarketSellOrderOk.php   |  6 +++---
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php
index 2cc83838..0d209bf3 100644
--- a/webapp/controller/MarketController.class.php
+++ b/webapp/controller/MarketController.class.php
@@ -70,11 +70,12 @@ class MarketController extends BaseAuthedController {
         }
 
         $out = array(
+            'rows' => array(),
             'pagination' => array()
         );
         SqlHelper::rawQueryPage(
             myself()->_getMySql(''),
-            'SELECT * FROM t_market WHERE activated=:activated',
+            'SELECT * FROM t_market WHERE activated=:activated AND status = 0',
             array(
                 ':activated' => 1
             ),
@@ -180,12 +181,13 @@ class MarketController extends BaseAuthedController {
                     )
                 ),
                 //'orderBy' => $orderBy,
-                'handle' => function ($row) {
+                'handle' => function ($row) use (&$out) {
                     array_push($out['rows'], $this->fillNftIntro($row));
                 }
             ),
             $out['pagination']
         );
+        error_log(json_encode($out));
         myself()->_rspData($out);
     }
 
@@ -200,10 +202,21 @@ class MarketController extends BaseAuthedController {
             'price' => $row['update_price'] ? $row['update_price'] : $row['price'],
             'selltime' => $row['selltime'],
             'updatetime' => $row['createtime'],
+            'details' => array()
         );
         $nftDb = Nft::getNftByNetCont($row['token_id'], $row['net_id'], $row['nft_token']);
         if ($nftDb) {
-            $nftDb['detail'] = Nft::toDto($nftDb);
+            switch ($nftDb['token_type']) {
+            case Nft::HERO_TYPE:
+            {
+                error_log(json_encode($nftDb));
+                $heroDb = Hero::findByTokenId2($nftDb['token_id']);
+                if ($heroDb){
+                    $info['details'] = Hero::toDto($heroDb);
+                }
+            }
+            break;
+            }
         }
         return $info;
     }
diff --git a/webapp/controller/ToolsController.class.php b/webapp/controller/ToolsController.class.php
index 2bcd94c5..b61b07b7 100644
--- a/webapp/controller/ToolsController.class.php
+++ b/webapp/controller/ToolsController.class.php
@@ -2,8 +2,10 @@
 
 require_once('phpcommon/bignumber.php');
 require_once('phpcommon/sqlhelper.php');
+require_once('services/BlockChainService.php');
 
 use phpcommon\SqlHelper;
+use services\BlockChainService;
 
 class ToolsController extends BaseController {
 
@@ -142,6 +144,9 @@ class ToolsController extends BaseController {
 
     public function outappRecharge()
     {
+        $price = BlockChainService::formatCurrencyEx(1, 6);
+        echo $price;
+        return;
         /*{
             $obj = array(
                 'a' => 'safdf'
diff --git a/webapp/models/Market.php b/webapp/models/Market.php
index 10ce0ff4..0ffdc533 100644
--- a/webapp/models/Market.php
+++ b/webapp/models/Market.php
@@ -23,7 +23,7 @@ class Market extends BaseModel {
     }
 
     public static function add($orderId, $netId, $tokenId, $seller, $nftToken,
-                               $amount, $currency, $pirce, $fieldsKv) {
+                               $amount, $currency, $price, $fieldsKv) {
         if (empty($fieldsKv)) {
             $fieldsKv = array();
         }
diff --git a/webapp/models/Nft.php b/webapp/models/Nft.php
index 1153b041..fe85dcc5 100644
--- a/webapp/models/Nft.php
+++ b/webapp/models/Nft.php
@@ -3,6 +3,7 @@
 namespace models;
 
 require_once('mt/Attr.php');
+require_once('mt/Hero.php');
 require_once('mt/Item.php');
 require_once('mt/Equip.php');
 require_once('mt/GunLevel.php');
diff --git a/webapp/services/callback/MarketSellOrderOk.php b/webapp/services/callback/MarketSellOrderOk.php
index f3068f6e..845f15b7 100644
--- a/webapp/services/callback/MarketSellOrderOk.php
+++ b/webapp/services/callback/MarketSellOrderOk.php
@@ -30,16 +30,16 @@ class MarketSellOrderOk {
         $price = getReqVal('price', '');
 
         $fieldsKv = array();
-        $nftDb = Nft::getNftByNetCont($row['token_id'], $netId, $nftToken);
+        $nftDb = Nft::getNftByNetCont($tokenId, $netId, $nftToken);
         if ($nftDb) {
             try {
                 $nftDetail = Nft::toDto($nftDb);
                 if ($nftDetail) {
                     $fieldsKv['c_name'] = $nftDetail['info']['name'];
                     $fieldsKv['c_job'] = $nftDetail['info']['job'];
-                    $fieldsKv['c_lv'] = $nftDetail['info']['hero_lv'];
+                    $fieldsKv['c_lv'] = $nftDetail['info']['level'];
                     $fieldsKv['c_quality'] = $nftDetail['info']['quality'];
-                    $fieldsKv['c_durability'] = $nftDetail['info']['hero_tili'];
+                    //$fieldsKv['c_durability'] = $nftDetail['info']['hero_tili'];
                     $fieldsKv['c_type'] = 1;
                 }
             } catch(Exception $e) {