Upload 34 files

pages/Dashboard.tsx

@@ -173,10 +173,10 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
       : classList.map(c => c.grade + c.className).sort(sortClasses);
 
   const cards = [
-    { label: '在校学生', value: stats.studentCount, icon: Users, color: 'bg-blue-500', trend: '+12%' },
-    { label: '开设课程', value: stats.courseCount, icon: BookOpen, color: 'bg-emerald-500', trend: '+4' },
-    { label: '平均成绩', value: stats.avgScore, icon: GraduationCap, color: 'bg-violet-500', trend: '+2.5' },
-    { label: '优秀率', value: stats.excellentRate, icon: TrendingUp, color: 'bg-orange-500', trend: '-1%' },
+    { label: '在校学生', value: stats.studentCount, icon: Users, color: 'bg-blue-500', trend: '实时' },
+    { label: '开设课程', value: stats.courseCount, icon: BookOpen, color: 'bg-emerald-500', trend: '实时' },
+    { label: '平均成绩', value: stats.avgScore, icon: GraduationCap, color: 'bg-violet-500', trend: '全校' },
+    { label: '优秀率', value: stats.excellentRate, icon: TrendingUp, color: 'bg-orange-500', trend: '>=90分' },
   ];
 
   return (
@@ -202,9 +202,9 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
             <div className="relative z-10">
               <p className="text-sm font-medium text-gray-500 mb-1">{card.label}</p>
               <h3 className="text-3xl font-bold text-gray-800">{card.value}</h3>
-              <div className={`flex items-center mt-2 text-xs font-medium ${card.trend.startsWith('+') ? 'text-green-600' : 'text-red-500'}`}>
-                 <span className={`px-1.5 py-0.5 rounded ${card.trend.startsWith('+') ? 'bg-green-100' : 'bg-red-100'}`}>{card.trend}</span>
-                 <span className="ml-2 text-gray-400">较上月</span>
+              <div className={`flex items-center mt-2 text-xs font-medium text-gray-400`}>
+                 <span className={`px-1.5 py-0.5 rounded bg-gray-100 text-gray-600 mr-2`}>{card.trend}</span>
+                 统计数据
               </div>
             </div>
             <div className={`p-3 rounded-xl ${card.color} bg-opacity-10 text-white shadow-sm group-hover:scale-110 transition-transform`}>

pages/GameRewards.tsx

@@ -2,7 +2,7 @@
 import React, { useState, useEffect } from 'react';
 import { api } from '../services/api';
 import { StudentReward, Student } from '../types';
-import { Gift, Loader2, Search } from 'lucide-react';
+import { Gift, Loader2, Search, Filter, Trash2, Edit, Save, X } from 'lucide-react';
 
 export const GameRewards: React.FC = () => {
   const [myRewards, setMyRewards] = useState<StudentReward[]>([]);
@@ -12,18 +12,30 @@ export const GameRewards: React.FC = () => {
   // Grant Modal
   const [isGrantModalOpen, setIsGrantModalOpen] = useState(false);
   const [students, setStudents] = useState<Student[]>([]);
-  const [grantForm, setGrantForm] = useState({ studentId: '', count: 1 });
+  const [grantForm, setGrantForm] = useState({ 
+      studentId: '', 
+      count: 1, 
+      rewardType: 'DRAW_COUNT' as 'DRAW_COUNT' | 'ITEM', 
+      name: '' 
+  });
+
+  // Filters
+  const [filterType, setFilterType] = useState('ALL'); // ALL, ITEM, DRAW_COUNT
+  const [filterStatus, setFilterStatus] = useState('ALL'); // ALL, PENDING, REDEEMED
+  const [searchText, setSearchText] = useState('');
+
+  // Edit State
+  const [editingId, setEditingId] = useState<string | null>(null);
+  const [editForm, setEditForm] = useState({ name: '', count: 1 });
 
   const currentUser = api.auth.getCurrentUser();
   const isStudent = currentUser?.role === 'STUDENT';
   const isTeacher = currentUser?.role === 'TEACHER';
-  const isAdmin = currentUser?.role === 'ADMIN';
 
   const loadData = async () => {
     setLoading(true);
     try {
       if (isStudent) {
-         // Need to find my student ID first
          const stus = await api.students.getAll();
          const me = stus.find((s: Student) => s.name === (currentUser.trueName || currentUser.username));
          if (me) {
@@ -41,12 +53,13 @@ export const GameRewards: React.FC = () => {
          let filteredStudents = allStus;
 
          if (isTeacher && currentUser.homeroomClass) {
-             // Filter rewards by student names belonging to class (Backend link is better, but frontend filtering works for mock)
-             // Or better: filter students first, then filter rewards by student IDs
              filteredStudents = allStus.filter((s: Student) => s.className === currentUser.homeroomClass);
              const studentIds = filteredStudents.map((s: Student) => s._id || String(s.id));
              filteredRewards = allRews.filter((r: StudentReward) => studentIds.includes(r.studentId));
          }
+         
+         // Hide Consolation prizes from teacher view to keep it clean
+         filteredRewards = filteredRewards.filter((r: StudentReward) => r.rewardType !== 'CONSOLATION');
 
          setAllRewards(filteredRewards);
          setStudents(filteredStudents);
@@ -57,12 +70,16 @@ export const GameRewards: React.FC = () => {
 
   useEffect(() => { loadData(); }, []);
 
-  const handleGrantDraw = async () => {
+  const handleGrant = async () => {
      if(!grantForm.studentId) return alert('请选择学生');
+     if(grantForm.rewardType === 'ITEM' && !grantForm.name) return alert('请输入奖品名称');
+     
      try {
-        await api.games.grantDrawCount(grantForm.studentId, grantForm.count);
+        await api.games.grantReward(grantForm);
         setIsGrantModalOpen(false);
         alert('发放成功');
+        // Reset form defaults
+        setGrantForm({ studentId: '', count: 1, rewardType: 'DRAW_COUNT', name: '' });
         loadData();
      } catch(e) { alert('发放失败'); }
   };
@@ -74,19 +91,74 @@ export const GameRewards: React.FC = () => {
      }
   };
 
+  const handleDelete = async (r: StudentReward) => {
+      if (!confirm(`确定要撤回这条奖励吗？\n如果学生已经使用了抽奖券，撤回将失败。`)) return;
+      try {
+          await api.rewards.delete(r._id!);
+          loadData();
+      } catch (e: any) {
+          alert(e.message || '撤回失败，可能学生已使用部分次数');
+      }
+  };
+
+  const handleUpdate = async (id: string) => {
+      await api.rewards.update(id, editForm);
+      setEditingId(null);
+      loadData();
+  };
+
+  const startEdit = (r: StudentReward) => {
+      setEditingId(r._id!);
+      setEditForm({ name: r.name, count: r.count || 1 });
+  };
+
+  // Filter Logic
+  const displayRewards = (isStudent ? myRewards : allRewards).filter(r => {
+      if (filterType !== 'ALL' && r.rewardType !== filterType) return false;
+      if (filterStatus !== 'ALL' && r.status !== filterStatus) return false;
+      if (searchText) {
+          const lower = searchText.toLowerCase();
+          return r.studentName.toLowerCase().includes(lower) || r.name.toLowerCase().includes(lower);
+      }
+      return true;
+  });
+
   if (loading) return <div className="h-full flex items-center justify-center"><Loader2 className="animate-spin text-blue-600"/></div>;
 
   return (
     <div className="flex-1 flex flex-col min-h-0 bg-white rounded-2xl shadow-sm border border-gray-100 overflow-hidden">
-        <div className="p-6 border-b border-gray-100 flex justify-between items-center shrink-0">
+        <div className="p-6 border-b border-gray-100 flex flex-col md:flex-row justify-between items-start md:items-center gap-4 shrink-0">
             <h3 className="text-xl font-bold text-gray-800">
                 {isStudent ? '我的战利品清单' : '班级奖励核销台'}
             </h3>
-            {!isStudent && (
-                <button onClick={() => setIsGrantModalOpen(true)} className="flex items-center px-4 py-2 bg-amber-100 text-amber-700 rounded-lg font-bold hover:bg-amber-200 text-sm">
-                    <Gift size={16} className="mr-2"/> 手动发放抽奖券
-                </button>
-            )}
+            
+            <div className="flex flex-wrap items-center gap-3 w-full md:w-auto">
+                {/* Filters */}
+                <div className="flex items-center bg-gray-100 rounded-lg p-1">
+                    <select className="bg-transparent text-xs p-1.5 rounded outline-none text-gray-600" value={filterType} onChange={e=>setFilterType(e.target.value)}>
+                        <option value="ALL">全部类型</option>
+                        <option value="ITEM">实物</option>
+                        <option value="DRAW_COUNT">抽奖券</option>
+                    </select>
+                </div>
+                <div className="flex items-center bg-gray-100 rounded-lg p-1">
+                    <select className="bg-transparent text-xs p-1.5 rounded outline-none text-gray-600" value={filterStatus} onChange={e=>setFilterStatus(e.target.value)}>
+                        <option value="ALL">全部状态</option>
+                        <option value="PENDING">未核销</option>
+                        <option value="REDEEMED">已核销</option>
+                    </select>
+                </div>
+                <div className="relative">
+                    <input className="pl-8 pr-3 py-1.5 text-xs border rounded-lg bg-gray-50 focus:bg-white transition-colors outline-none w-32" placeholder="搜索..." value={searchText} onChange={e=>setSearchText(e.target.value)}/>
+                    <Search className="absolute left-2.5 top-2 text-gray-400" size={12}/>
+                </div>
+
+                {!isStudent && (
+                    <button onClick={() => setIsGrantModalOpen(true)} className="flex items-center px-4 py-2 bg-amber-100 text-amber-700 rounded-lg font-bold hover:bg-amber-200 text-sm ml-auto md:ml-0">
+                        <Gift size={16} className="mr-2"/> 发放奖励
+                    </button>
+                )}
+            </div>
         </div>
 
         <div className="flex-1 overflow-auto p-0">
@@ -94,7 +166,7 @@ export const GameRewards: React.FC = () => {
                 <thead className="bg-gray-50 text-gray-500 text-xs uppercase sticky top-0 z-10 shadow-sm">
                     <tr>
                         {!isStudent && <th className="p-4 font-semibold">学生姓名</th>}
-                        <th className="p-4 font-semibold">奖品名称</th>
+                        <th className="p-4 font-semibold">奖品内容</th>
                         <th className="p-4 font-semibold">类型</th>
                         <th className="p-4 font-semibold">来源</th>
                         <th className="p-4 font-semibold">获得时间</th>
@@ -103,38 +175,66 @@ export const GameRewards: React.FC = () => {
                     </tr>
                 </thead>
                 <tbody className="divide-y divide-gray-100 text-sm">
-                    {(isStudent ? myRewards : allRewards).map(r => (
-                    <tr key={r._id} className="hover:bg-blue-50/30 transition-colors">
-                        {!isStudent && <td className="p-4 font-bold text-gray-700">{r.studentName}</td>}
-                        <td className="p-4 font-medium text-gray-900">{r.name}</td>
-                        <td className="p-4">
-                            <span className={`text-xs px-2 py-1 rounded border ${r.rewardType === 'DRAW_COUNT' ? 'bg-purple-50 text-purple-700 border-purple-100' : 'bg-blue-50 text-blue-700 border-blue-100'}`}>
-                                {r.rewardType==='DRAW_COUNT' ? '抽奖券' : '实物'}
-                            </span>
-                        </td>
-                        <td className="p-4 text-gray-500">{r.source}</td>
-                        <td className="p-4 text-gray-500">{new Date(r.createTime).toLocaleDateString()} {new Date(r.createTime).toLocaleTimeString([], {hour:'2-digit', minute:'2-digit'})}</td>
-                        <td className="p-4">
-                            {r.rewardType === 'DRAW_COUNT' ? (
-                                <span className="text-xs bg-purple-100 text-purple-700 px-2 py-1 rounded font-medium">系统已发放</span>
-                            ) : (
-                                r.status === 'REDEEMED' 
-                                ? <span className="text-xs bg-gray-100 text-gray-500 px-2 py-1 rounded border border-gray-200">已兑换</span>
-                                : <span className="text-xs bg-green-100 text-green-700 px-2 py-1 rounded border border-green-200 animate-pulse">未兑换</span>
-                            )}
-                        </td>
-                        {!isStudent && (
-                            <td className="p-4 text-right">
-                                {r.status !== 'REDEEMED' && r.rewardType !== 'DRAW_COUNT' && (
-                                <button onClick={() => handleRedeem(r._id!)} className="text-xs bg-green-600 text-white px-3 py-1.5 rounded hover:bg-green-700 shadow-sm transition-colors">
-                                    核销
-                                </button>
+                    {displayRewards.map(r => {
+                        const isEditing = editingId === r._id;
+                        return (
+                        <tr key={r._id} className="hover:bg-blue-50/30 transition-colors">
+                            {!isStudent && <td className="p-4 font-bold text-gray-700">{r.studentName}</td>}
+                            <td className="p-4 font-medium text-gray-900">
+                                {isEditing ? (
+                                    <div className="flex gap-1 items-center">
+                                        <input className="border rounded px-1 py-0.5 text-xs w-24" value={editForm.name} onChange={e=>setEditForm({...editForm, name:e.target.value})} placeholder="名称"/>
+                                        <span className="text-xs text-gray-400">x</span>
+                                        <input type="number" min={1} className="border rounded px-1 py-0.5 text-xs w-12" value={editForm.count} onChange={e=>setEditForm({...editForm, count:Number(e.target.value)})}/>
+                                    </div>
+                                ) : (
+                                    <span>{r.name} <span className="text-gray-400 text-xs ml-1">x{r.count || 1}</span></span>
                                 )}
                             </td>
-                        )}
-                    </tr>
-                    ))}
-                    {(isStudent ? myRewards : allRewards).length === 0 && (
+                            <td className="p-4">
+                                <span className={`text-xs px-2 py-1 rounded border ${
+                                    r.rewardType === 'DRAW_COUNT' ? 'bg-purple-50 text-purple-700 border-purple-100' : 
+                                    r.rewardType === 'CONSOLATION' ? 'bg-gray-50 text-gray-500 border-gray-100' :
+                                    'bg-blue-50 text-blue-700 border-blue-100'
+                                }`}>
+                                    {r.rewardType==='DRAW_COUNT' ? '抽奖券' : r.rewardType==='CONSOLATION' ? '安慰奖' : '实物'}
+                                </span>
+                            </td>
+                            <td className="p-4 text-gray-500 text-xs">{r.source}</td>
+                            <td className="p-4 text-gray-500 text-xs">{new Date(r.createTime).toLocaleDateString()}</td>
+                            <td className="p-4">
+                                {r.rewardType === 'DRAW_COUNT' || r.rewardType === 'CONSOLATION' ? (
+                                    <span className="text-xs bg-gray-100 text-gray-500 px-2 py-1 rounded">无需核销</span>
+                                ) : (
+                                    r.status === 'REDEEMED' 
+                                    ? <span className="text-xs bg-green-100 text-green-700 px-2 py-1 rounded border border-green-200">已兑换</span>
+                                    : <span className="text-xs bg-amber-100 text-amber-700 px-2 py-1 rounded border border-amber-200 animate-pulse">待核销</span>
+                                )}
+                            </td>
+                            {!isStudent && (
+                                <td className="p-4 text-right flex justify-end gap-2">
+                                    {isEditing ? (
+                                        <>
+                                            <button onClick={()=>handleUpdate(r._id!)} className="text-green-600 hover:bg-green-50 p-1 rounded"><Save size={16}/></button>
+                                            <button onClick={()=>setEditingId(null)} className="text-gray-400 hover:bg-gray-50 p-1 rounded"><X size={16}/></button>
+                                        </>
+                                    ) : (
+                                        <>
+                                            {r.status !== 'REDEEMED' && r.rewardType === 'ITEM' && (
+                                                <button onClick={() => handleRedeem(r._id!)} className="text-xs bg-green-600 text-white px-3 py-1 rounded hover:bg-green-700 shadow-sm transition-colors mr-2">
+                                                    核销
+                                                </button>
+                                            )}
+                                            <button onClick={()=>startEdit(r)} className="text-blue-400 hover:text-blue-600 p-1" title="编辑"><Edit size={16}/></button>
+                                            <button onClick={()=>handleDelete(r)} className="text-gray-400 hover:text-red-500 p-1" title="撤回"><Trash2 size={16}/></button>
+                                        </>
+                                    )}
+                                </td>
+                            )}
+                        </tr>
+                        );
+                    })}
+                    {displayRewards.length === 0 && (
                     <tr><td colSpan={7} className="text-center py-10 text-gray-400">暂无记录</td></tr>
                     )}
                 </tbody>
@@ -145,22 +245,38 @@ export const GameRewards: React.FC = () => {
         {isGrantModalOpen && (
             <div className="fixed inset-0 bg-black/50 z-[100] flex items-center justify-center p-4">
             <div className="bg-white rounded-xl p-6 w-full max-w-sm animate-in fade-in zoom-in-95 shadow-2xl">
-                <h3 className="font-bold text-lg mb-4 text-gray-800">手动发放抽奖券</h3>
+                <h3 className="font-bold text-lg mb-4 text-gray-800">发放奖励</h3>
                 <div className="space-y-4">
                     <div>
-                        <label className="block text-sm font-medium text-gray-700 mb-1">选择学生</label>
-                        <select className="w-full border border-gray-300 p-2 rounded-lg bg-gray-50 focus:bg-white transition-colors outline-none focus:ring-2 focus:ring-blue-500" value={grantForm.studentId} onChange={e=>setGrantForm({...grantForm, studentId: e.target.value})}>
+                        <label className="block text-xs font-bold text-gray-500 uppercase mb-1">选择学生</label>
+                        <select className="w-full border border-gray-300 p-2 rounded-lg bg-gray-50 focus:bg-white text-sm" value={grantForm.studentId} onChange={e=>setGrantForm({...grantForm, studentId: e.target.value})}>
                         <option value="">-- 请选择 --</option>
                         {students.map(s => <option key={s._id} value={s._id || String(s.id)}>{s.name} ({s.studentNo})</option>)}
                         </select>
                     </div>
                     <div>
-                        <label className="block text-sm font-medium text-gray-700 mb-1">数量</label>
-                        <input type="number" min={1} className="w-full border border-gray-300 p-2 rounded-lg outline-none focus:ring-2 focus:ring-blue-500" value={grantForm.count} onChange={e=>setGrantForm({...grantForm, count: Number(e.target.value)})}/>
+                        <label className="block text-xs font-bold text-gray-500 uppercase mb-1">奖励类型</label>
+                        <div className="flex gap-2">
+                            <button onClick={()=>setGrantForm({...grantForm, rewardType: 'DRAW_COUNT'})} className={`flex-1 py-2 text-sm rounded border ${grantForm.rewardType==='DRAW_COUNT' ? 'bg-purple-50 border-purple-500 text-purple-700 font-bold' : 'border-gray-200 text-gray-600'}`}>抽奖券</button>
+                            <button onClick={()=>setGrantForm({...grantForm, rewardType: 'ITEM'})} className={`flex-1 py-2 text-sm rounded border ${grantForm.rewardType==='ITEM' ? 'bg-blue-50 border-blue-500 text-blue-700 font-bold' : 'border-gray-200 text-gray-600'}`}>实物奖品</button>
+                        </div>
                     </div>
+                    
+                    {grantForm.rewardType === 'ITEM' && (
+                        <div>
+                            <label className="block text-xs font-bold text-gray-500 uppercase mb-1">奖品名称</label>
+                            <input className="w-full border border-gray-300 p-2 rounded-lg text-sm" placeholder="如: 笔记本、铅笔" value={grantForm.name} onChange={e=>setGrantForm({...grantForm, name: e.target.value})}/>
+                        </div>
+                    )}
+
+                    <div>
+                        <label className="block text-xs font-bold text-gray-500 uppercase mb-1">发放数量</label>
+                        <input type="number" min={1} className="w-full border border-gray-300 p-2 rounded-lg outline-none" value={grantForm.count} onChange={e=>setGrantForm({...grantForm, count: Number(e.target.value)})}/>
+                    </div>
+
                     <div className="flex gap-2 pt-2">
                         <button onClick={() => setIsGrantModalOpen(false)} className="flex-1 bg-gray-100 text-gray-700 py-2 rounded-lg hover:bg-gray-200 transition-colors">取消</button>
-                        <button onClick={handleGrantDraw} className="flex-1 bg-amber-500 text-white py-2 rounded-lg font-bold hover:bg-amber-600 shadow-md transition-colors">确认发放</button>
+                        <button onClick={handleGrant} className="flex-1 bg-amber-500 text-white py-2 rounded-lg font-bold hover:bg-amber-600 shadow-md transition-colors">确认发放</button>
                     </div>
                 </div>
             </div>

server.js

@@ -80,7 +80,7 @@ const NotificationModel = mongoose.model('Notification', NotificationSchema);
 // Game Schemas
 const GameSessionSchema = new mongoose.Schema({ schoolId: String, className: String, isEnabled: Boolean, maxSteps: Number, teams: [{ id: String, name: String, score: Number, avatar: String, color: String, members: [String] }], rewardsConfig: [{ scoreThreshold: Number, rewardType: String, rewardName: String, rewardValue: Number }] });
 const GameSessionModel = mongoose.model('GameSession', GameSessionSchema);
-const StudentRewardSchema = new mongoose.Schema({ schoolId: String, studentId: String, studentName: String, rewardType: String, name: String, status: String, source: String, createTime: { type: Date, default: Date.now } });
+const StudentRewardSchema = new mongoose.Schema({ schoolId: String, studentId: String, studentName: String, rewardType: String, name: String, count: { type: Number, default: 1 }, status: String, source: String, createTime: { type: Date, default: Date.now } });
 const StudentRewardModel = mongoose.model('StudentReward', StudentRewardSchema);
 const LuckyDrawConfigSchema = new mongoose.Schema({ schoolId: String, prizes: [{ id: String, name: String, probability: Number, count: Number, icon: String }], dailyLimit: Number, cardCount: Number, defaultPrize: String });
 const LuckyDrawConfigModel = mongoose.model('LuckyDrawConfig', LuckyDrawConfigSchema);
@@ -145,6 +145,7 @@ app.post('/api/games/lucky-draw', async (req, res) => {
 
       // 4. Weighted Random Logic
       let selectedPrize = defaultPrize;
+      let rewardType = 'CONSOLATION'; // Default to consolation
       const random = Math.random() * 100;
       let currentWeight = 0;
       let matchedPrize = null;
@@ -159,10 +160,9 @@ app.post('/api/games/lucky-draw', async (req, res) => {
 
       if (matchedPrize) {
          selectedPrize = matchedPrize.name;
+         rewardType = 'ITEM'; // It's a real prize
          // Only decrease count if it's not infinite (undefined)
          if (matchedPrize.count !== undefined && matchedPrize.count > 0) {
-            // Need to update the specific array element. 
-            // If config has no ID, we might have trouble updating. Assuming config has _id.
             if (config._id) {
                 await LuckyDrawConfigModel.updateOne(
                     { _id: config._id, "prizes.id": matchedPrize.id },
@@ -176,12 +176,14 @@ app.post('/api/games/lucky-draw', async (req, res) => {
       await Student.findByIdAndUpdate(studentId, { $inc: { drawAttempts: -1 } });
 
       // 6. Record Reward
+      // Note: Consolation prizes are recorded but handled differently in UI
       await StudentRewardModel.create({
          schoolId,
          studentId,
          studentName: student.name,
-         rewardType: 'ITEM',
+         rewardType,
          name: selectedPrize,
+         count: 1,
          status: 'PENDING',
          source: '幸运大抽奖'
       });
@@ -275,7 +277,25 @@ app.post('/api/schedules', async (req, res) => {
 });
 app.delete('/api/schedules', async (req, res) => { await ScheduleModel.deleteOne({...getQueryFilter(req), ...req.query}); res.json({}); });
 
-app.get('/api/stats', async (req, res) => { res.json({studentCount: await Student.countDocuments(getQueryFilter(req))}); });
+// REAL STATS API (No more mock)
+app.get('/api/stats', async (req, res) => { 
+    const filter = getQueryFilter(req);
+    const studentCount = await Student.countDocuments(filter);
+    const courseCount = await Course.countDocuments(filter);
+    
+    const scores = await Score.find({...filter, status: 'Normal'});
+    let avgScore = 0;
+    let excellentRate = '0%';
+    
+    if (scores.length > 0) {
+        const total = scores.reduce((sum, s) => sum + s.score, 0);
+        avgScore = parseFloat((total / scores.length).toFixed(1));
+        const excellent = scores.filter(s => s.score >= 90).length;
+        excellentRate = Math.round((excellent / scores.length) * 100) + '%';
+    }
+
+    res.json({ studentCount, courseCount, avgScore, excellentRate });
+});
 
 app.get('/api/config', async (req, res) => { res.json(await ConfigModel.findOne({key:'main'})); });
 app.post('/api/config', async (req, res) => { await ConfigModel.findOneAndUpdate({key:'main'}, req.body, {upsert:true}); res.json({}); });
@@ -290,21 +310,55 @@ app.post('/api/games/mountain', async (req, res) => {
     res.json({}); 
 });
 
-app.post('/api/games/grant-draw', async (req, res) => { 
-    const { studentId, count } = req.body;
-    await Student.findByIdAndUpdate(studentId, { $inc: { drawAttempts: count } });
+// Grant Reward (Flexible)
+app.post('/api/games/grant-reward', async (req, res) => { 
+    const { studentId, count, rewardType, name } = req.body;
+    const finalCount = count || 1;
+    const finalName = name || (rewardType === 'DRAW_COUNT' ? '抽奖券' : '奖品');
+    
+    if (rewardType === 'DRAW_COUNT') {
+        await Student.findByIdAndUpdate(studentId, { $inc: { drawAttempts: finalCount } });
+    }
+    
     await StudentRewardModel.create({ 
         schoolId: req.headers['x-school-id'], 
         studentId, 
         studentName: (await Student.findById(studentId)).name, 
-        rewardType: 'DRAW_COUNT', 
-        name: '抽奖券', 
-        status: 'REDEEMED', 
+        rewardType, 
+        name: finalName,
+        count: finalCount,
+        status: rewardType === 'DRAW_COUNT' ? 'REDEEMED' : 'PENDING', 
         source: '教师发放' 
     });
     res.json({}); 
 });
 
+// Update Reward
+app.put('/api/rewards/:id', async (req, res) => {
+    await StudentRewardModel.findByIdAndUpdate(req.params.id, req.body);
+    res.json({});
+});
+
+// Delete Reward (Smart Revoke)
+app.delete('/api/rewards/:id', async (req, res) => {
+    const reward = await StudentRewardModel.findById(req.params.id);
+    if (!reward) return res.status(404).json({error: 'Not found'});
+    
+    // If we revoke draw counts, ensure student has enough
+    if (reward.rewardType === 'DRAW_COUNT') {
+        const student = await Student.findById(reward.studentId);
+        if (!student) return res.status(404).json({error: 'Student missing'});
+        
+        if (student.drawAttempts < reward.count) {
+            return res.status(400).json({ error: 'FAILED_REVOKE', message: '修改失败，次数已被使用' });
+        }
+        await Student.findByIdAndUpdate(reward.studentId, { $inc: { drawAttempts: -reward.count } });
+    }
+    
+    await StudentRewardModel.findByIdAndDelete(req.params.id);
+    res.json({});
+});
+
 app.get('/api/rewards', async (req, res) => { 
     const filter = getQueryFilter(req);
     if(req.query.studentId) filter.studentId = req.query.studentId;
@@ -312,9 +366,12 @@ app.get('/api/rewards', async (req, res) => {
 });
 app.post('/api/rewards', async (req, res) => { 
     const data = injectSchoolId(req, req.body);
+    // Ensure count default
+    if (!data.count) data.count = 1;
+    
     if(data.rewardType==='DRAW_COUNT') { 
         data.status='REDEEMED'; 
-        await Student.findByIdAndUpdate(data.studentId, {$inc:{drawAttempts:1}}); 
+        await Student.findByIdAndUpdate(data.studentId, {$inc:{drawAttempts:data.count}}); 
     }
     await StudentRewardModel.create(data); 
     res.json({}); 

services/api.ts

@@ -170,15 +170,15 @@ export const api = {
     getLuckyConfig: () => request('/games/lucky-config'),
     saveLuckyConfig: (data: LuckyDrawConfig) => request('/games/lucky-config', { method: 'POST', body: JSON.stringify(data) }),
     drawLucky: (studentId: string) => request('/games/lucky-draw', { method: 'POST', body: JSON.stringify({ studentId }) }),
-    grantDrawCount: (studentId: string, count: number) => request('/games/grant-draw', { method: 'POST', body: JSON.stringify({ studentId, count }) }),
+    grantReward: (data: { studentId: string, count: number, rewardType: string, name?: string }) => request('/games/grant-reward', { method: 'POST', body: JSON.stringify(data) }),
   },
   rewards: {
     getMyRewards: (studentId: string) => request(`/rewards?studentId=${studentId}`),
-    // For teachers to get class rewards, we can use the same endpoint but passing a filter in backend or allow listing all
     getClassRewards: () => request('/rewards?scope=class'), 
     addReward: (data: Partial<StudentReward>) => request('/rewards', { method: 'POST', body: JSON.stringify(data) }),
+    update: (id: string, data: Partial<StudentReward>) => request(`/rewards/${id}`, { method: 'PUT', body: JSON.stringify(data) }),
+    delete: (id: string) => request(`/rewards/${id}`, { method: 'DELETE' }),
     redeem: (id: string) => request(`/rewards/${id}/redeem`, { method: 'POST' }),
-    consumeDraw: (studentId: string) => request(`/rewards/consume-draw`, { method: 'POST', body: JSON.stringify({ studentId }) })
   },
 
   batchDelete: (type: 'student' | 'score' | 'user', ids: string[]) => {

types.ts

@@ -194,8 +194,9 @@ export interface StudentReward {
   schoolId?: string;
   studentId: string; // Link to Student
   studentName: string;
-  rewardType: 'ITEM' | 'DRAW_COUNT';
+  rewardType: 'ITEM' | 'DRAW_COUNT' | 'CONSOLATION'; // Updated
   name: string;
+  count?: number; // Quantity
   status: 'PENDING' | 'REDEEMED';
   source: string; // "Mountain Game"
   createTime: string;