diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php
index 105c0714..0a13761e 100644
--- a/webapp/controller/ShopController.class.php
+++ b/webapp/controller/ShopController.class.php
@@ -1350,6 +1350,10 @@ class ShopController extends BaseAuthedController
         }
         $chestType = $meta['sub_type'];
         $itemStore = mt\ShopChest::getRandomItemListByChestType($chestType);
+        if (!$itemStore) {
+            $this->_rspErr(2, 'goods_id is invalid');
+            return;
+        }
         error_log("getChestItems start1 " . json_encode(
             array(
                 'goods_id' => $goods_id,
@@ -1563,7 +1567,7 @@ class ShopController extends BaseAuthedController
             )
         );
         foreach ($rows as $row) {
-            if ($row['createtime'] + 60 * 60 * 1 < $self->_getNowTime()) continue; // 24小时内有效
+            if ($row['createtime'] + 15 * 60 < $self->_getNowTime()) continue; // 15分钟内有效
             $extData = json_decode($row['ext_data'], true);
             error_log("checkPendingBuyGoodsNormal: " . json_encode($extData));
             if ($extData['mode'] == SHOP_BUY_MODE_NORMAL) {
@@ -1595,7 +1599,7 @@ class ShopController extends BaseAuthedController
             )
         );
         foreach ($rows as $row) {
-            if ($row['createtime'] + 60 * 60 * 1 < $self->_getNowTime()) continue; // 24小时内有效
+            if ($row['createtime'] + 15 * 60 < $self->_getNowTime()) continue; // 15分钟内有效
             $extData = json_decode($row['ext_data'], true);
             if ($extData['mode'] == SHOP_BUY_MODE_DAILY_SELECTION) {
                 if ($extData['idx'] == $idx) {