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-11 10:32:57 +08:00
parent 41fd3a2715
commit 703d40c9eb
3 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sql/gamedb.sql
View File

@ -1267,3 +1267,24 @@ CREATE TABLE `t_user_honor` (
UNIQUE KEY `address` (`address`) UNIQUE KEY `address` (`address`)
) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; ) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
DROP TABLE IF EXISTS `t_web2_order`;
CREATE TABLE `t_web2_order` (
`idx` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增id',
`status` int(11) NOT NULL COMMENT '订单状态 0-客户端申请了订单 1-订单完成 2-订单失败',
`order_id` varchar(64) DEFAULT NULL COMMENT '订单id',
`createtime` datetime NOT NULL COMMENT '创建时间',
`account_Id` varchar(64) NOT NULL COMMENT '申请账号id',
`address` varchar(64) DEFAULT NULL COMMENT '申请时账号绑定的钱包',
`item_id` int(11) NOT NULL COMMENT '物品id',
`item_num` int(11) NOT NULL COMMENT '物品数量',
`id` int(11) NOT NULL COMMENT '商店中的配置id，',
`goods_num` int(11) NOT NULL COMMENT '购买商品个数',
`price` varchar(64) DEFAULT NULL COMMENT '价格',
`ext_data` mediumblob COMMENT '扩展自定义数据',
`channel` varchar(64) DEFAULT NULL COMMENT 'google or apple',
`out_order_id` varchar(64) DEFAULT NULL COMMENT 'app store order_id',
PRIMARY KEY (`idx`),
UNIQUE KEY `order_id` (`order_id`) USING HASH,
KEY `out_order_id` (`out_order_id`)
) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8;

20
sql/gamedb2006_migrate_230710_01.sql
View File

@ -14,6 +14,26 @@ CREATE TABLE `t_user_honor` (
UNIQUE KEY `address` (`address`) UNIQUE KEY `address` (`address`)
) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; ) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
CREATE TABLE `t_web2_order` (
`idx` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增id',
`status` int(11) NOT NULL COMMENT '订单状态 0-客户端申请了订单 1-订单完成 2-订单失败',
`order_id` varchar(64) DEFAULT NULL COMMENT '订单id',
`createtime` datetime NOT NULL COMMENT '创建时间',
`account_Id` varchar(64) NOT NULL COMMENT '申请账号id',
`address` varchar(64) DEFAULT NULL COMMENT '申请时账号绑定的钱包',
`item_id` int(11) NOT NULL COMMENT '物品id',
`item_num` int(11) NOT NULL COMMENT '物品数量',
`id` int(11) NOT NULL COMMENT '商店中的配置id，',
`goods_num` int(11) NOT NULL COMMENT '购买商品个数',
`price` varchar(64) DEFAULT NULL COMMENT '价格',
`ext_data` mediumblob COMMENT '扩展自定义数据',
`channel` varchar(64) DEFAULT NULL COMMENT 'google or apple',
`out_order_id` varchar(64) DEFAULT NULL COMMENT 'app store order_id',
PRIMARY KEY (`idx`),
UNIQUE KEY `order_id` (`order_id`) USING HASH,
KEY `out_order_id` (`out_order_id`)
) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8;
insert into version (version) values(2023071001); insert into version (version) values(2023071001);
commit; commit;

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

@ -499,6 +499,7 @@ class ShopController extends BaseAuthedController
return; return;
} }
$conn = myself()->_getMysql('');
// 有三种情况： // 有三种情况：
// 1. 从商城购买钻石，有订单号 // 1. 从商城购买钻石，有订单号
// 2. 站外充值钻石，没有订单号 // 2. 站外充值钻石，没有订单号
@ -525,10 +526,8 @@ class ShopController extends BaseAuthedController
return; return;
} }
$conn = myself()->_getMysql('');
$order = SqlHelper::selectOne($conn, 't_web2_order', array('address', 'id', 'item_id', 'goods_num', 'status'), array('idx' => $order_id)); $order = SqlHelper::selectOne($conn, 't_web2_order', array('address', 'id', 'item_id', 'goods_num', 'status'), array('idx' => $order_id));
error_log('process order '. json_encode($order));
SqlHelper::update($conn, 't_web2_order', array('idx' => $order_id), array('status' => $status, 'channel' => $channel, 'out_order_id' => $out_order_id)); SqlHelper::update($conn, 't_web2_order', array('idx' => $order_id), array('status' => $status, 'channel' => $channel, 'out_order_id' => $out_order_id));
$id = $order['id']; $id = $order['id'];