From 5e101e9d9ede856a0542a51d95ff02ff5eac75c7 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 7 Aug 2023 15:48:37 +0800
Subject: [PATCH] 1

---
 sql/gamedb.sql                                   | 2 ++
 webapp/controller/BlockChainController.class.php | 4 ++--
 webapp/controller/MallController.class.php       | 1 +
 webapp/models/Mall.php                           | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sql/gamedb.sql b/sql/gamedb.sql
index c8967763..4e78fc28 100644
--- a/sql/gamedb.sql
+++ b/sql/gamedb.sql
@@ -1388,6 +1388,7 @@ CREATE TABLE `t_mall` (
   `order_id` varchar(255) NOT NULL DEFAULT '' COMMENT '订单id',
   `goods_uuid` varchar(255) NOT NULL DEFAULT '' COMMENT '商品uuid',
   `seller` varchar(60) NOT NULL DEFAULT '' COMMENT 'seller',
+  `seller_address` varchar(60) NOT NULL DEFAULT '' COMMENT 'seller_address',
   `item_id` int(11) NOT NULL DEFAULT '0' COMMENT '物品id',
   `item_num` bigint NOT NULL DEFAULT '0' COMMENT '物品数量',
   `currency` varchar(60) NOT NULL COMMENT 'currency',
@@ -1397,6 +1398,7 @@ CREATE TABLE `t_mall` (
   `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间',
   PRIMARY KEY (`idx`),
   KEY `seller` (`seller`),
+  KEY `seller_address` (`seller_address`),
   UNIQUE KEY `order_id` (`order_id`),
   UNIQUE KEY `goods_uuid` (`goods_uuid`)
 ) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
diff --git a/webapp/controller/BlockChainController.class.php b/webapp/controller/BlockChainController.class.php
index 6cc5962b..7c3aea4b 100644
--- a/webapp/controller/BlockChainController.class.php
+++ b/webapp/controller/BlockChainController.class.php
@@ -399,7 +399,7 @@ class BlockChainController extends BaseAuthedController {
 
         $rspObj = services\BlockChainService::gameItemMarketBuy(
             Transaction::BUY_GOODS_FROM_MARKET_ACTION_TYPE,
-            $goods['seller'],
+            $goods['seller_address'],
             $goods['price'],
             $goods['item_id'],
             $goods['item_num']
@@ -417,7 +417,7 @@ class BlockChainController extends BaseAuthedController {
             'item_id' => $item_id,
             'item_num' => $item_count,
             'order_type' => BcOrder::SPEC_ORDER_TYPE,
-            'price' => $this->Web3PriceLowFormat($goods['s_price']),
+            'price' => $this->Web3PriceLowFormat($goods['price']),
             'ext_data' => json_encode(array(
                 'mode' => BcOrder::MARKET_BUY_MODE_NORMAL,
                 'idx' => $idx,
diff --git a/webapp/controller/MallController.class.php b/webapp/controller/MallController.class.php
index f311e4cc..7bb0074e 100644
--- a/webapp/controller/MallController.class.php
+++ b/webapp/controller/MallController.class.php
@@ -50,6 +50,7 @@ class MallController extends BaseAuthedController {
                                array(
                                    'goods_uuid' => $row['goods_uuid'],
                                    'seller' => $row['seller'],
+                                   'seller_address' => $row['seller_address'],
                                    'item_id' => $row['item_id'],
                                    'item_num' => $row['item_num'],
                                    'currency' => $row['currency'],
diff --git a/webapp/models/Mall.php b/webapp/models/Mall.php
index 6ed0c272..2cd80005 100644
--- a/webapp/models/Mall.php
+++ b/webapp/models/Mall.php
@@ -41,6 +41,7 @@ class Mall extends BaseModel {
                  'order_id' => $orderId,
                  'goods_uuid' => $goodsUuid,
                  'seller' => myself()->_getAccountId(),
+                 'seller_address' => myself()->_getAddresss(),
                  'item_id' => $itemId,
                  'item_num' => $itemNum,
                  'currency' => $currency,