server/game2006api
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
songliang 2023-07-14 21:44:14 +08:00
parent 4387ae8563
commit 70c47b0f98
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/gamedb.sql
View File

@ -1149,13 +1149,15 @@ DROP TABLE IF EXISTS `t_shop_buy_order`;
/*!40101 SET character_set_client = utf8 */; /*!40101 SET character_set_client = utf8 */;
CREATE TABLE `t_shop_buy_order` ( CREATE TABLE `t_shop_buy_order` (
`idx` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '订单id', `idx` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '订单id',
`address` varchar(60) NOT NULL COMMENT '账户id', `order_id` varchar(64) DEFAULT NULL COMMENT '订单id',
`address` varchar(60) NOT NULL COMMENT '账户地址',
`createtime` int(11) NOT NULL COMMENT '订单开始时间', `createtime` int(11) NOT NULL COMMENT '订单开始时间',
`id` int(11) NOT NULL COMMENT '商店货物id', `id` int(11) NOT NULL COMMENT '商店货物id',
`item_id` int(11) NOT NULL COMMENT '道具id', `item_id` int(11) NOT NULL COMMENT '道具id',
`goods_num` int(11) NOT NULL COMMENT '购买个数', `goods_num` int(11) NOT NULL COMMENT '购买个数',
`status` int(11) NOT NULL COMMENT '订单状态 0-客户端申请了订单 1-订单完成 2-订单失败', `status` int(11) NOT NULL COMMENT '订单状态 0-客户端申请了订单 1-订单完成 2-订单失败',
PRIMARY KEY (`idx`) PRIMARY KEY (`idx`),
UNIQUE KEY `order_id` (`order_id`)
) ENGINE=InnoDB AUTO_INCREMENT=184 DEFAULT CHARSET=utf8; ) ENGINE=InnoDB AUTO_INCREMENT=184 DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;

4
sql/gamedb2006_migrate_230713_01.sql
View File

@ -60,8 +60,12 @@ CREATE TABLE `t_market_transaction_record` (
KEY `order_id` (`order_id`) KEY `order_id` (`order_id`)
) ENGINE=InnoDB AUTO_INCREMENT=10002 DEFAULT CHARSET=utf8; ) ENGINE=InnoDB AUTO_INCREMENT=10002 DEFAULT CHARSET=utf8;
ALTER TABLE t_web2_order MODIFY COLUMN `item_num` bigint(20) DEFAULT NULL COMMENT '道具数量'; ALTER TABLE t_web2_order MODIFY COLUMN `item_num` bigint(20) DEFAULT NULL COMMENT '道具数量';
ALTER TABLE t_shop_buy_order ADD COLUMN `order_id` varchar(64) DEFAULT NULL COMMENT '订单id';
ALTER TABLE t_shop_buy_order add UNIQUE KEY `order_id` (`order_id`);
insert into version (version) values(2023071301); insert into version (version) values(2023071301);
commit; commit;

2
webapp/controller/ShopController.class.php
View File

@ -314,7 +314,7 @@ class ShopController extends BaseAuthedController
$hash_data = http_build_query($data); $hash_data = http_build_query($data);
$signature = hash_hmac('sha256', $hash_data, 'iG4Rpsa)6U31$H#^T85$^^3'); $signature = hash_hmac('sha256', $hash_data, BUY_SERVER_PKEY);
if ($signature != $sign) { if ($signature != $sign) {
$this->_rspErr(1, "signature error, signature: {$signature}, sign: {$sign}"); $this->_rspErr(1, "signature error, signature: {$signature}, sign: {$sign}");

9
webapp/services/callback/MarketSellOrderOk.php
View File

@ -50,7 +50,7 @@ class MarketSellOrderOk extends MarketCallbackBase
$o_link = $orderId; $o_link = $orderId;
$conn = myself()->_getMysql(''); $conn = myself()->_getMysql('');
// 1. check order status // 1. check order status and repeat order
$chk = SqlHelper::selectOne($conn, 't_market_store', array('status'), array('o_link' => $o_link)); $chk = SqlHelper::selectOne($conn, 't_market_store', array('status'), array('o_link' => $o_link));
if (!empty($chk)) { if (!empty($chk)) {
$this->_rspErr(1, 'repeat sell order, o_link=' . $o_link); $this->_rspErr(1, 'repeat sell order, o_link=' . $o_link);
@ -94,10 +94,9 @@ class MarketSellOrderOk extends MarketCallbackBase
if (!$r) { if (!$r) {
$this->_rspErr(2, 'unknown error, orderId=' . $orderId); $this->_rspErr(2, 'unknown error, orderId=' . $orderId);
} }
$lastId = $this->lastInsertId($conn);
$order_id = $this->genOrderId($lastId); // 成功上架，更新nft状态
$test = SqlHelper::update($conn, 't_market_store', array('idx' => $lastId), array('order_id' => $order_id)); $this->_rspOk();
$this->_rspOk();
} }
private function getNftGameData($nftRowInfo) private function getNftGameData($nftRowInfo)

2
webapp/services/callback/ShopBuyGoodsDirect.php
View File

@ -57,7 +57,7 @@ class ShopBuyGoodsDirect
$hash_data = http_build_query($data); $hash_data = http_build_query($data);
$signature = hash_hmac('sha256', $hash_data, 'iG4Rpsa)6U31$H#^T85$^^3'); $signature = hash_hmac('sha256', $hash_data, BUY_SERVER_PKEY);
if ($signature != $sign) { if ($signature != $sign) {
$this->_rspErr(1, "signature error, signature: {$signature}, sign: {$sign}"); $this->_rspErr(1, "signature error, signature: {$signature}, sign: {$sign}");