diff --git a/sql/gamedb.sql b/sql/gamedb.sql index be0db616..7bdbc3ee 100644 --- a/sql/gamedb.sql +++ b/sql/gamedb.sql @@ -1298,7 +1298,7 @@ CREATE TABLE `t_web2_order` ( DROP TABLE IF EXISTS `t_market_store`; CREATE TABLE `t_market_store` ( `idx` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增id', - `order_id` varchar(64) NOT NULL DEFAULT '0' COMMENT '订单id', + `order_id` varchar(64) DEFAULT '0' COMMENT '订单id', `o_link` varchar(64) DEFAULT NULL COMMENT '关联的链上上架单号', `status` int(11) NOT NULL COMMENT '订单状态 0:出售中 1:已下架 2:已售出 3:购买中', `owner_address` varchar(60) NOT NULL COMMENT '当前拥有者', @@ -1319,9 +1319,10 @@ CREATE TABLE `t_market_store` ( `c_quality` int(11) NOT NULL COMMENT '缓存-品阶', `c_durability` float NOT NULL COMMENT '缓存-能量', `c_id` int(11) NOT NULL COMMENT '缓存-id', - PRIMARY KEY (`idx`), + PRIMARY KEY (`idx`) USING BTREE, UNIQUE KEY `idx` (`idx`), - KEY `o_link` (`o_link`), + UNIQUE KEY `o_link` (`o_link`) USING BTREE, + UNIQUE KEY `order_id` (`order_id`) USING BTREE, KEY `owner_address` (`owner_address`), KEY `token_id` (`token_id`), KEY `createtime` (`createtime`), @@ -1332,9 +1333,8 @@ CREATE TABLE `t_market_store` ( KEY `c_lv` (`c_lv`), KEY `c_quality` (`c_quality`), KEY `c_durability` (`c_durability`), - KEY `c_id` (`c_id`), - KEY `order_id` (`order_id`) -) ENGINE=InnoDB AUTO_INCREMENT=10014 DEFAULT CHARSET=utf8; + KEY `c_id` (`c_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10048 DEFAULT CHARSET=utf8; DROP TABLE IF EXISTS `t_market_transaction_record`; CREATE TABLE `t_market_transaction_record` ( diff --git a/sql/gamedb2006_migrate_230713_01.sql b/sql/gamedb2006_migrate_230713_01.sql index afd1d59d..9b993e8d 100644 --- a/sql/gamedb2006_migrate_230713_01.sql +++ b/sql/gamedb2006_migrate_230713_01.sql @@ -2,7 +2,7 @@ begin; CREATE TABLE `t_market_store` ( `idx` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增id', - `order_id` varchar(64) NOT NULL DEFAULT '0' COMMENT '订单id', + `order_id` varchar(64) DEFAULT '0' COMMENT '订单id', `o_link` varchar(64) DEFAULT NULL COMMENT '关联的链上上架单号', `status` int(11) NOT NULL COMMENT '订单状态 0:出售中 1:已下架 2:已售出 3:购买中', `owner_address` varchar(60) NOT NULL COMMENT '当前拥有者', @@ -23,9 +23,10 @@ CREATE TABLE `t_market_store` ( `c_quality` int(11) NOT NULL COMMENT '缓存-品阶', `c_durability` float NOT NULL COMMENT '缓存-能量', `c_id` int(11) NOT NULL COMMENT '缓存-id', - PRIMARY KEY (`idx`), + PRIMARY KEY (`idx`) USING BTREE, UNIQUE KEY `idx` (`idx`), - KEY `o_link` (`o_link`), + UNIQUE KEY `o_link` (`o_link`) USING BTREE, + UNIQUE KEY `order_id` (`order_id`) USING BTREE, KEY `owner_address` (`owner_address`), KEY `token_id` (`token_id`), KEY `createtime` (`createtime`), @@ -36,9 +37,8 @@ CREATE TABLE `t_market_store` ( KEY `c_lv` (`c_lv`), KEY `c_quality` (`c_quality`), KEY `c_durability` (`c_durability`), - KEY `c_id` (`c_id`), - KEY `order_id` (`order_id`) -) ENGINE=InnoDB AUTO_INCREMENT=10014 DEFAULT CHARSET=utf8; + KEY `c_id` (`c_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10048 DEFAULT CHARSET=utf8; CREATE TABLE `t_market_transaction_record` ( `idx` bigint(20) NOT NULL AUTO_INCREMENT, diff --git a/webapp/services/callback/MarketBuyOrderOk.php b/webapp/services/callback/MarketBuyOrderOk.php index 2e77288d..71e092f6 100644 --- a/webapp/services/callback/MarketBuyOrderOk.php +++ b/webapp/services/callback/MarketBuyOrderOk.php @@ -64,7 +64,7 @@ class MarketBuyOrderOk extends MarketCallbackBase // 增加交易记录 $record = array( 'createtime' => myself()->_getNowTime(), - 'order_id' => $chk['idx'], + 'order_id' => $chk['order_id'], 'o_link' => $orderId, 'seller' => $seller, 'buyer' => $buyer, diff --git a/webapp/services/callback/MarketSellOrderOk.php b/webapp/services/callback/MarketSellOrderOk.php index 9b97fd8c..07c3b9bf 100644 --- a/webapp/services/callback/MarketSellOrderOk.php +++ b/webapp/services/callback/MarketSellOrderOk.php @@ -47,12 +47,13 @@ class MarketSellOrderOk 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, 'repeat sell order, orderId=' . $orderId); + $this->_rspErr(1, 'repeat sell order, o_link=' . $o_link); return; } @@ -69,7 +70,7 @@ class MarketSellOrderOk extends MarketCallbackBase array( 'token_id' => $tokenId, 'order_id' => 0, - 'o_link' => $orderId, + 'o_link' => $o_link, 'nft_token' => $nftToken, 'status' => 0, 'owner_address' => $owner,