From d5f2638c2ae79813dcd82b63ee59bfdc36e0798e Mon Sep 17 00:00:00 2001 From: songliang Date: Fri, 14 Jul 2023 20:29:11 +0800 Subject: [PATCH] ... --- sql/gamedb.sql | 4 ++-- sql/gamedb2006_migrate_230713_01.sql | 4 ++-- webapp/controller/MarketController.class.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sql/gamedb.sql b/sql/gamedb.sql index c76c7ce4..be0db616 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` bigint(20) NOT NULL COMMENT '订单id', + `order_id` varchar(64) NOT NULL 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 '当前拥有者', @@ -1340,7 +1340,7 @@ DROP TABLE IF EXISTS `t_market_transaction_record`; CREATE TABLE `t_market_transaction_record` ( `idx` bigint(20) NOT NULL AUTO_INCREMENT, `createtime` int(11) NOT NULL COMMENT '交易成功时间', - `order_id` bigint(20) NOT NULL COMMENT 'market 订单id', + `order_id` varchar(64) NOT NULL DEFAULT '0' COMMENT '订单id', `o_link` varchar(64) NOT NULL COMMENT '合约订单id', `seller` varchar(60) NOT NULL COMMENT '卖家', `buyer` varchar(60) NOT NULL COMMENT '买家', diff --git a/sql/gamedb2006_migrate_230713_01.sql b/sql/gamedb2006_migrate_230713_01.sql index 47eb2225..afd1d59d 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` bigint(20) NOT NULL COMMENT '订单id', + `order_id` varchar(64) NOT NULL 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 '当前拥有者', @@ -43,7 +43,7 @@ CREATE TABLE `t_market_store` ( CREATE TABLE `t_market_transaction_record` ( `idx` bigint(20) NOT NULL AUTO_INCREMENT, `createtime` int(11) NOT NULL COMMENT '交易成功时间', - `order_id` bigint(20) NOT NULL COMMENT 'market 订单id', + `order_id` varchar(64) NOT NULL DEFAULT '0' COMMENT '订单id', `o_link` varchar(64) NOT NULL COMMENT '合约订单id', `seller` varchar(60) NOT NULL COMMENT '卖家', `buyer` varchar(60) NOT NULL COMMENT '买家', diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php index be34d1c2..7fa70028 100644 --- a/webapp/controller/MarketController.class.php +++ b/webapp/controller/MarketController.class.php @@ -556,7 +556,7 @@ class MarketController extends BaseAuthedController ) ); $lastId = $this->lastInsertId($conn); - $order_id = $this->genOrderId($lastId); + $order_id = phpcommon\bnInit($this->genOrderId($lastId)); $test = SqlHelper::update($conn, 't_market_store', array('idx' => $lastId), array('order_id' => $order_id)); if (!$test) { $this->_rspErr(6, "sell failed"); @@ -657,7 +657,7 @@ class MarketController extends BaseAuthedController $this->_rspErr(1, 's_price must be number'); return; } - + $address = $this->_getAddress(); if (!$address) { $this->_rspErr(1, 'address not found');