From 3e6b1cfe932eb806972e22c0810d3b3dbe0024f4 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 5 Aug 2023 17:10:15 +0800
Subject: [PATCH] 1

---
 sql/gamedb.sql                                |  1 -
 webapp/models/Market.php                      |  3 +-
 .../callback/MarketPriceUpdateOrderOk.php     | 49 ++-----------------
 3 files changed, 5 insertions(+), 48 deletions(-)

diff --git a/sql/gamedb.sql b/sql/gamedb.sql
index 7453fcc6..f5232398 100644
--- a/sql/gamedb.sql
+++ b/sql/gamedb.sql
@@ -1414,7 +1414,6 @@ CREATE TABLE `t_market` (
   `amount` varchar(255) NOT NULL DEFAULT '' COMMENT 'amount',
   `currency` varchar(60) NOT NULL COMMENT 'currency',
   `price` varchar(255) NOT NULL DEFAULT '' COMMENT 'price',
-  `update_currency` varchar(60) COMMENT 'update_currency',
   `update_price` varchar(255) COMMENT 'update_price',
   `update_time` int(11) COMMENT 'update_time',
   `status` int(11) NOT NULL DEFAULT '0' COMMENT 'status',
diff --git a/webapp/models/Market.php b/webapp/models/Market.php
index 84870793..ebb7d3e6 100644
--- a/webapp/models/Market.php
+++ b/webapp/models/Market.php
@@ -38,11 +38,10 @@ class Market extends BaseModel {
             ));
     }
 
-    public static function updatePrice($orderId, $currency, $price) {
+    public static function updatePrice($orderId, $price) {
         self::internalUpdate(
             $orderId,
             array(
-                'update_currency' => $currency,
                 'update_price' => $price,
                 'update_time' => myself()->_getNowTime(),
             ));
diff --git a/webapp/services/callback/MarketPriceUpdateOrderOk.php b/webapp/services/callback/MarketPriceUpdateOrderOk.php
index c240187c..11a1c065 100644
--- a/webapp/services/callback/MarketPriceUpdateOrderOk.php
+++ b/webapp/services/callback/MarketPriceUpdateOrderOk.php
@@ -1,67 +1,26 @@
 <?php
 
 namespace services;
-require_once('MarketCallbackBase.php');
 
 require_once ('services/callback/common/SignatureService.php');
 
-use services\MarketCallbackBase;
 use phpcommon\SqlHelper;
 
-class MarketPriceUpdateOrderOk extends MarketCallbackBase {
+class MarketPriceUpdateOrderOk {
 
     public function process()
     {
         SignatureService::web3ServiceCheck();
-        error_log('MarketPriceUpdateOrderOk:' . json_encode($_REQUEST, JSON_PRETTY_PRINT));
+        error_log('MarketPriceUpdateOrderOk:' . json_encode($_REQUEST));
 
         $orderId = getReqVal('orderId', '');;
         $nftToken = getReqVal('nftToken', '');
         $tokenId = getReqVal('tokenId', '');
         $priceOld = getReqVal('priceOld', '');
         $price = getReqVal('price', '');
-        error_log(
-            "eventPriceUpdateOrder:" . json_encode(
-                array(
-                    'orderId' => $orderId,
-                    'nftToken' => $nftToken,
-                    'tokenId' => $tokenId,
-                    'priceOld' => $priceOld,
-                    'price' => $price,
-                ),
-                JSON_PRETTY_PRINT
-            )
-        );
 
-        $o_link = $orderId;
-        $conn = myself()->_getMysql('');
-
-        // 订单没找到
-        $chk = SqlHelper::selectOne($conn, 't_market_store', array('status'), array('o_link' => $o_link, 'status' => 0, 's_price' => $priceOld));
-        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(
-                    's_price' => $price,
-                )
-            );
-            if ($r) {
-                $this->_rspOk();
-                return;
-            } else {
-                $this->_rspErr(2, 'not found order, o_link=' . $o_link);
-                return;
-            }
-        }
+        Market::updatePrice($orderId, $price);
+        myself()->_rspOk();
     }
 
 }