From e8aa907a89bc6abf25fa3d49eca68c60e438f55c Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 25 Jan 2022 20:04:28 +0800
Subject: [PATCH] 1

---
 doc/_common.py                                  |  4 +++-
 webapp/controller/MarketController.class.php    |  5 +++++
 webapp/controller/NewMarketController.class.php |  9 ++++++++-
 webapp/models/Box.php                           | 15 +++++++++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 webapp/models/Box.php

diff --git a/doc/_common.py b/doc/_common.py
index b9d944aa..32db5274 100644
--- a/doc/_common.py
+++ b/doc/_common.py
@@ -424,6 +424,8 @@ class PreSaleBox(object):
         self.fields = [
             ['box_id', '', '箱子id'],
             ['item_id', 0, '道具id(根据这个读取箱子的图片)'],
+            ['name', '', '名字'],
+            ['job', '', '职业'],
             ['!currency_list', [SystemCurrency()], '货币列表,(目前有且只有一个)'],
         ]
 
@@ -432,9 +434,9 @@ class NftHeroDetail(object):
     def __init__(self):
         self.fields = [
             ['name', '', '英雄名'],
+            ['job', '', '职业'],
             ['level', 0, '等级'],
             ['quality', 0, '星级'],
-            ['name', '', '英雄名'],
             ['hp', 0, '血量'],
             ['speed', 0, '速度'],
             ['atk', 0, '攻击'],
diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php
index 959f1a9b..fa870275 100644
--- a/webapp/controller/MarketController.class.php
+++ b/webapp/controller/MarketController.class.php
@@ -5,6 +5,7 @@ require_once('mt/MarketBatch.php');
 require_once('mt/Item.php');
 require_once('mt/WhiteList.php');
 require_once('mt/Currency.php');
+require_once('mt/Hero.php');
 
 use phpcommon\SqlHelper;
 
@@ -45,6 +46,8 @@ class MarketController extends BaseController {
                 $saleBox = array(
                     'box_id' => $meta['item_id'],
                     'item_id' => $meta['item_id'],
+                    'name' => emptyReplace($heroMeta['name'], 'Hill'),
+                    'job' => emptyReplace($heroMeta['hero_job'], 'Warrior'),
                     'currency_list' => array(
                         array(
                             'name' => 'BNB',
@@ -91,6 +94,7 @@ class MarketController extends BaseController {
                 'transaction_recrod' => array(),
                 'info' => array(
                     'name' => 'hero' . $i,
+                    'job' => 'Warrior',
                     'level' => 1,
                     'quality' => 1,
                     'hp' => 100,
@@ -123,6 +127,7 @@ class MarketController extends BaseController {
             'transaction_recrod' => array(),
             'info' => array(
                 'name' => 'hero' . $i,
+                'job' => 'Warrior',
                 'level' => 1,
                 'quality' => 1,
                 'hp' => 100,
diff --git a/webapp/controller/NewMarketController.class.php b/webapp/controller/NewMarketController.class.php
index e1866bdd..0e6a1797 100644
--- a/webapp/controller/NewMarketController.class.php
+++ b/webapp/controller/NewMarketController.class.php
@@ -5,6 +5,7 @@ require_once('mt/MarketBatch.php');
 require_once('mt/Item.php');
 require_once('mt/WhiteList.php');
 require_once('mt/Currency.php');
+require_once('mt/Hero.php');
 
 use phpcommon\SqlHelper;
 
@@ -22,11 +23,12 @@ class NewMarketController extends BaseController {
             return;
         }
 
+        $perPage = 10;
         $rows = array();
         $pageInfo = array(
             'total' => 0,
             'count' => 0,
-            'per_page' => 10,
+            'per_page' => $perPage,
             'current_page' => $page,
             'total_pages' => 0
         );
@@ -42,9 +44,12 @@ class NewMarketController extends BaseController {
         $batchMetas = mt\MarketGoods::getBatchMetas($currBatchMeta['batch_id']);
         if ($batchMetas) {
             foreach ($batchMetas as $meta) {
+                $heroMeta = mt\Hero::get($meta['item_id']);
                 $saleBox = array(
                     'box_id' => $meta['item_id'],
                     'item_id' => $meta['item_id'],
+                    'name' => emptyReplace($heroMeta['name'], 'Hill'),
+                    'job' => emptyReplace($heroMeta['hero_job'], 'Warrior'),
                     'currency_list' => array(
                         array(
                             'name' => 'BNB',
@@ -91,6 +96,7 @@ class NewMarketController extends BaseController {
                 'transaction_recrod' => array(),
                 'info' => array(
                     'name' => 'hero' . $i,
+                    'job' => 'Warrior',
                     'level' => 1,
                     'quality' => 1,
                     'hp' => 100,
@@ -123,6 +129,7 @@ class NewMarketController extends BaseController {
             'transaction_recrod' => array(),
             'info' => array(
                 'name' => 'hero' . $i,
+                'job' => 'Warrior',
                 'level' => 1,
                 'quality' => 1,
                 'hp' => 100,
diff --git a/webapp/models/Box.php b/webapp/models/Box.php
new file mode 100644
index 00000000..38bd6d68
--- /dev/null
+++ b/webapp/models/Box.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace models;
+
+use mt;
+use phpcommon\SqlHelper;
+
+class Box extends BaseModel {
+
+    public function getSoldNum($batchId)
+    {
+
+    }
+
+}