Upload 37 files

pages/GameLucky.tsx

@@ -118,8 +118,8 @@ export const GameLucky: React.FC = () => {
            setActiveCardIndex(null);
         }, 2000);
      } catch (e: any) {
-        if(e.message.includes('POOL_EMPTY')) alert('奖品池已见底，请联系班主任补充奖品后再抽奖');
-        else alert('抽奖失败，请稍后重试');
+        // Use backend message directly if available, otherwise fallback
+        alert(e.message || '抽奖失败，请稍后重试');
         setIsFlipping(false);
         setActiveCardIndex(null);
      }

server.js

@@ -287,6 +287,17 @@ app.post('/api/games/lucky-draw', async (req, res) => {
       const defaultPrize = config?.defaultPrize || '再接再厉';
       const dailyLimit = config?.dailyLimit || 3;
 
+      // 2.2 PRE-CHECK: Inventory Check
+      const availablePrizes = prizes.filter(p => (p.count === undefined || p.count > 0));
+      if (availablePrizes.length === 0) {
+          // Determine error message based on who is drawing
+          const isTeacherOrAdmin = userRole === 'TEACHER' || userRole === 'ADMIN';
+          const msg = isTeacherOrAdmin 
+              ? '奖品库存不足，不能抽奖，请先补充库存' 
+              : '奖品库存不足，不能抽奖，请联系班主任补充库存';
+          return res.status(400).json({ error: 'POOL_EMPTY', message: msg });
+      }
+
       // 2.5 Daily Limit Check
       // Only limit if it's a STUDENT drawing for themselves. Teachers/Admins bypass limits.
       if (userRole === 'STUDENT') {
@@ -316,8 +327,6 @@ app.post('/api/games/lucky-draw', async (req, res) => {
           await student.save();
       }
 
-      // 3. Global Inventory Check
-      const availablePrizes = prizes.filter(p => (p.count === undefined || p.count > 0));
       // 4. Weighted Random Logic
       let selectedPrize = defaultPrize;
       let rewardType = 'CONSOLATION'; // Default to consolation