From 75cd1341bfbd7e6cb3f40b94aef5fc8d1e08529f Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 14 Apr 2022 13:01:24 +0800
Subject: [PATCH] 1

---
 doc/_common.py                               | 2 +-
 sql/marketdb.sql                             | 4 +---
 webapp/controller/BcShopController.class.php | 4 ++--
 webapp/controller/MarketController.class.php | 6 +++---
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/doc/_common.py b/doc/_common.py
index 90342651..f58d4092 100644
--- a/doc/_common.py
+++ b/doc/_common.py
@@ -517,7 +517,7 @@ class NftDetail(object):
             ['owner_address', '', '所有者地址'],
             ['owner_name', '', '所有名字'],
             ['item_id', 0, '道具id'],
-            ['type', '', 'nft类型 1:英雄 2:枪支 3:芯片'],
+            ['type', '', 'nft类型 1:英雄 2:枪支 3:芯片 4:盲盒'],
             ['image', '', 'nft图片地址'],
             ['state', 0, '0:正常状态 1:出售中 2:出租中'],
             ['info', Union([
diff --git a/sql/marketdb.sql b/sql/marketdb.sql
index 17113537..2ee15dc3 100644
--- a/sql/marketdb.sql
+++ b/sql/marketdb.sql
@@ -119,14 +119,12 @@ DROP TABLE IF EXISTS `t_nft`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t_nft` (
   `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id',
+  `owner_address` varchar(60) NOT NULL DEFAULT '' COMMENT 'owner_address',
   `token_id` varchar(60) NOT NULL DEFAULT '' COMMENT 'token_id',
   `token_type` int(11) NOT NULL DEFAULT '0' COMMENT 'nft类型 1:英雄 2:枪支 3:芯片',
-  `game_id` int(11) NOT NULL DEFAULT '0' COMMENT 'game id',
   `token_state` int(11) NOT NULL DEFAULT '0' COMMENT '0:正常状态 1:出售中 2:出租中',
-  `token_state`  NOT NULL DEFAULT '' COMMENT '0:正常状态 1:出售中 2:出租中',
   `game_id` int(11) NOT NULL DEFAULT '0' COMMENT 'game id',
   `item_id` int(11) NOT NULL DEFAULT '0' COMMENT '道具id',
-  `owner_address` varchar(255) NOT NULL DEFAULT '' COMMENT 'owner_address',
   `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
   `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间',
   PRIMARY KEY (`idx`),
diff --git a/webapp/controller/BcShopController.class.php b/webapp/controller/BcShopController.class.php
index 4c68bbad..0e8cc976 100644
--- a/webapp/controller/BcShopController.class.php
+++ b/webapp/controller/BcShopController.class.php
@@ -200,9 +200,9 @@ class BcShopController extends BaseController {
                 $fieldsKv['bc_mint_token_type' . $i] = $items[$i - 1]['token_type'];
             }
         }
-        if (MarketService::isTestMode()) {
+        /*if (MarketService::isTestMode()) {
             $fieldsKv['bc_paid'] = 1;
-        }
+            }*/
         $fieldsKv['order_id'] = $orderId;
         SqlHelper::insert(
             myself()->_getMarketMysql(),
diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php
index 93a959df..4abad947 100644
--- a/webapp/controller/MarketController.class.php
+++ b/webapp/controller/MarketController.class.php
@@ -1,4 +1,4 @@
-<?php
+ <?php
 
 require_once('mt/MarketGoods.php');
 require_once('mt/MarketBatch.php');
@@ -217,9 +217,9 @@ class MarketController extends BaseController {
                 $fieldsKv['bc_mint_token_type' . $i] = $items[$i - 1]['token_type'];
             }
         }
-        if (MarketService::isTestMode()) {
+        /*if (MarketService::isTestMode()) {
             $fieldsKv['bc_paid'] = 1;
-        }
+            }*/
         $fieldsKv['order_id'] = $orderId;
         SqlHelper::insert(
             myself()->_getMarketMysql(),