From 7b095def668fb8c4df89370b63a2b539b2396eac Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 5 Aug 2023 16:45:53 +0800
Subject: [PATCH] 1

---
 sql/gamedb.sql                                |  3 +-
 webapp/models/Market.php                      |  4 +-
 webapp/services/callback/MarketBuyOrderOk.php | 44 -------------------
 3 files changed, 4 insertions(+), 47 deletions(-)

diff --git a/sql/gamedb.sql b/sql/gamedb.sql
index 35fe345c..7453fcc6 100644
--- a/sql/gamedb.sql
+++ b/sql/gamedb.sql
@@ -1408,7 +1408,8 @@ CREATE TABLE `t_market` (
   `idx` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增id',
   `order_id` varchar(255) NOT NULL DEFAULT '' COMMENT '订单id',
   `token_id` varchar(60) NOT NULL COMMENT 'token_id',
-  `owner` varchar(60) NOT NULL COMMENT 'owner',
+  `seller` varchar(60) NOT NULL COMMENT 'owner',
+  `buyer` varchar(60) NOT NULL COMMENT 'owner',
   `nft_token` varchar(60) NOT NULL COMMENT 'nft_token',
   `amount` varchar(255) NOT NULL DEFAULT '' COMMENT 'amount',
   `currency` varchar(60) NOT NULL COMMENT 'currency',
diff --git a/webapp/models/Market.php b/webapp/models/Market.php
index 080191f6..84870793 100644
--- a/webapp/models/Market.php
+++ b/webapp/models/Market.php
@@ -21,13 +21,13 @@ class Market extends BaseModel {
         return $row;
     }
 
-    public static function add($orderId, $tokenId, $owner, $nftToken,
+    public static function add($orderId, $tokenId, $seller, $nftToken,
                                $amount, $currency, $pirce) {
         self::internalUpdate(
             $orderId,
             array(
                 'token_id' => $tokenId,
-                'owner' => $owner,
+                'seller' => $seller,
                 'nft_token' => $nftToken,
                 'amount' => $amount,
                 'currency' => $currency,
diff --git a/webapp/services/callback/MarketBuyOrderOk.php b/webapp/services/callback/MarketBuyOrderOk.php
index dcc7e833..173345f3 100644
--- a/webapp/services/callback/MarketBuyOrderOk.php
+++ b/webapp/services/callback/MarketBuyOrderOk.php
@@ -40,50 +40,6 @@ class MarketBuyOrderOk extends MarketCallbackBase {
             )
         );
 
-        $o_link = $orderId;
-        $conn = myself()->_getMysql('');
-
-        // 1. check order status
-        $chk = SqlHelper::selectOne($conn, 't_market_store', array('status', 'idx', 'c_name', 'token_type'), array('o_link' => $o_link, 'status' => 0));
-        if (empty($chk)) {
-            $this->_rspErr(2, 'not found order, o_link=' . $o_link);
-            return;
-        }
-        if ($chk['status'] == '0') {
-            $r = SqlHelper::update(
-                $conn,
-                't_market_store',
-                array(
-                    'o_link' => $o_link,
-                ),
-                array(
-                    'status' => 2,
-                )
-            );
-            if ($r) {
-                // 增加交易记录
-                $record = array(
-                    'createtime' => myself()->_getNowTime(),
-                    'order_id' => $chk['order_id'],
-                    'o_link' => $o_link,
-                    'seller' => $seller,
-                    'buyer' => $buyer,
-                    'tokenid' => $tokenId,
-                    'amount' => $amount,
-                    'name' => $chk['c_name'],
-                    'type' => $chk['token_type'],
-                );
-                $this->addTransactionRecord($record);
-                $this->_rspOk();
-                return;
-            }
-            else {
-                // 操作失败，暂时视为未找到订单
-                $this->_rspErr(2, 'order status error, o_link=' . $o_link);
-                return;
-            }
-        }
-
     }
 
 }