diff --git a/webapp/services/callback/MarketBuyOrderOk.php b/webapp/services/callback/MarketBuyOrderOk.php index 71e092f6..fb13058b 100644 --- a/webapp/services/callback/MarketBuyOrderOk.php +++ b/webapp/services/callback/MarketBuyOrderOk.php @@ -1,8 +1,9 @@ $tokenId, - 'orderId' => $orderId, - 'nftToken' => $nftToken, - 'amount' => $amount, - 'seller' => $seller, - 'buyer' => $buyer, - 'erc20' => $erc20, - 'price' => $price, - ), - JSON_PRETTY_PRINT - ) - ); + $tokenId = getReqVal('tokenId', ''); + $orderId = getReqVal('orderId', ''); + $nftToken = getReqVal('nftToken', ''); + $amount = getReqVal('amount', 0); + $seller = strtolower(getReqVal('seller', '')); + $buyer = strtolower(getReqVal('buyer', '')); + $erc20 = getReqVal('erc20', ''); + $price = getReqVal('price', ''); - $conn = myself()->_getMysql(''); - - // 1. check order status - $chk = SqlHelper::selectOne($conn, 't_market_store', array('status', 'idx', 'c_name', 'token_type'), array('o_link' => $orderId)); - if (empty($chk)) { - $this->_rspErr(1, 'not found order, orderId=' . $orderId); - return; - } - if ($chk['status'] == '0') { - $r = SqlHelper::update( - $conn, - 't_market_store', - array( - 'o_link' => $orderId, - ), - array( - 'status' => 2, + error_log( + "eventBuyOrder:" . json_encode( + array( + 'tokenId' => $tokenId, + 'orderId' => $orderId, + 'nftToken' => $nftToken, + 'amount' => $amount, + 'seller' => $seller, + 'buyer' => $buyer, + 'erc20' => $erc20, + 'price' => $price, + ), + JSON_PRETTY_PRINT ) ); - if ($r) { - // 增加交易记录 - $record = array( - 'createtime' => myself()->_getNowTime(), - 'order_id' => $chk['order_id'], - 'o_link' => $orderId, - 'seller' => $seller, - 'buyer' => $buyer, - 'tokenid' => $tokenId, - 'amount' => $amount, - 'name' => $chk['c_name'], - 'type' => $chk['token_type'], - ); - $this->addTransactionRecord($record); - $this->_rspOk(); + + $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)); + 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; + } + } + $this->_rspErr(2, 'order status error, o_link=' . $o_link); } - $this->_rspErr(1, 'order status error, order=' . $orderId); - } } diff --git a/webapp/services/callback/MarketCancelOrderOk.php b/webapp/services/callback/MarketCancelOrderOk.php index 60098799..09a5f703 100644 --- a/webapp/services/callback/MarketCancelOrderOk.php +++ b/webapp/services/callback/MarketCancelOrderOk.php @@ -29,20 +29,22 @@ class MarketCancelOrderOk extends MarketCallbackBase ) ); + $o_link = $orderId; $conn = myself()->_getMysql(''); // 1. check order status - $chk = SqlHelper::selectOne($conn, 't_market_store', array('status'), array('o_link' => $orderId)); + $chk = SqlHelper::selectOne($conn, 't_market_store', array('status'), array('o_link' => $o_link)); if (empty($chk)) { - $this->_rspErr(1, 'not found order, orderId=' . $orderId); + $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' => $orderId, + 'o_link' => $o_link ), array( 'status' => 1, @@ -53,6 +55,6 @@ class MarketCancelOrderOk extends MarketCallbackBase return; } } - $this->_rspErr(1, 'order status error, order=' . $orderId); + $this->_rspErr(2, 'order status error, o_link=' . $o_link); } } diff --git a/webapp/services/callback/MarketPriceUpdateOrderOk.php b/webapp/services/callback/MarketPriceUpdateOrderOk.php index 479658db..3b94b951 100644 --- a/webapp/services/callback/MarketPriceUpdateOrderOk.php +++ b/webapp/services/callback/MarketPriceUpdateOrderOk.php @@ -33,12 +33,13 @@ class MarketPriceUpdateOrderOk extends MarketCallbackBase ) ); + $o_link = $orderId; $conn = myself()->_getMysql(''); - // 1. check order status - $chk = SqlHelper::selectOne($conn, 't_market_store', array('status'), array('o_link' => $orderId)); + // 订单没找到 + $chk = SqlHelper::selectOne($conn, 't_market_store', array('status'), array('o_link' => $o_link)); if (empty($chk)) { - $this->_rspErr(1, 'not found order, orderId=' . $orderId); + $this->_rspErr(2, 'not found order, o_link=' . $o_link); return; } @@ -47,7 +48,7 @@ class MarketPriceUpdateOrderOk extends MarketCallbackBase $conn, 't_market_store', array( - 'o_link' => $orderId, + 'o_link' => $o_link, ), array( 's_price' => $price, @@ -58,7 +59,7 @@ class MarketPriceUpdateOrderOk extends MarketCallbackBase return; } } - - $this->_rspErr(1, 'price update failed, orderId=' . $orderId); + // 更新价格失败,视作订单未找到 + $this->_rspErr(2, 'price update failed, o_link=' . $o_link); } } diff --git a/webapp/services/callback/MarketSellOrderOk.php b/webapp/services/callback/MarketSellOrderOk.php index 7031148d..5b7beed7 100644 --- a/webapp/services/callback/MarketSellOrderOk.php +++ b/webapp/services/callback/MarketSellOrderOk.php @@ -92,7 +92,8 @@ class MarketSellOrderOk extends MarketCallbackBase ) ); if (!$r) { - $this->_rspErr(2, 'unknown error, orderId=' . $orderId); + // 上架操作失败,这种情况一般不不应该发生,如果发生了,就是系统bug + $this->_rspErr(2, 'unknown error, o_link=' . $o_link); } // 成功上架,更新nft状态