From 9652916bfc48a7663721022dacab8ca60dd48e51 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 20 Oct 2020 09:56:41 +0800 Subject: [PATCH] 1 --- sql/paydb.sql | 3 ++- sql/paydb_migrate_190826.sql | 5 ----- webapp/sdkwarpper/BaseSdk.php | 11 ++++++++++- 3 files changed, 12 insertions(+), 7 deletions(-) delete mode 100644 sql/paydb_migrate_190826.sql diff --git a/sql/paydb.sql b/sql/paydb.sql index 48405ac..52a39c3 100644 --- a/sql/paydb.sql +++ b/sql/paydb.sql @@ -40,6 +40,7 @@ CREATE TABLE `orderinfo` ( `roleid` varchar(255) DEFAULT '' COMMENT '角色id', `server_id` int(11) NOT NULL DEFAULT '0' COMMENT 'server_id', `channel` int(11) NOT NULL DEFAULT '0' COMMENT 'channel', + `poly_sdk_channel` int(11) NOT NULL DEFAULT '0' COMMENT 'poly_sdk_channel', `unified_channel` int(11) NOT NULL DEFAULT '0' COMMENT 'unified_channel', `gameid` int(11) NOT NULL DEFAULT '0' COMMENT 'gameid', `openid` varchar(255) NOT NULL DEFAULT '0' COMMENT '平台openid', @@ -47,7 +48,7 @@ CREATE TABLE `orderinfo` ( `try_count` int(11) NOT NULL DEFAULT '0' COMMENT '补单次数', `price` int(11) NOT NULL DEFAULT '0' COMMENT 'price', `ipv4` varchar(50) NOT NULL DEFAULT '' COMMENT 'ipv4地址', - `status` int(11) NOT NULL DEFAULT '0' COMMENT '0: 新添加订单 1:已经完成订单', + `status` int(11) NOT NULL DEFAULT '0' COMMENT '0: 新添加订单 1:已经完成订单 2:发货成功', `confirmtime` int(11) NOT NULL DEFAULT '0' COMMENT 'GameServer订单确认时间', `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', diff --git a/sql/paydb_migrate_190826.sql b/sql/paydb_migrate_190826.sql deleted file mode 100644 index f291ef4..0000000 --- a/sql/paydb_migrate_190826.sql +++ /dev/null @@ -1,5 +0,0 @@ -begin; - -alter table orderinfo add `sp_amount` double NOT NULL COMMENT 'sp_amount'; - -commit; diff --git a/webapp/sdkwarpper/BaseSdk.php b/webapp/sdkwarpper/BaseSdk.php index 6b44bdb..24d8cd8 100644 --- a/webapp/sdkwarpper/BaseSdk.php +++ b/webapp/sdkwarpper/BaseSdk.php @@ -39,7 +39,16 @@ class BaseSdk public function queryOrderInfo() { - + $order_info = $this->order_ctrl->getOrderByCpOrderId($_REQUEST['cp_orderid']); + if (!$order_info) { + phpcommon\sendError(1, '订单不存在'); + } + echo json_encode(array( + 'errcode' => 0, + 'errmsg' => '', + 'cp_orderid' => $order_info['cp_orderid'], + 'status' => $order_info['status'], + )); } }