From 703d40c9eb4bc76dda7173ce3f8eefef2d953b92 Mon Sep 17 00:00:00 2001
From: songliang <songliang@kingsome.cn>
Date: Tue, 11 Jul 2023 10:32:57 +0800
Subject: [PATCH] ...

---
 sql/gamedb.sql                             | 21 +++++++++++++++++++++
 sql/gamedb2006_migrate_230710_01.sql       | 20 ++++++++++++++++++++
 webapp/controller/ShopController.class.php |  5 ++---
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/sql/gamedb.sql b/sql/gamedb.sql
index 4acc6b22..b363e703 100644
--- a/sql/gamedb.sql
+++ b/sql/gamedb.sql
@@ -1267,3 +1267,24 @@ CREATE TABLE `t_user_honor` (
   UNIQUE KEY `address` (`address`)
 ) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
 /*!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;
\ No newline at end of file
diff --git a/sql/gamedb2006_migrate_230710_01.sql b/sql/gamedb2006_migrate_230710_01.sql
index 5b4f2db2..fa532b73 100644
--- a/sql/gamedb2006_migrate_230710_01.sql
+++ b/sql/gamedb2006_migrate_230710_01.sql
@@ -14,6 +14,26 @@ CREATE TABLE `t_user_honor` (
   UNIQUE KEY `address` (`address`)
 ) 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);
 
 commit;
\ No newline at end of file
diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php
index 2dc47a68..28adcaab 100644
--- a/webapp/controller/ShopController.class.php
+++ b/webapp/controller/ShopController.class.php
@@ -499,6 +499,7 @@ class ShopController extends BaseAuthedController
             return;
         }
 
+        $conn = myself()->_getMysql('');
         // 有三种情况：
         // 1. 从商城购买钻石，有订单号
         // 2. 站外充值钻石，没有订单号
@@ -525,10 +526,8 @@ class ShopController extends BaseAuthedController
                             return;
                         }
 
-                        $conn = myself()->_getMysql('');
-
                         $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));
 
                         $id = $order['id'];