From 59c18b35446f8e1779b895de08f376368e8f819e Mon Sep 17 00:00:00 2001
From: azw <vcl_delphi@126.com>
Date: Sat, 29 Jul 2023 09:21:01 +0800
Subject: [PATCH] 1

---
 webapp/controller/ShopController.class.php | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php
index 2bebcb29..0bce764f 100644
--- a/webapp/controller/ShopController.class.php
+++ b/webapp/controller/ShopController.class.php
@@ -71,11 +71,19 @@ class ShopController extends BaseAuthedController {
         }
 
         $goodsMeta = mt\ShopGoods::get($id);
-
         if (!$goodsMeta) {
             $this->_rspErr(1, 'goods not found');
             return;
         }
+        if ($goodsNum > $goodsMeta['max_amount']) {
+            $this->_rspErr(1, "goods_num parameter error, max_amount: {$goodsMeta['max_amount']}");
+            return;
+        }
+        $itemMeta = mt\Item::get($goodsMeta['goods_id']);
+        if (!$itemMeta) {
+            $this->_rspErr(1, 'goods not found, goods_id: ' . $goodsMeta['goods_id']);
+            return;
+        }
 
         $goodsId = $goodsMeta['goods_id'];
 
@@ -96,23 +104,12 @@ class ShopController extends BaseAuthedController {
             }
         }
 
-        if ($goodsNum > $goodsMeta['max_amount']) {
-            $this->_rspErr(1, "goods_num parameter error, max_amount: {$goodsMeta['max_amount']}");
-            return;
-        }
-
         // 这里命名混乱了, 购买个数，一捆个数命名冲突
         $goods_count = $goodsMeta['goods_num'];
 
         $buyRecordHash = ShopBuyRecord::allToHash();
         $boughtTimes = 1;
 
-        $itemMeta = mt\Item::get($goodsMeta['goods_id']);
-        if (!$itemMeta) {
-            $this->_rspErr(1, 'goods not found, goods_id: ' . $goodsMeta['goods_id']);
-            return;
-        }
-
         if ($itemMeta['type'] == mt\Item::HERO_SKIN_TYPE) {
             $errCode = 0;
             $errMsg = '';