diff --git a/sql/gamedb2006_migrate_230713_01.sql b/sql/gamedb2006_migrate_230713_01.sql
index 89c9f600..c70d68bd 100644
--- a/sql/gamedb2006_migrate_230713_01.sql
+++ b/sql/gamedb2006_migrate_230713_01.sql
@@ -62,6 +62,8 @@ CREATE TABLE `t_market_transaction_record` (
 
 
 ALTER TABLE t_web2_order MODIFY COLUMN `item_num` bigint(20) DEFAULT NULL COMMENT '道具数量';
+ALTER TABLE t_web2_order CHANGE account_Id account_id varchar(64) NOT NULL COMMENT '申请账号id';
+ALTER TABLE t_web2_order MODIFY COLUMN `createtime` int(11) NOT 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`);
diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php
index ff8a5ad1..58a8ac16 100644
--- a/webapp/controller/ShopController.class.php
+++ b/webapp/controller/ShopController.class.php
@@ -337,7 +337,11 @@ class ShopController extends BaseAuthedController
         $conn = myself()->_getMysql('');
 
         $order = SqlHelper::selectOne($conn, 't_shop_buy_order', array('address', 'id', 'item_id', 'goods_num', 'status'), array('idx' => $order_id));
-
+        if (!$order) {
+            $this->_rspErr(2, "order not found: {$order_id}");
+            return;
+        }
+    
         $id = $order['id'];
         $goods_num = $order['goods_num'];
         $o_status = $order['status'];
@@ -668,6 +672,9 @@ class ShopController extends BaseAuthedController
                 'address' => $address
             )
         );
+        if (!$row) {
+            return null;
+        }
         return $row['account_id'];
     }
 
diff --git a/webapp/services/callback/ShopBuyGoodsDirect.php b/webapp/services/callback/ShopBuyGoodsDirect.php
index 6bd374eb..073c0bb4 100644
--- a/webapp/services/callback/ShopBuyGoodsDirect.php
+++ b/webapp/services/callback/ShopBuyGoodsDirect.php
@@ -69,7 +69,10 @@ class ShopBuyGoodsDirect
     $conn = myself()->_getMysql('');
 
     $order = SqlHelper::selectOne($conn, 't_shop_buy_order', array('address', 'id', 'item_id', 'goods_num', 'status'), array('idx' => $order_id));
-
+    if (!$order) {
+        $this->_rspErr(2, "order not found: {$order_id}");
+        return;
+    }
     $id = $order['id'];
     $goods_num = $order['goods_num'];
     $o_status = $order['status'];
diff --git a/webapp/services/callback/ShopInappPurchaseDiamonds.php b/webapp/services/callback/ShopInappPurchaseDiamonds.php
index 288e2300..e72181a9 100644
--- a/webapp/services/callback/ShopInappPurchaseDiamonds.php
+++ b/webapp/services/callback/ShopInappPurchaseDiamonds.php
@@ -209,6 +209,9 @@ class ShopInappPurchaseDiamonds
               'address' => $address
           )
       );
+      if (!$row) {
+          return null;
+      }
       return $row['account_id'];
   }