diff --git a/doc/Market.py b/doc/Market.py index 400c2d72..b8a67e1e 100644 --- a/doc/Market.py +++ b/doc/Market.py @@ -34,7 +34,7 @@ class TransactionRecord(object): self.fields = [ ['idx', '', 'idx'], ['createtime', 0, '交易成功时间'], - ['orderid', 0, 'market订单id'], + ['order_id', 0, 'market订单id'], ['o_link', '', '合约订单id'], ['seller', '', '卖家'], ['buyer', '', '买家'], diff --git a/sql/gamedb2006_migrate_230713_01.sql b/sql/gamedb2006_migrate_230713_01.sql index ec96c43f..6c549694 100644 --- a/sql/gamedb2006_migrate_230713_01.sql +++ b/sql/gamedb2006_migrate_230713_01.sql @@ -55,7 +55,7 @@ CREATE TABLE `t_market_transaction_record` ( KEY `seller` (`seller`), KEY `buyer` (`buyer`), KEY `o_link` (`o_link`), - KEY `orderid` (`order_id`) + KEY `order_id` (`order_id`) ) ENGINE=InnoDB AUTO_INCREMENT=10002 DEFAULT CHARSET=utf8; ALTER TABLE t_web2_order MODIFY COLUMN `item_num` bigint(20) DEFAULT NULL COMMENT '道具数量'; diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php index 123e6919..63859067 100644 --- a/webapp/controller/MarketController.class.php +++ b/webapp/controller/MarketController.class.php @@ -848,7 +848,7 @@ class MarketController extends BaseAuthedController $record ); if (!$r) { - $this->_rspErr(2, 'unknown error, orderId=' . $record['orderid']); + $this->_rspErr(2, 'unknown error, orderId=' . $record['order_id']); } } @@ -977,7 +977,7 @@ class MarketController extends BaseAuthedController // 增加交易记录 $record = array( 'createtime' => myself()->_getNowTime(), - 'orderid' => $chk['idx'], + 'order_id' => $chk['idx'], 'o_link' => $orderId, 'seller' => $seller, 'buyer' => $buyer, diff --git a/webapp/services/callback/MarketBuyOrderOk.php b/webapp/services/callback/MarketBuyOrderOk.php index c43f71e3..78edbf25 100644 --- a/webapp/services/callback/MarketBuyOrderOk.php +++ b/webapp/services/callback/MarketBuyOrderOk.php @@ -62,7 +62,7 @@ class MarketBuyOrderOk extends MarketCallbackBase // 增加交易记录 $record = array( 'createtime' => myself()->_getNowTime(), - 'orderid' => $chk['idx'], + 'order_id' => $chk['idx'], 'o_link' => $orderId, 'seller' => $seller, 'buyer' => $buyer, diff --git a/webapp/services/callback/MarketCallbackBase.php b/webapp/services/callback/MarketCallbackBase.php index 0bcc6d37..3c8a47b4 100644 --- a/webapp/services/callback/MarketCallbackBase.php +++ b/webapp/services/callback/MarketCallbackBase.php @@ -38,7 +38,7 @@ class MarketCallbackBase $record ); if (!$r) { - $this->_rspErr(2, 'unknown error, orderId=' . $record['orderid']); + $this->_rspErr(2, 'unknown error, order_id=' . $record['order_id']); } } }