Upload 45 files

models.js

@@ -1,6 +1,8 @@
 
 const mongoose = require('mongoose');
 
+// ... (Previous Models: School, User, Student, Course, Score, ClassModel, SubjectModel, ExamModel, ScheduleModel, ConfigModel, NotificationModel, GameSessionModel, StudentRewardModel, LuckyDrawConfigModel, GameMonsterConfigModel, GameZenConfigModel)
+
 const SchoolSchema = new mongoose.Schema({ name: String, code: String });
 const School = mongoose.model('School', SchoolSchema);
 
@@ -57,14 +59,13 @@ const CourseSchema = new mongoose.Schema({
     schoolId: String, 
     courseCode: String, 
     courseName: String, 
-    className: String, // New: Target Class
+    className: String, 
     teacherName: String, 
-    teacherId: String, // New: Link to User
+    teacherId: String, 
     credits: Number, 
     capacity: Number, 
     enrolled: Number 
 });
-// Ensure one teacher per subject per class
 CourseSchema.index({ schoolId: 1, className: 1, courseName: 1 }, { unique: true });
 const Course = mongoose.model('Course', CourseSchema);
 
@@ -75,8 +76,8 @@ const ClassSchema = new mongoose.Schema({
     schoolId: String, 
     grade: String, 
     className: String, 
-    teacherName: String, // Display string
-    homeroomTeacherIds: [String] // Logic IDs
+    teacherName: String, 
+    homeroomTeacherIds: [String] 
 });
 const ClassModel = mongoose.model('Class', ClassSchema);
 
@@ -106,19 +107,15 @@ const ConfigModel = mongoose.model('Config', ConfigSchema);
 const NotificationSchema = new mongoose.Schema({ schoolId: String, targetRole: String, targetUserId: String, title: String, content: String, type: String, createTime: { type: Date, default: Date.now } });
 const NotificationModel = mongoose.model('Notification', NotificationSchema);
 
-// Game Session (Mountain) - Shared by Class, Controlled by Homeroom Teachers
 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, achievementId: String }] });
 const GameSessionModel = mongoose.model('GameSession', GameSessionSchema);
 
-// Student Reward - Owned by Teacher (or System)
 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 }, ownerId: String });
 const StudentRewardModel = mongoose.model('StudentReward', StudentRewardSchema);
 
-// Lucky Draw - Isolated by Teacher
 const LuckyDrawConfigSchema = new mongoose.Schema({ schoolId: String, className: String, ownerId: String, prizes: [{ id: String, name: String, probability: Number, count: Number, icon: String }], dailyLimit: Number, cardCount: Number, defaultPrize: String, consolationWeight: { type: Number, default: 0 } });
 const LuckyDrawConfigModel = mongoose.model('LuckyDrawConfig', LuckyDrawConfigSchema);
 
-// Monster - Isolated by Teacher
 const GameMonsterConfigSchema = new mongoose.Schema({ 
     schoolId: String, 
     className: String, 
@@ -136,7 +133,6 @@ const GameMonsterConfigSchema = new mongoose.Schema({
 });
 const GameMonsterConfigModel = mongoose.model('GameMonsterConfig', GameMonsterConfigSchema);
 
-// Zen - Isolated by Teacher
 const GameZenConfigSchema = new mongoose.Schema({ 
     schoolId: String, 
     className: String, 
@@ -153,9 +149,33 @@ const GameZenConfigSchema = new mongoose.Schema({
 });
 const GameZenConfigModel = mongoose.model('GameZenConfig', GameZenConfigSchema);
 
-const AchievementConfigSchema = new mongoose.Schema({ schoolId: String, className: String, achievements: [{ id: String, name: String, icon: String, points: Number, description: String }], exchangeRules: [{ id: String, cost: Number, rewardType: String, rewardName: String, rewardValue: Number }] });
+// Updated Achievement Schema with addedBy
+const AchievementConfigSchema = new mongoose.Schema({ 
+    schoolId: String, 
+    className: String, 
+    achievements: [{ 
+        id: String, 
+        name: String, 
+        icon: String, 
+        points: Number, 
+        description: String,
+        addedBy: String,
+        addedByName: String
+    }], 
+    // Legacy support, rules now moving to TeacherExchangeConfig
+    exchangeRules: [{ id: String, cost: Number, rewardType: String, rewardName: String, rewardValue: Number }] 
+});
 const AchievementConfigModel = mongoose.model('AchievementConfig', AchievementConfigSchema);
 
+// NEW: Independent Teacher Exchange Rules
+const TeacherExchangeConfigSchema = new mongoose.Schema({
+    schoolId: String,
+    teacherId: String,
+    teacherName: String,
+    rules: [{ id: String, cost: Number, rewardType: String, rewardName: String, rewardValue: Number }]
+});
+const TeacherExchangeConfigModel = mongoose.model('TeacherExchangeConfig', TeacherExchangeConfigSchema);
+
 const StudentAchievementSchema = new mongoose.Schema({ schoolId: String, studentId: String, studentName: String, achievementId: String, achievementName: String, achievementIcon: String, semester: String, createTime: { type: Date, default: Date.now } });
 const StudentAchievementModel = mongoose.model('StudentAchievement', StudentAchievementSchema);
 
@@ -171,5 +191,5 @@ const SchoolCalendarModel = mongoose.model('SchoolCalendar', SchoolCalendarSchem
 module.exports = {
     School, User, Student, Course, Score, ClassModel, SubjectModel, ExamModel, ScheduleModel,
     ConfigModel, NotificationModel, GameSessionModel, StudentRewardModel, LuckyDrawConfigModel, GameMonsterConfigModel, GameZenConfigModel,
-    AchievementConfigModel, StudentAchievementModel, AttendanceModel, LeaveRequestModel, SchoolCalendarModel
+    AchievementConfigModel, TeacherExchangeConfigModel, StudentAchievementModel, AttendanceModel, LeaveRequestModel, SchoolCalendarModel
 };

pages/AchievementStudent.tsx

@@ -1,7 +1,7 @@
 
 import React, { useState, useEffect } from 'react';
 import { api } from '../services/api';
-import { AchievementConfig, AchievementItem, Student, StudentAchievement, SystemConfig } from '../types';
+import { AchievementConfig, AchievementItem, Student, StudentAchievement, SystemConfig, TeacherExchangeConfig } from '../types';
 import { Award, ShoppingBag, Loader2, Calendar, Lock } from 'lucide-react';
 import { Emoji } from '../components/Emoji';
 
@@ -9,6 +9,7 @@ export const AchievementStudent: React.FC = () => {
     const [loading, setLoading] = useState(true);
     const [student, setStudent] = useState<Student | null>(null);
     const [config, setConfig] = useState<AchievementConfig | null>(null);
+    const [teacherRules, setTeacherRules] = useState<TeacherExchangeConfig[]>([]);
     const [myAchievements, setMyAchievements] = useState<StudentAchievement[]>([]);
     
     // UI State
@@ -47,16 +48,24 @@ export const AchievementStudent: React.FC = () => {
                 // Fetch Records
                 const records = await api.achievements.getStudentAchievements(me._id || String(me.id), selectedSemester);
                 setMyAchievements(records);
+
+                // Fetch Teacher Rules
+                const teachers = await api.users.getTeachersForClass(me.className);
+                const teacherIds = teachers.map((t: any) => t._id);
+                if (teacherIds.length > 0) {
+                    const rules = await api.achievements.getRulesByTeachers(teacherIds);
+                    setTeacherRules(rules);
+                }
             }
         } catch (e) { console.error(e); } 
         finally { setLoading(false); }
     };
 
-    const handleExchange = async (ruleId: string) => {
+    const handleExchange = async (ruleId: string, teacherId: string) => {
         if (!student) return;
         if (!confirm('确认消耗小红花进行兑换吗？')) return;
         try {
-            await api.achievements.exchange({ studentId: student._id || String(student.id), ruleId });
+            await api.achievements.exchange({ studentId: student._id || String(student.id), ruleId, teacherId });
             alert('兑换成功！请到“奖励管理”查看。');
             loadData(); // Refresh balance
         } catch (e: any) { alert(e.message || '兑换失败'); }
@@ -75,12 +84,9 @@ export const AchievementStudent: React.FC = () => {
         const displayList = [...config.achievements];
         
         // 2. Find "Orphaned" achievements (Earned in past, but not in current config)
-        // These happen if the teacher deleted an achievement or after a class promotion/semester change
         const configIds = new Set(config.achievements.map(a => a.id));
         
-        // We only care about unique orphaned types
         const uniqueOrphans = new Map<string, StudentAchievement>();
-        
         myAchievements.forEach(record => {
             if (!configIds.has(record.achievementId)) {
                 if (!uniqueOrphans.has(record.achievementId)) {
@@ -89,13 +95,12 @@ export const AchievementStudent: React.FC = () => {
             }
         });
 
-        // Convert Orphans to Display Items
         uniqueOrphans.forEach((record) => {
             displayList.push({
                 id: record.achievementId,
                 name: record.achievementName,
                 icon: record.achievementIcon,
-                points: 0, // Points already awarded, just display
+                points: 0,
                 description: '历史荣誉'
             });
         });
@@ -188,32 +193,44 @@ export const AchievementStudent: React.FC = () => {
 
                 {/* 2. Shop */}
                 {activeTab === 'shop' && (
-                    <div className="max-w-4xl mx-auto grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
-                        {config.exchangeRules.map(rule => {
-                            const canAfford = (student.flowerBalance || 0) >= rule.cost;
-                            return (
-                                <div key={rule.id} className="bg-white rounded-xl border border-gray-200 shadow-sm p-5 flex flex-col items-center text-center hover:shadow-md transition-shadow relative overflow-hidden">
-                                    <div className="w-16 h-16 bg-gradient-to-br from-green-100 to-emerald-100 rounded-full flex items-center justify-center mb-3 text-3xl shadow-inner">
-                                        <Emoji symbol={rule.rewardType === 'DRAW_COUNT' ? '🎲' : '🎁'} size={32} />
-                                    </div>
-                                    <h3 className="font-bold text-gray-800 text-lg mb-1">{rule.rewardName}</h3>
-                                    <p className="text-sm text-gray-500 mb-4">包含数量: x{rule.rewardValue}</p>
-                                    
-                                    <button 
-                                        onClick={() => handleExchange(rule.id)}
-                                        disabled={!canAfford}
-                                        className={`mt-auto w-full py-2.5 rounded-lg font-bold flex items-center justify-center gap-2 transition-all ${canAfford ? 'bg-amber-500 text-white hover:bg-amber-600 shadow-md hover:shadow-lg active:scale-95' : 'bg-gray-100 text-gray-400 cursor-not-allowed'}`}
-                                    >
-                                        <ShoppingBag size={16}/>
-                                        {rule.cost} <Emoji symbol="🌺" size={14} /> 兑换
-                                    </button>
-                                </div>
-                            );
-                        })}
-                        {config.exchangeRules.length === 0 && (
-                            <div className="col-span-full text-center py-20 text-gray-400">
-                                老师暂时没有设置兑换商品哦~
+                    <div className="space-y-8">
+                        {teacherRules.length === 0 ? (
+                            <div className="text-center py-20 text-gray-400">
+                                老师们暂时没有设置兑换商品哦~
                             </div>
+                        ) : (
+                            teacherRules.map(teacherConfig => (
+                                teacherConfig.rules.length > 0 && (
+                                    <div key={teacherConfig.teacherId} className="bg-white rounded-xl border border-gray-200 p-6 shadow-sm">
+                                        <h3 className="font-bold text-lg text-gray-800 mb-4 border-b pb-2 flex items-center">
+                                            🛍️ {teacherConfig.teacherName} 的兑换店
+                                        </h3>
+                                        <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
+                                            {teacherConfig.rules.map(rule => {
+                                                const canAfford = (student.flowerBalance || 0) >= rule.cost;
+                                                return (
+                                                    <div key={rule.id} className="bg-gray-50 rounded-xl border border-gray-100 p-4 flex flex-col items-center text-center hover:shadow-md transition-shadow relative overflow-hidden">
+                                                        <div className="w-14 h-14 bg-gradient-to-br from-green-100 to-emerald-100 rounded-full flex items-center justify-center mb-3 text-2xl shadow-inner">
+                                                            <Emoji symbol={rule.rewardType === 'DRAW_COUNT' ? '🎲' : '🎁'} size={28} />
+                                                        </div>
+                                                        <h3 className="font-bold text-gray-800 mb-1">{rule.rewardName}</h3>
+                                                        <p className="text-xs text-gray-500 mb-3">包含数量: x{rule.rewardValue}</p>
+                                                        
+                                                        <button 
+                                                            onClick={() => handleExchange(rule.id, teacherConfig.teacherId)}
+                                                            disabled={!canAfford}
+                                                            className={`mt-auto w-full py-2 rounded-lg font-bold flex items-center justify-center gap-2 text-sm transition-all ${canAfford ? 'bg-amber-500 text-white hover:bg-amber-600 shadow-sm active:scale-95' : 'bg-gray-200 text-gray-400 cursor-not-allowed'}`}
+                                                        >
+                                                            <ShoppingBag size={14}/>
+                                                            {rule.cost} <Emoji symbol="🌺" size={12} /> 兑换
+                                                        </button>
+                                                    </div>
+                                                );
+                                            })}
+                                        </div>
+                                    </div>
+                                )
+                            ))
                         )}
                     </div>
                 )}

pages/AchievementTeacher.tsx

@@ -1,8 +1,8 @@
 
 import React, { useState, useEffect } from 'react';
 import { api } from '../services/api';
-import { AchievementConfig, AchievementItem, ExchangeRule, Student, SystemConfig } from '../types';
-import { Plus, Trash2, Edit, Save, Gift, Award, Coins, Users, Search, Loader2, CheckCircle } from 'lucide-react';
+import { AchievementConfig, AchievementItem, ExchangeRule, Student, TeacherExchangeConfig } from '../types';
+import { Plus, Trash2, Edit, Save, Gift, Award, Coins, Users, Search, Loader2, CheckCircle, Filter } from 'lucide-react';
 import { Emoji } from '../components/Emoji';
 
 const PRESET_ICONS = [
@@ -16,6 +16,7 @@ const PRESET_ICONS = [
 export const AchievementTeacher: React.FC<{className?: string}> = ({ className }) => {
     const [loading, setLoading] = useState(true);
     const [config, setConfig] = useState<AchievementConfig | null>(null);
+    const [myExchangeConfig, setMyExchangeConfig] = useState<TeacherExchangeConfig | null>(null);
     const [students, setStudents] = useState<Student[]>([]);
     const [semester, setSemester] = useState('');
     
@@ -26,26 +27,33 @@ export const AchievementTeacher: React.FC<{className?: string}> = ({ className }
     const [newAchieve, setNewAchieve] = useState<AchievementItem>({ id: '', name: '', icon: '🏆', points: 1 });
     const [newRule, setNewRule] = useState<ExchangeRule>({ id: '', cost: 10, rewardType: 'DRAW_COUNT', rewardName: '抽奖券x1', rewardValue: 1 });
     
+    // Filters
+    const [filterCreator, setFilterCreator] = useState('ALL'); // For Manage
+    const [filterGrantCreator, setFilterGrantCreator] = useState('ALL'); // For Grant
+    
     // Grant State
     const [selectedStudents, setSelectedStudents] = useState<Set<string>>(new Set());
     const [selectedAchieveId, setSelectedAchieveId] = useState('');
 
     const currentUser = api.auth.getCurrentUser();
-    // Use prop or fallback
     const homeroomClass = className || currentUser?.homeroomClass;
+    
+    // Permissions
+    const isHomeroom = currentUser?.homeroomClass === homeroomClass; // Is this the HT?
+    const isPrincipal = currentUser?.role === 'PRINCIPAL';
+    const canManageAll = isHomeroom || isPrincipal; // HT has full control
 
     useEffect(() => {
         loadData();
-    }, [homeroomClass]); // Reload when homeroomClass changes
+    }, [homeroomClass]); 
 
     const loadData = async () => {
         if (!homeroomClass) return;
         setLoading(true);
         
-        // 1. Load Students (Independent)
         try {
+            // 1. Students
             const stus = await api.students.getAll();
-            // Filter students for homeroom & Sort by SeatNo > Name
             const sortedStudents = stus
                 .filter((s: Student) => s.className.trim() === homeroomClass.trim())
                 .sort((a: Student, b: Student) => {
@@ -55,75 +63,83 @@ export const AchievementTeacher: React.FC<{className?: string}> = ({ className }
                     return a.name.localeCompare(b.name, 'zh-CN');
                 });
             setStudents(sortedStudents);
-        } catch (e) {
-            console.error("Failed to load students", e);
-        }
-
-        // 2. Load Config & System (Independent)
-        try {
-            // Use allSettled or catch individual promises to avoid blocking
-            const cfgPromise = api.achievements.getConfig(homeroomClass).catch(() => null);
-            const sysPromise = api.config.getPublic().catch(() => ({ semester: '当前学期' }));
 
-            const [cfg, sysCfg] = await Promise.all([cfgPromise, sysPromise]);
+            // 2. Shared Config (Achievements) & System
+            const [cfg, sysCfg, myRules] = await Promise.all([
+                api.achievements.getConfig(homeroomClass).catch(() => null),
+                api.config.getPublic().catch(() => ({ semester: '当前学期' })),
+                api.achievements.getMyRules().catch(() => ({ rules: [] })) // Fetch Teacher's OWN rules
+            ]);
             
-            // Critical: Always ensure a config object exists, even if API returns null/error
             const defaultConfig: AchievementConfig = { 
                 schoolId: currentUser?.schoolId || '', 
                 className: homeroomClass, 
                 achievements: [], 
-                exchangeRules: [] 
+                exchangeRules: [] // Legacy, ignored for display now
             };
             
-            // If cfg is null or empty, use default
             setConfig(cfg || defaultConfig);
+            setMyExchangeConfig(myRules); // Set independent teacher rules
             
             // @ts-ignore
             setSemester(sysCfg?.semester || '当前学期');
 
         } catch (e) { 
-            console.error("Failed to load config", e); 
-            // Fallback just in case
-            setConfig({ 
-                schoolId: currentUser?.schoolId || '', 
-                className: homeroomClass, 
-                achievements: [], 
-                exchangeRules: [] 
-            });
-        } 
-        finally { setLoading(false); }
+            console.error("Failed to load data", e); 
+        } finally { setLoading(false); }
     };
 
+    // --- Shared Achievement Config ---
     const handleSaveConfig = async (newConfig: AchievementConfig) => {
-        // Optimistic update
         setConfig(newConfig);
         try {
             await api.achievements.saveConfig(newConfig);
         } catch (e) { 
-            alert('保存失败，请检查网络'); 
-            loadData(); // Revert on fail
+            alert('保存失败'); loadData(); 
         }
     };
 
-    // --- Tab 1: Manage Achievements ---
+    // --- Independent Teacher Rules ---
+    const handleSaveMyRules = async (newRules: ExchangeRule[]) => {
+        const payload = {
+            ...myExchangeConfig,
+            rules: newRules
+        } as TeacherExchangeConfig;
+        
+        setMyExchangeConfig(payload); // Optimistic
+        try {
+            await api.achievements.saveMyRules(payload);
+        } catch(e) { alert('保存失败'); loadData(); }
+    };
+
+    // --- Manage Achievements ---
     const addAchievement = () => {
         if (!config) return;
         if (!newAchieve.name) return alert('请输入成就名称');
         
-        const newItem = { ...newAchieve, id: Date.now().toString() };
+        const newItem: AchievementItem = { 
+            ...newAchieve, 
+            id: Date.now().toString(),
+            addedBy: currentUser?._id,
+            addedByName: currentUser?.trueName || currentUser?.username
+        };
         const updated = { ...config, achievements: [...config.achievements, newItem] };
         
         handleSaveConfig(updated);
         setNewAchieve({ id: '', name: '', icon: '🏆', points: 1 });
     };
 
-    const deleteAchievement = (id: string) => {
-        if (!config || !confirm('确认删除？')) return;
-        const updated = { ...config, achievements: config.achievements.filter(a => a.id !== id) };
+    const deleteAchievement = (item: AchievementItem) => {
+        if (!config) return;
+        // Permission Check: HT/Principal can delete all. Teacher can only delete own.
+        if (!canManageAll && item.addedBy !== currentUser?._id) return alert('权限不足：只能删除自己添加的成就');
+        
+        if (!confirm('确认删除？')) return;
+        const updated = { ...config, achievements: config.achievements.filter(a => a.id !== item.id) };
         handleSaveConfig(updated);
     };
 
-    // --- Tab 2: Grant ---
+    // --- Grant ---
     const handleGrant = async () => {
         if (selectedStudents.size === 0 || !selectedAchieveId) return alert('请选择学生和奖状');
         try {
@@ -133,43 +149,45 @@ export const AchievementTeacher: React.FC<{className?: string}> = ({ className }
             await Promise.all(promises);
             alert(`成功发放给 ${selectedStudents.size} 位学生`);
             setSelectedStudents(new Set());
-            loadData(); // Refresh flower balances
+            loadData(); // Refresh
         } catch (e) { alert('部分发放失败'); }
     };
 
-    // --- Tab 3: Exchange Rules ---
+    // --- Independent Rules ---
     const addRule = () => {
-        if (!config) return;
         if (!newRule.rewardName) return alert('请输入奖励名称');
-        
         const newItem = { ...newRule, id: Date.now().toString() };
-        const updated = { ...config, exchangeRules: [...config.exchangeRules, newItem] };
-        
-        handleSaveConfig(updated);
+        const currentRules = myExchangeConfig?.rules || [];
+        handleSaveMyRules([...currentRules, newItem]);
         setNewRule({ id: '', cost: 10, rewardType: 'DRAW_COUNT', rewardName: '抽奖券x1', rewardValue: 1 });
     };
     
     const deleteRule = (id: string) => {
-        if (!config || !confirm('确认删除？')) return;
-        const updated = { ...config, exchangeRules: config.exchangeRules.filter(r => r.id !== id) };
-        handleSaveConfig(updated);
+        if (!confirm('确认删除？')) return;
+        const currentRules = myExchangeConfig?.rules || [];
+        handleSaveMyRules(currentRules.filter(r => r.id !== id));
     };
     
-    // Proxy Exchange (Teacher helps student exchange)
+    // Proxy Exchange (Using current teacher's rules)
     const handleProxyExchange = async (studentId: string, ruleId: string) => {
         if (!confirm('确认代学生兑换？将扣除对应小红花并记录。')) return;
         try {
-            await api.achievements.exchange({ studentId, ruleId });
+            await api.achievements.exchange({ studentId, ruleId, teacherId: currentUser?._id });
             alert('兑换成功');
-            loadData(); // Refresh balance
+            loadData(); 
         } catch (e: any) { alert(e.message || '兑换失败，余额不足？'); }
     };
 
     if (!homeroomClass) return <div className="p-10 text-center text-gray-500">您不是班主任，无法使用成就管理功能。</div>;
     if (loading) return <div className="flex justify-center p-10"><Loader2 className="animate-spin text-blue-600"/></div>;
 
-    // Safety fallback render if config is somehow still null (shouldn't happen with new logic)
     const safeConfig = config || { achievements: [], exchangeRules: [] };
+    const myRules = myExchangeConfig?.rules || [];
+
+    // Filter Logic
+    const uniqueCreators = Array.from(new Set(safeConfig.achievements.map(a => a.addedByName || '未知'))).filter(Boolean);
+    const filteredAchievements = safeConfig.achievements.filter(a => filterCreator === 'ALL' || a.addedByName === filterCreator);
+    const filteredGrantAchievements = safeConfig.achievements.filter(a => filterGrantCreator === 'ALL' || a.addedByName === filterGrantCreator);
 
     return (
         <div className="h-full flex flex-col bg-white rounded-xl shadow-sm border border-gray-100 overflow-hidden">
@@ -182,7 +200,7 @@ export const AchievementTeacher: React.FC<{className?: string}> = ({ className }
                     <Gift size={18}/> 发放成就
                 </button>
                 <button onClick={() => setActiveTab('exchange')} className={`px-6 py-4 text-sm font-bold border-b-2 transition-colors flex items-center gap-2 whitespace-nowrap ${activeTab === 'exchange' ? 'border-blue-500 text-blue-600 bg-white' : 'border-transparent text-gray-500 hover:text-gray-700'}`}>
-                    <Coins size={18}/> 兑换规则
+                    <Coins size={18}/> 兑换规则 (我的)
                 </button>
                 <button onClick={() => setActiveTab('balance')} className={`px-6 py-4 text-sm font-bold border-b-2 transition-colors flex items-center gap-2 whitespace-nowrap ${activeTab === 'balance' ? 'border-blue-500 text-blue-600 bg-white' : 'border-transparent text-gray-500 hover:text-gray-700'}`}>
                     <Users size={18}/> 学生积分
@@ -193,6 +211,15 @@ export const AchievementTeacher: React.FC<{className?: string}> = ({ className }
                 {/* 1. Manage Achievements */}
                 {activeTab === 'manage' && (
                     <div className="space-y-6 max-w-4xl mx-auto">
+                        {/* Creator Filter */}
+                        <div className="flex justify-end items-center gap-2">
+                            <span className="text-xs font-bold text-gray-500"><Filter size={14} className="inline mr-1"/>筛选添加者:</span>
+                            <select className="border rounded text-xs p-1" value={filterCreator} onChange={e=>setFilterCreator(e.target.value)}>
+                                <option value="ALL">全部老师</option>
+                                {uniqueCreators.map(c => <option key={c} value={c}>{c}</option>)}
+                            </select>
+                        </div>
+
                         <div className="bg-blue-50 p-4 rounded-xl border border-blue-100 flex flex-col md:flex-row gap-4 items-end">
                             <div className="flex-1 w-full">
                                 <label className="text-xs font-bold text-gray-500 uppercase mb-1 block">成就名称</label>
@@ -211,22 +238,30 @@ export const AchievementTeacher: React.FC<{className?: string}> = ({ className }
                             <button onClick={addAchievement} className="bg-blue-600 text-white px-4 py-2 rounded-lg font-bold hover:bg-blue-700 whitespace-nowrap text-sm">添加成就</button>
                         </div>
 
-                        {safeConfig.achievements.length === 0 ? (
+                        {filteredAchievements.length === 0 ? (
                             <div className="text-center text-gray-400 py-10">暂无成就，请添加</div>
                         ) : (
                             <div className="grid grid-cols-2 md:grid-cols-4 gap-4">
-                                {safeConfig.achievements.map(ach => (
+                                {filteredAchievements.map(ach => {
+                                    const isMine = ach.addedBy === currentUser?._id;
+                                    const canDelete = canManageAll || isMine;
+                                    return (
                                     <div key={ach.id} className="border border-gray-200 rounded-xl p-4 flex flex-col items-center relative group hover:shadow-md transition-all bg-white">
                                         <div className="text-4xl mb-2"><Emoji symbol={ach.icon} /></div>
                                         <div className="font-bold text-gray-800 text-center">{ach.name}</div>
                                         <div className="text-xs text-amber-600 font-bold bg-amber-50 px-2 py-0.5 rounded-full mt-1 border border-amber-100">
                                             {ach.points} <Emoji symbol="🌺" size={14}/>
                                         </div>
-                                        <button onClick={() => deleteAchievement(ach.id)} className="absolute top-2 right-2 text-gray-300 hover:text-red-500 opacity-0 group-hover:opacity-100 transition-opacity">
-                                            <Trash2 size={16}/>
-                                        </button>
+                                        <div className="mt-2 text-[10px] text-gray-400 bg-gray-50 px-1.5 py-0.5 rounded">
+                                            {ach.addedByName || '未知'}
+                                        </div>
+                                        {canDelete && (
+                                            <button onClick={() => deleteAchievement(ach)} className="absolute top-2 right-2 text-gray-300 hover:text-red-500 opacity-0 group-hover:opacity-100 transition-opacity">
+                                                <Trash2 size={16}/>
+                                            </button>
+                                        )}
                                     </div>
-                                ))}
+                                )})}
                             </div>
                         )}
                     </div>
@@ -267,12 +302,22 @@ export const AchievementTeacher: React.FC<{className?: string}> = ({ className }
 
                         {/* Achievement Selector */}
                         <div className="flex-1 flex flex-col">
-                            <h3 className="font-bold text-gray-700 mb-4">2. 选择要颁发的奖状</h3>
-                            {safeConfig.achievements.length === 0 ? (
+                            <div className="flex justify-between items-center mb-4">
+                                <h3 className="font-bold text-gray-700">2. 选择要颁发的奖状</h3>
+                                <div className="flex items-center gap-2">
+                                    <span className="text-xs text-gray-500">来自:</span>
+                                    <select className="border rounded text-xs p-1" value={filterGrantCreator} onChange={e=>setFilterGrantCreator(e.target.value)}>
+                                        <option value="ALL">全部老师</option>
+                                        {uniqueCreators.map(c => <option key={c} value={c}>{c}</option>)}
+                                    </select>
+                                </div>
+                            </div>
+                            
+                            {filteredGrantAchievements.length === 0 ? (
                                 <div className="text-gray-400 text-sm mb-6">暂无成就，请先去“成就库管理”添加。</div>
                             ) : (
                                 <div className="grid grid-cols-2 sm:grid-cols-3 gap-3 mb-6 max-h-[400px] overflow-y-auto custom-scrollbar p-1">
-                                    {safeConfig.achievements.map(ach => (
+                                    {filteredGrantAchievements.map(ach => (
                                         <div 
                                             key={ach.id} 
                                             onClick={() => setSelectedAchieveId(ach.id)}
@@ -299,9 +344,13 @@ export const AchievementTeacher: React.FC<{className?: string}> = ({ className }
                     </div>
                 )}
 
-                {/* 3. Exchange Rules */}
+                {/* 3. Independent Teacher Exchange Rules */}
                 {activeTab === 'exchange' && (
                     <div className="space-y-6 max-w-4xl mx-auto">
+                        <div className="bg-purple-50 p-4 rounded-lg border border-purple-100 text-sm text-purple-800 mb-4">
+                            <span className="font-bold">提示：</span> 这里的兑换规则是您个人专属的，对您教的所有班级学生可见。学生兑换后，只有您能看到待处理的申请。
+                        </div>
+
                         <div className="bg-green-50 p-4 rounded-xl border border-green-100 flex flex-col md:flex-row gap-4 items-end">
                             <div className="w-full md:w-32">
                                 <label className="text-xs font-bold text-gray-500 uppercase mb-1 block">消耗小红花</label>
@@ -326,9 +375,9 @@ export const AchievementTeacher: React.FC<{className?: string}> = ({ className }
                         </div>
 
                         <div className="space-y-3">
-                            {safeConfig.exchangeRules.length === 0 ? (
-                                <div className="text-center text-gray-400 py-4">暂无兑换规则</div>
-                            ) : safeConfig.exchangeRules.map(rule => (
+                            {myRules.length === 0 ? (
+                                <div className="text-center text-gray-400 py-4">暂无个人兑换规则</div>
+                            ) : myRules.map(rule => (
                                 <div key={rule.id} className="flex items-center justify-between p-4 bg-white border border-gray-200 rounded-xl hover:shadow-sm">
                                     <div className="flex items-center gap-4">
                                         <div className="bg-amber-100 text-amber-700 font-bold px-3 py-1 rounded-lg border border-amber-200">
@@ -350,7 +399,7 @@ export const AchievementTeacher: React.FC<{className?: string}> = ({ className }
                     </div>
                 )}
 
-                {/* 4. Balance List (with Proxy Exchange) */}
+                {/* 4. Balance List (Only showing MY Rules for Proxy) */}
                 {activeTab === 'balance' && (
                     <div className="overflow-x-auto">
                         <table className="w-full text-left border-collapse">
@@ -358,7 +407,7 @@ export const AchievementTeacher: React.FC<{className?: string}> = ({ className }
                                 <tr>
                                     <th className="p-4">学生姓名</th>
                                     <th className="p-4">小红花余额</th>
-                                    <th className="p-4 text-right">操作 (代兑换)</th>
+                                    <th className="p-4 text-right">操作 (使用我的规则兑换)</th>
                                 </tr>
                             </thead>
                             <tbody className="divide-y divide-gray-100">
@@ -374,7 +423,7 @@ export const AchievementTeacher: React.FC<{className?: string}> = ({ className }
                                         </td>
                                         <td className="p-4 text-right">
                                             <div className="flex justify-end gap-2">
-                                                {safeConfig.exchangeRules.length > 0 ? safeConfig.exchangeRules.map(r => (
+                                                {myRules.length > 0 ? myRules.map(r => (
                                                     <button 
                                                         key={r.id}
                                                         disabled={(s.flowerBalance || 0) < r.cost}
@@ -384,7 +433,7 @@ export const AchievementTeacher: React.FC<{className?: string}> = ({ className }
                                                     >
                                                         兑换 {r.rewardName} (-{r.cost})
                                                     </button>
-                                                )) : <span className="text-gray-300 text-xs">无兑换规则</span>}
+                                                )) : <span className="text-gray-300 text-xs">您没有设置规则</span>}
                                             </div>
                                         </td>
                                     </tr>

pages/GameLucky.tsx

@@ -2,14 +2,13 @@
 import React, { useState, useEffect, useRef, useMemo } from 'react';
 import { createPortal } from 'react-dom';
 import { api } from '../services/api';
-import { LuckyDrawConfig, Student, LuckyPrize } from '../types';
+import { LuckyDrawConfig, Student, LuckyPrize, User } from '../types';
 import { Gift, Settings, Loader2, Save, Trash2, X, UserCircle, RefreshCcw, HelpCircle, Maximize, Minimize, Disc, LayoutGrid, ArrowDown } from 'lucide-react';
 import { Emoji } from '../components/Emoji';
 
-// ... (Keep FlipCard component unchanged) ...
+// ... (Keep FlipCard and LuckyWheel Components Unchanged - omitted for brevity as they are same as before) ...
 const FlipCard = ({ index, prize, onFlip, isRevealed, activeIndex }: { index: number, prize: string, onFlip: (idx: number) => void, isRevealed: boolean, activeIndex: number | null }) => {
   const showBack = isRevealed && activeIndex === index;
-  
   return (
     <div className="relative w-full aspect-[3/4] cursor-pointer perspective-1000 group" onClick={() => !isRevealed && onFlip(index)}>
       <div className={`relative w-full h-full text-center transition-transform duration-700 transform-style-3d shadow-md rounded-xl ${showBack ? 'rotate-y-180' : 'hover:scale-[1.02] active:scale-95'}`}>
@@ -28,118 +27,32 @@ const FlipCard = ({ index, prize, onFlip, isRevealed, activeIndex }: { index: nu
   );
 };
 
-// ... (Keep LuckyWheel component unchanged) ...
 const WHEEL_COLORS = ['#ef4444', '#f97316', '#eab308', '#84cc16', '#22c55e', '#3b82f6', '#8b5cf6', '#ec4899'];
-
-const LuckyWheel = ({ config, isSpinning, result, onSpin }: { 
-    config: LuckyDrawConfig, 
-    isSpinning: boolean, 
-    result: {prize: string} | null,
-    onSpin: () => void 
-}) => {
+const LuckyWheel = ({ config, isSpinning, result, onSpin }: { config: LuckyDrawConfig, isSpinning: boolean, result: {prize: string} | null, onSpin: () => void }) => {
     const [rotation, setRotation] = useState(0);
     const segments = useMemo(() => {
-        const list = config.prizes.map((p, i) => ({
-            name: p.name,
-            weight: p.probability,
-            color: WHEEL_COLORS[i % WHEEL_COLORS.length],
-            isConsolation: false
-        }));
-        if ((config.consolationWeight || 0) > 0 || list.length === 0) {
-            list.push({
-                name: config.defaultPrize || '再接再厉',
-                weight: config.consolationWeight || 10, 
-                color: '#94a3b8', 
-                isConsolation: true
-            });
-        }
+        const list = config.prizes.map((p, i) => ({ name: p.name, weight: p.probability, color: WHEEL_COLORS[i % WHEEL_COLORS.length], isConsolation: false }));
+        if ((config.consolationWeight || 0) > 0 || list.length === 0) { list.push({ name: config.defaultPrize || '再接再厉', weight: config.consolationWeight || 10, color: '#94a3b8', isConsolation: true }); }
         return list;
     }, [config]);
-
     const totalWeight = segments.reduce((acc, s) => acc + s.weight, 0);
     let currentAngle = 0;
-    const slices = segments.map(seg => {
-        const angle = (seg.weight / totalWeight) * 360;
-        const start = currentAngle;
-        currentAngle += angle;
-        const center = start + (angle / 2);
-        return { ...seg, startAngle: start, endAngle: currentAngle, angle, centerAngle: center };
-    });
-
-    useEffect(() => {
-        if (result && isSpinning) {
-            const targetSlice = slices.find(s => s.name === result.prize) || slices[slices.length - 1];
-            const minSpins = 5; 
-            const spinAngle = minSpins * 360;
-            const targetLandingAngle = 360 - targetSlice.centerAngle;
-            const currentMod = rotation % 360;
-            let distance = targetLandingAngle - currentMod;
-            if (distance < 0) distance += 360;
-            const jitter = (Math.random() - 0.5) * (targetSlice.angle * 0.8);
-            const finalRotation = rotation + spinAngle + distance + jitter;
-            setRotation(finalRotation);
-        }
-    }, [result, isSpinning]);
-
-    const getCoordinatesForPercent = (percent: number) => {
-        const x = Math.cos(2 * Math.PI * percent);
-        const y = Math.sin(2 * Math.PI * percent);
-        return [x, y];
-    };
-
+    const slices = segments.map(seg => { const angle = (seg.weight / totalWeight) * 360; const start = currentAngle; currentAngle += angle; const center = start + (angle / 2); return { ...seg, startAngle: start, endAngle: currentAngle, angle, centerAngle: center }; });
+    useEffect(() => { if (result && isSpinning) { const targetSlice = slices.find(s => s.name === result.prize) || slices[slices.length - 1]; const minSpins = 5; const spinAngle = minSpins * 360; const targetLandingAngle = 360 - targetSlice.centerAngle; const currentMod = rotation % 360; let distance = targetLandingAngle - currentMod; if (distance < 0) distance += 360; const jitter = (Math.random() - 0.5) * (targetSlice.angle * 0.8); const finalRotation = rotation + spinAngle + distance + jitter; setRotation(finalRotation); } }, [result, isSpinning]);
+    const getCoordinatesForPercent = (percent: number) => { const x = Math.cos(2 * Math.PI * percent); const y = Math.sin(2 * Math.PI * percent); return [x, y]; };
     return (
         <div className="flex flex-col items-center justify-center h-full w-full max-w-3xl mx-auto p-4">
             <div className="relative w-full aspect-square max-w-[500px] md:max-w-[600px]">
-                <div 
-                    className="w-full h-full rounded-full border-8 border-yellow-400 shadow-2xl overflow-hidden relative bg-white"
-                    style={{ transform: `rotate(${rotation}deg)`, transition: isSpinning ? 'transform 4s cubic-bezier(0.15, 0.85, 0.35, 1)' : 'none' }}
-                >
+                <div className="w-full h-full rounded-full border-8 border-yellow-400 shadow-2xl overflow-hidden relative bg-white" style={{ transform: `rotate(${rotation}deg)`, transition: isSpinning ? 'transform 4s cubic-bezier(0.15, 0.85, 0.35, 1)' : 'none' }}>
                     <svg viewBox="-1 -1 2 2" style={{ transform: 'rotate(-90deg)' }} className="w-full h-full">
                         {slices.map((slice, i) => {
-                            const start = slice.startAngle / 360;
-                            const end = slice.endAngle / 360;
-                            const [startX, startY] = getCoordinatesForPercent(end); 
-                            const [endX, endY] = getCoordinatesForPercent(start);
-                            const largeArcFlag = slice.angle > 180 ? 1 : 0;
-                            const pathData = `M 0 0 L ${startX} ${startY} A 1 1 0 ${largeArcFlag} 0 ${endX} ${endY} Z`;
-                            const isVertical = slice.angle < 45 || slice.name.length > 4;
-                            const midAngle = (slice.startAngle + slice.endAngle) / 2;
-                            const displayText = slice.name.length > 8 ? slice.name.substring(0,7)+'..' : slice.name;
-
-                            return (
-                                <g key={i}>
-                                    <path d={pathData} fill={slice.color} stroke="white" strokeWidth="0.01" />
-                                    <g transform={`rotate(${midAngle})`}>
-                                        {isVertical ? (
-                                            displayText.split('').map((char, idx) => {
-                                                const spacing = 0.09;
-                                                const totalHeight = displayText.length * spacing;
-                                                const startR = 0.65 - (totalHeight / 2) + (spacing/2);
-                                                const r = startR + idx * spacing;
-                                                return <text key={idx} x={r} y={0} fill="white" fontSize={0.08} fontWeight="bold" textAnchor="middle" dominantBaseline="middle" transform={`rotate(90, ${r}, 0)`}>{char}</text>;
-                                            })
-                                        ) : (
-                                            <text x={0.65} y={0} fill="white" fontSize="0.09" fontWeight="bold" textAnchor="middle" dominantBaseline="middle" transform="rotate(90, 0.65, 0)">{displayText}</text>
-                                        )}
-                                    </g>
-                                </g>
-                            );
+                            const start = slice.startAngle / 360; const end = slice.endAngle / 360; const [startX, startY] = getCoordinatesForPercent(end); const [endX, endY] = getCoordinatesForPercent(start); const largeArcFlag = slice.angle > 180 ? 1 : 0; const pathData = `M 0 0 L ${startX} ${startY} A 1 1 0 ${largeArcFlag} 0 ${endX} ${endY} Z`; const isVertical = slice.angle < 45 || slice.name.length > 4; const midAngle = (slice.startAngle + slice.endAngle) / 2; const displayText = slice.name.length > 8 ? slice.name.substring(0,7)+'..' : slice.name;
+                            return ( <g key={i}> <path d={pathData} fill={slice.color} stroke="white" strokeWidth="0.01" /> <g transform={`rotate(${midAngle})`}> {isVertical ? ( displayText.split('').map((char, idx) => { const spacing = 0.09; const totalHeight = displayText.length * spacing; const startR = 0.65 - (totalHeight / 2) + (spacing/2); const r = startR + idx * spacing; return <text key={idx} x={r} y={0} fill="white" fontSize={0.08} fontWeight="bold" textAnchor="middle" dominantBaseline="middle" transform={`rotate(90, ${r}, 0)`}>{char}</text>; }) ) : ( <text x={0.65} y={0} fill="white" fontSize="0.09" fontWeight="bold" textAnchor="middle" dominantBaseline="middle" transform="rotate(90, 0.65, 0)">{displayText}</text> )} </g> </g> );
                         })}
                     </svg>
                 </div>
-                <div className="absolute inset-0 pointer-events-none z-20 flex justify-center">
-                    <div className="relative w-10 md:w-14 h-[50%]">
-                        <svg viewBox="0 0 40 300" preserveAspectRatio="none" className="w-full h-full drop-shadow-xl" style={{ filter: 'drop-shadow(0px 4px 4px rgba(0,0,0,0.4))' }}>
-                            <defs><linearGradient id="pointerGrad" x1="0%" y1="0%" x2="100%" y2="0%"><stop offset="0%" stopColor="#dc2626" /><stop offset="50%" stopColor="#ef4444" /><stop offset="100%" stopColor="#b91c1c" /></linearGradient></defs>
-                            <path d="M 20 0 L 40 300 L 0 300 Z" fill="url(#pointerGrad)" stroke="white" strokeWidth="2" />
-                        </svg>
-                    </div>
-                </div>
-                <div className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 z-30 pointer-events-auto">
-                    <button onClick={onSpin} disabled={isSpinning} className="w-20 h-20 md:w-24 md:h-24 bg-gradient-to-b from-yellow-300 to-yellow-500 rounded-full border-4 border-white shadow-[0_4px_15px_rgba(0,0,0,0.4)] flex items-center justify-center font-black text-red-600 text-xl md:text-2xl hover:scale-105 active:scale-95 disabled:grayscale transition-all active:shadow-inner">
-                        {isSpinning ? '...' : '抽奖'}
-                    </button>
-                </div>
+                <div className="absolute inset-0 pointer-events-none z-20 flex justify-center"> <div className="relative w-10 md:w-14 h-[50%]"> <svg viewBox="0 0 40 300" preserveAspectRatio="none" className="w-full h-full drop-shadow-xl" style={{ filter: 'drop-shadow(0px 4px 4px rgba(0,0,0,0.4))' }}> <defs><linearGradient id="pointerGrad" x1="0%" y1="0%" x2="100%" y2="0%"><stop offset="0%" stopColor="#dc2626" /><stop offset="50%" stopColor="#ef4444" /><stop offset="100%" stopColor="#b91c1c" /></linearGradient></defs> <path d="M 20 0 L 40 300 L 0 300 Z" fill="url(#pointerGrad)" stroke="white" strokeWidth="2" /> </svg> </div> </div>
+                <div className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 z-30 pointer-events-auto"> <button onClick={onSpin} disabled={isSpinning} className="w-20 h-20 md:w-24 md:h-24 bg-gradient-to-b from-yellow-300 to-yellow-500 rounded-full border-4 border-white shadow-[0_4px_15px_rgba(0,0,0,0.4)] flex items-center justify-center font-black text-red-600 text-xl md:text-2xl hover:scale-105 active:scale-95 disabled:grayscale transition-all active:shadow-inner"> {isSpinning ? '...' : '抽奖'} </button> </div>
             </div>
         </div>
     );
@@ -152,6 +65,11 @@ export const GameLucky: React.FC<{className?: string}> = ({ className }) => {
   
   const [students, setStudents] = useState<Student[]>([]);
   const [proxyStudentId, setProxyStudentId] = useState<string>('');
+  
+  // New: Student selects which teacher's pool to draw from
+  const [availableTeachers, setAvailableTeachers] = useState<User[]>([]);
+  const [selectedTeacherId, setSelectedTeacherId] = useState<string>('');
+
   const [isSettingsOpen, setIsSettingsOpen] = useState(false);
   const [isFullscreen, setIsFullscreen] = useState(false);
 
@@ -166,33 +84,34 @@ export const GameLucky: React.FC<{className?: string}> = ({ className }) => {
   const isTeacher = currentUser?.role === 'TEACHER';
   const isStudent = currentUser?.role === 'STUDENT';
   
-  // Use prop className or fallback to homeroom (legacy)
   const targetClass = className || currentUser?.homeroomClass || (isStudent ? 'MY_CLASS' : '');
 
   useEffect(() => {
     loadData();
-  }, [proxyStudentId, targetClass]); 
+  }, [proxyStudentId, targetClass, selectedTeacherId]); 
 
   const loadData = async () => {
-    // Resolve "MY_CLASS" for students
+    setLoading(true);
     let resolvedClass = targetClass;
-    if (targetClass === 'MY_CLASS' && isStudent) {
-        // Assume student dashboard or context provides it, here we assume currentUser.className is avail locally or fetch
-        // In real app, `currentUser` in localstorage might be stale, but usually `className` doesn't change often.
-        // We'll rely on API to fetch fresh student data below anyway.
-    }
-
-    if(!resolvedClass) return;
-    if(!luckyConfig) setLoading(true); 
 
     try {
       const allStus = await api.students.getAll();
-      
+      let me: Student | undefined;
+
       if (isStudent && targetClass === 'MY_CLASS') {
-          const me = allStus.find((s: Student) => s.name === (currentUser.trueName || currentUser.username));
+          me = allStus.find((s: Student) => s.name === (currentUser.trueName || currentUser.username));
           if(me) resolvedClass = me.className;
       }
 
+      // If Student, fetch available teachers for their class
+      if (isStudent && resolvedClass && availableTeachers.length === 0) {
+          const teachers = await api.users.getTeachersForClass(resolvedClass);
+          setAvailableTeachers(teachers);
+          if (teachers.length > 0 && !selectedTeacherId) {
+              setSelectedTeacherId(teachers[0]._id);
+          }
+      }
+
       if (isTeacher) {
          const filtered = allStus.filter((s: Student) => s.className === resolvedClass);
          // Sort by Seat No
@@ -211,14 +130,22 @@ export const GameLucky: React.FC<{className?: string}> = ({ className }) => {
             setStudentInfo(null);
          }
       } else if (isStudent) {
-         const me = allStus.find((s: Student) => s.name === (currentUser.trueName || currentUser.username));
+         me = allStus.find((s: Student) => s.name === (currentUser.trueName || currentUser.username));
          setStudentInfo(me || null);
       }
       
+      // Load Config based on Teacher (Owner)
       if (resolvedClass) {
-          const config = await api.games.getLuckyConfig(resolvedClass);
-          if(!config.className) config.className = resolvedClass;
-          setLuckyConfig(config);
+          // If Student, use selectedTeacherId. If Teacher, use current User ID.
+          const ownerId = isTeacher ? currentUser._id : selectedTeacherId;
+          if (ownerId) {
+              const config = await api.games.getLuckyConfig(resolvedClass, ownerId);
+              if(!config.className) config.className = resolvedClass;
+              setLuckyConfig(config);
+          } else {
+              // No teacher selected yet
+              setLuckyConfig(null);
+          }
       }
 
     } catch (e) { console.error(e); } 
@@ -264,31 +191,36 @@ export const GameLucky: React.FC<{className?: string}> = ({ className }) => {
   };
 
   if (loading) return <div className="h-full flex items-center justify-center"><Loader2 className="animate-spin text-blue-600"/></div>;
-  if (!luckyConfig) return <div className="h-full flex items-center justify-center text-gray-400">配置加载失败</div>;
+  
+  // Show message if no teacher selected for student
+  if (isStudent && availableTeachers.length === 0) return <div className="h-full flex items-center justify-center text-gray-400">暂无关联的老师开启抽奖</div>;
 
-  // ... (Keep the render logic the same, just ensure it uses targetClass for display) ...
   const displayClassName = targetClass === 'MY_CLASS' ? (studentInfo?.className || '') : targetClass;
 
-  const GameContent = (
+  return (
     <div className={`${isFullscreen ? 'fixed inset-0 z-[9999]' : 'h-full relative'} flex flex-col md:flex-row bg-gradient-to-br from-red-50 to-orange-50 overflow-hidden`}>
         <button onClick={() => setIsFullscreen(!isFullscreen)} className="absolute top-4 right-4 z-50 p-2 rounded-full bg-white/50 hover:bg-white backdrop-blur shadow-sm border transition-colors md:top-4 md:left-4 md:right-auto">
             {isFullscreen ? <Minimize size={20} className="text-gray-700"/> : <Maximize size={20} className="text-gray-700"/>}
         </button>
 
         <div className="flex-1 overflow-y-auto p-4 md:p-8 custom-scrollbar order-1 md:order-1 flex flex-col justify-center">
-            {viewMode === 'CARD' ? (
-                <div className={`grid gap-2 md:gap-6 w-full max-w-5xl mx-auto transition-all place-content-center ${
-                    ((luckyConfig.cardCount || 9) <= 4 ? 'grid-cols-2 ' : 'grid-cols-3 ') +
-                    ((luckyConfig.cardCount || 9) <= 4 ? 'md:grid-cols-3' :
-                    (luckyConfig.cardCount || 9) <= 6 ? 'md:grid-cols-3 lg:grid-cols-4' :
-                    'md:grid-cols-4 lg:grid-cols-5')
-                }`}>
-                    {Array.from({ length: luckyConfig.cardCount || 9 }).map((_, i) => (
-                        <FlipCard key={i} index={i} prize={drawResult ? drawResult.prize : '???'} onFlip={executeDraw} isRevealed={activeCardIndex === i && !!drawResult} activeIndex={activeCardIndex} />
-                    ))}
-                </div>
+            {luckyConfig ? (
+                viewMode === 'CARD' ? (
+                    <div className={`grid gap-2 md:gap-6 w-full max-w-5xl mx-auto transition-all place-content-center ${
+                        ((luckyConfig.cardCount || 9) <= 4 ? 'grid-cols-2 ' : 'grid-cols-3 ') +
+                        ((luckyConfig.cardCount || 9) <= 4 ? 'md:grid-cols-3' :
+                        (luckyConfig.cardCount || 9) <= 6 ? 'md:grid-cols-3 lg:grid-cols-4' :
+                        'md:grid-cols-4 lg:grid-cols-5')
+                    }`}>
+                        {Array.from({ length: luckyConfig.cardCount || 9 }).map((_, i) => (
+                            <FlipCard key={i} index={i} prize={drawResult ? drawResult.prize : '???'} onFlip={executeDraw} isRevealed={activeCardIndex === i && !!drawResult} activeIndex={activeCardIndex} />
+                        ))}
+                    </div>
+                ) : (
+                    <LuckyWheel config={luckyConfig} isSpinning={isWheelSpinning} result={drawResult} onSpin={() => executeDraw()} />
+                )
             ) : (
-                <LuckyWheel config={luckyConfig} isSpinning={isWheelSpinning} result={drawResult} onSpin={() => executeDraw()} />
+                <div className="text-center text-gray-400">该老师尚未配置奖池</div>
             )}
         </div>
 
@@ -304,6 +236,21 @@ export const GameLucky: React.FC<{className?: string}> = ({ className }) => {
             </div>
 
             <div className="p-4 md:p-6 flex-1 overflow-y-auto space-y-4 md:space-y-6">
+                
+                {/* Student: Teacher Selector */}
+                {isStudent && (
+                    <div>
+                        <label className="text-xs font-bold text-gray-500 uppercase block mb-1">选择抽奖老师</label>
+                        <select 
+                            className="w-full border border-gray-300 rounded-lg p-2 text-sm font-bold bg-white"
+                            value={selectedTeacherId}
+                            onChange={e => setSelectedTeacherId(e.target.value)}
+                        >
+                            {availableTeachers.map(t => <option key={t._id} value={t._id}>{t.trueName || t.username}的奖池</option>)}
+                        </select>
+                    </div>
+                )}
+
                 <div className="bg-gradient-to-r from-amber-50 to-orange-50 p-4 rounded-xl border border-orange-100 text-center flex md:block justify-between items-center">
                     <div className="text-left md:text-center">
                         <p className="text-xs font-bold text-amber-700 uppercase tracking-wider mb-1 md:mb-2">当前抽奖人</p>
@@ -347,8 +294,8 @@ export const GameLucky: React.FC<{className?: string}> = ({ className }) => {
             </div>
         </div>
 
-        {/* Settings Modal */}
-        {isSettingsOpen && (
+        {/* Settings Modal (Teacher Only) */}
+        {isSettingsOpen && luckyConfig && (
             <div className="fixed inset-0 bg-black/60 z-[1000] flex items-center justify-center p-4 backdrop-blur-sm">
                 <div className="bg-white rounded-2xl w-full max-w-4xl h-[90vh] flex flex-col shadow-2xl animate-in zoom-in-95">
                     <div className="p-6 border-b border-gray-100 flex justify-between items-center">
@@ -357,6 +304,7 @@ export const GameLucky: React.FC<{className?: string}> = ({ className }) => {
                     </div>
                     
                     <div className="flex-1 overflow-y-auto p-6 bg-gray-50/50">
+                        {/* ... Existing Config Form ... */}
                         <div className="grid grid-cols-1 md:grid-cols-4 gap-4 mb-6">
                             <div className="bg-white p-4 rounded-xl border shadow-sm">
                                 <label className="text-xs font-bold text-gray-500 uppercase block mb-2">每日抽奖上限</label>
@@ -433,9 +381,4 @@ export const GameLucky: React.FC<{className?: string}> = ({ className }) => {
         )}
     </div>
   );
-
-  if (isFullscreen) {
-      return createPortal(GameContent, document.body);
-  }
-  return GameContent;
 };

server.js

@@ -1,30 +1,27 @@
 
-// ... imports
+// ... existing imports
+const { 
+    School, User, Student, Course, Score, ClassModel, SubjectModel, ExamModel, ScheduleModel,
+    ConfigModel, NotificationModel, GameSessionModel, StudentRewardModel, LuckyDrawConfigModel, GameMonsterConfigModel, GameZenConfigModel,
+    AchievementConfigModel, TeacherExchangeConfigModel, StudentAchievementModel, AttendanceModel, LeaveRequestModel, SchoolCalendarModel
+} = require('./models');
+
+// ... (existing setup code, middleware, connectDB, helpers) ...
 const express = require('express');
 const mongoose = require('mongoose');
 const cors = require('cors');
 const bodyParser = require('body-parser');
 const path = require('path');
 const compression = require('compression'); 
-const { 
-    School, User, Student, Course, Score, ClassModel, SubjectModel, ExamModel, ScheduleModel,
-    ConfigModel, NotificationModel, GameSessionModel, StudentRewardModel, LuckyDrawConfigModel, GameMonsterConfigModel, GameZenConfigModel,
-    AchievementConfigModel, StudentAchievementModel, AttendanceModel, LeaveRequestModel, SchoolCalendarModel
-} = require('./models');
 
 // ... constants
 const PORT = 7860;
 const MONGO_URI = 'mongodb+srv://dv890a:db8822723@chatpro.gw3v0v7.mongodb.net/chatpro?retryWrites=true&w=majority&appName=chatpro&authSource=admin';
 
 const app = express();
-
-// PERFORMANCE 1: Enable Gzip Compression
 app.use(compression());
-
 app.use(cors());
 app.use(bodyParser.json({ limit: '10mb' })); 
-
-// PERFORMANCE 2: Smart Caching Strategy
 app.use(express.static(path.join(__dirname, 'dist'), {
   setHeaders: (res, filePath) => {
     if (filePath.endsWith('.html')) {
@@ -35,37 +32,26 @@ app.use(express.static(path.join(__dirname, 'dist'), {
   }
 }));
 
-const InMemoryDB = {
-  schools: [],
-  users: [],
-  // ... other mock data if needed, but we rely on Mongo mostly now
-  isFallback: false
-};
-
+const InMemoryDB = { schools: [], users: [], isFallback: false };
 const connectDB = async () => {
   try {
     await mongoose.connect(MONGO_URI, { serverSelectionTimeoutMS: 30000 });
     console.log('✅ MongoDB 连接成功 (Real Data)');
   } catch (err) {
     console.error('❌ MongoDB 连接失败:', err.message);
-    console.warn('⚠️ 启动内存数据库模式 (Limited functionality)');
     InMemoryDB.isFallback = true;
   }
 };
 connectDB();
 
-// ... Helpers ...
 const getQueryFilter = (req) => { 
   const s = req.headers['x-school-id']; 
   const role = req.headers['x-user-role'];
-  
   if (role === 'PRINCIPAL') {
       if (!s) return { _id: null }; 
       return { schoolId: s };
   }
-
   if (!s) return {};
-  
   return { 
     $or: [
       { schoolId: s },
@@ -76,23 +62,19 @@ const getQueryFilter = (req) => {
 };
 const injectSchoolId = (req, b) => ({ ...b, schoolId: req.headers['x-school-id'] });
 
-// Helper to get Owner ID for games (Teacher isolation)
 const getGameOwnerFilter = async (req) => {
     const role = req.headers['x-user-role'];
     const username = req.headers['x-user-username'];
-    
     if (role === 'TEACHER') {
         const user = await User.findOne({ username });
         return { ownerId: user ? user._id.toString() : 'unknown' };
     }
-    // Students or Admins might view differently, but for config saving/loading by teacher:
-    // If Admin/Principal, maybe show global? For now, if no username provided, return empty
     return {};
 };
 
 const getAutoSemester = () => {
     const now = new Date();
-    const month = now.getMonth() + 1; // 1-12
+    const month = now.getMonth() + 1; 
     const year = now.getFullYear();
     if (month >= 8 || month === 1) {
         const startYear = month === 1 ? year - 1 : year;
@@ -109,7 +91,200 @@ const generateStudentNo = async () => {
     return `${year}${random}`;
 };
 
-// ... ROUTES ...
+// ... (Existing Routes: Auth, Users, Students, Classes, etc.) ...
+// Insert helper route for fetching teachers of a class
+app.get('/api/classes/:className/teachers', async (req, res) => {
+    const { className } = req.params;
+    const schoolId = req.headers['x-school-id'];
+    
+    // 1. Get Homeroom Teachers
+    const cls = await ClassModel.findOne({ 
+        $expr: { $eq: [{ $concat: ["$grade", "$className"] }, className] },
+        schoolId
+    });
+    
+    let teacherIds = new Set(cls ? (cls.homeroomTeacherIds || []) : []);
+    
+    // 2. Get Subject Teachers from Courses
+    const courses = await Course.find({ className, schoolId });
+    courses.forEach(c => {
+        if(c.teacherId) teacherIds.add(c.teacherId);
+    });
+    
+    const teachers = await User.find({ _id: { $in: Array.from(teacherIds) } }, 'trueName username _id');
+    res.json(teachers);
+});
+
+// ... (Existing Routes until Games) ...
+
+// GAMES: Lucky Config (Modified to support ownerId query)
+app.get('/api/games/lucky-config', async (req, res) => {
+   const filter = getQueryFilter(req);
+   // If explicit ownerId passed (e.g. from student view), use it.
+   // Otherwise if Teacher, force own ID.
+   if (req.query.ownerId) {
+       filter.ownerId = req.query.ownerId;
+   } else {
+       const ownerFilter = await getGameOwnerFilter(req);
+       Object.assign(filter, ownerFilter);
+   }
+   
+   if (req.query.className) filter.className = req.query.className;
+   
+   const config = await LuckyDrawConfigModel.findOne(filter);
+   res.json(config || { prizes: [], dailyLimit: 3, cardCount: 9, defaultPrize: '再接再厉' });
+});
+// ... (Rest of games routes unchanged except achievement/exchange below) ...
+
+// ACHIEVEMENT ROUTES
+app.get('/api/achievements/config', async (req, res) => {
+    const { className } = req.query;
+    const filter = getQueryFilter(req);
+    if (className) filter.className = className;
+    res.json(await AchievementConfigModel.findOne(filter));
+});
+
+app.post('/api/achievements/config', async (req, res) => {
+    const data = injectSchoolId(req, req.body);
+    await AchievementConfigModel.findOneAndUpdate(
+        { className: data.className, ...getQueryFilter(req) }, 
+        data, 
+        { upsert: true }
+    );
+    res.json({ success: true });
+});
+
+// NEW: Teacher Exchange Rules Routes
+app.get('/api/achievements/teacher-rules', async (req, res) => {
+    const filter = getQueryFilter(req);
+    // If getting for specific teacher (e.g. student viewing shop), allow query param
+    // If no query param and user is teacher, return their own
+    if (req.query.teacherId) {
+        filter.teacherId = req.query.teacherId;
+    } else if (req.headers['x-user-role'] === 'TEACHER') {
+        const user = await User.findOne({ username: req.headers['x-user-username'] });
+        if (user) filter.teacherId = user._id.toString();
+    }
+    
+    // Support getting MULTIPLE teachers (for student shop view)
+    if (req.query.teacherIds) {
+        const ids = req.query.teacherIds.split(',');
+        delete filter.teacherId;
+        filter.teacherId = { $in: ids };
+        const configs = await TeacherExchangeConfigModel.find(filter);
+        return res.json(configs);
+    }
+
+    const config = await TeacherExchangeConfigModel.findOne(filter);
+    res.json(config || { rules: [] });
+});
+
+app.post('/api/achievements/teacher-rules', async (req, res) => {
+    const data = injectSchoolId(req, req.body);
+    const user = await User.findOne({ username: req.headers['x-user-username'] });
+    if (!user) return res.status(404).json({ error: 'User not found' });
+    
+    data.teacherId = user._id.toString();
+    data.teacherName = user.trueName || user.username;
+    
+    await TeacherExchangeConfigModel.findOneAndUpdate(
+        { teacherId: data.teacherId, ...getQueryFilter(req) },
+        data,
+        { upsert: true }
+    );
+    res.json({ success: true });
+});
+
+app.get('/api/achievements/student', async (req, res) => {
+    const { studentId, semester } = req.query;
+    const filter = { studentId };
+    if (semester) filter.semester = semester;
+    res.json(await StudentAchievementModel.find(filter).sort({ createTime: -1 }));
+});
+
+app.post('/api/achievements/grant', async (req, res) => {
+    const { studentId, achievementId, semester } = req.body;
+    const sId = req.headers['x-school-id'];
+    
+    const student = await Student.findById(studentId);
+    if (!student) return res.status(404).json({ error: 'Student not found' });
+    
+    const config = await AchievementConfigModel.findOne({ className: student.className, schoolId: sId });
+    const achievement = config?.achievements.find(a => a.id === achievementId);
+    
+    if (!achievement) return res.status(404).json({ error: 'Achievement not found' });
+    
+    // Add Record
+    await StudentAchievementModel.create({
+        schoolId: sId,
+        studentId,
+        studentName: student.name,
+        achievementId: achievement.id,
+        achievementName: achievement.name,
+        achievementIcon: achievement.icon,
+        semester,
+        createTime: new Date()
+    });
+    
+    // Add Points (Flowers)
+    await Student.findByIdAndUpdate(studentId, { $inc: { flowerBalance: achievement.points } });
+    
+    res.json({ success: true });
+});
+
+app.post('/api/achievements/exchange', async (req, res) => {
+    const { studentId, ruleId, teacherId } = req.body; // Added teacherId to identify which rule set
+    const sId = req.headers['x-school-id'];
+    
+    const student = await Student.findById(studentId);
+    if (!student) return res.status(404).json({ error: 'Student not found' });
+    
+    // Find rule in Teacher Config first
+    let rule = null;
+    let ownerId = null; // To track who receives the redemption request
+
+    if (teacherId) {
+        const tConfig = await TeacherExchangeConfigModel.findOne({ teacherId, schoolId: sId });
+        rule = tConfig?.rules.find(r => r.id === ruleId);
+        ownerId = teacherId;
+    } else {
+        // Fallback for legacy class-based rules (if any remain)
+        const config = await AchievementConfigModel.findOne({ className: student.className, schoolId: sId });
+        rule = config?.exchangeRules?.find(r => r.id === ruleId);
+    }
+    
+    if (!rule) return res.status(404).json({ error: 'Rule not found' });
+    
+    if (student.flowerBalance < rule.cost) {
+        return res.status(400).json({ error: 'INSUFFICIENT_FUNDS', message: '小红花余额不足' });
+    }
+    
+    // Deduct Flowers
+    await Student.findByIdAndUpdate(studentId, { $inc: { flowerBalance: -rule.cost } });
+    
+    // Add Reward Record
+    await StudentRewardModel.create({
+        schoolId: sId,
+        studentId,
+        studentName: student.name,
+        rewardType: rule.rewardType, // ITEM or DRAW_COUNT
+        name: rule.rewardName,
+        count: rule.rewardValue,
+        status: rule.rewardType === 'DRAW_COUNT' ? 'REDEEMED' : 'PENDING',
+        source: '积分兑换',
+        ownerId: ownerId, // Important: Shows up in teacher's reward list
+        createTime: new Date()
+    });
+    
+    // If Draw Count, add attempts immediately
+    if (rule.rewardType === 'DRAW_COUNT') {
+        await Student.findByIdAndUpdate(studentId, { $inc: { drawAttempts: rule.rewardValue } });
+    }
+    
+    res.json({ success: true });
+});
+
+// ... (Rest of existing routes from server.js - copy exact content or use existing file)
 app.get('/api/auth/me', async (req, res) => {
     const username = req.headers['x-user-username'];
     if (!username) return res.status(401).json({ error: 'Unauthorized' });
@@ -117,337 +292,148 @@ app.get('/api/auth/me', async (req, res) => {
     if (!user) return res.status(404).json({ error: 'User not found' });
     res.json(user);
 });
-
 app.post('/api/auth/update-profile', async (req, res) => {
     const { userId, trueName, phone, avatar, currentPassword, newPassword } = req.body;
-    
     try {
         const user = await User.findById(userId);
         if (!user) return res.status(404).json({ error: 'User not found' });
-
-        // If changing password, verify old one
         if (newPassword) {
-            if (user.password !== currentPassword) {
-                return res.status(401).json({ error: 'INVALID_PASSWORD', message: '旧密码错误' });
-            }
+            if (user.password !== currentPassword) return res.status(401).json({ error: 'INVALID_PASSWORD', message: '旧密码错误' });
             user.password = newPassword;
         }
-
         if (trueName) user.trueName = trueName;
         if (phone) user.phone = phone;
         if (avatar) user.avatar = avatar;
-
         await user.save();
-
-        // If user is a student, sync profile data to Student collection
-        if (user.role === 'STUDENT') {
-            await Student.findOneAndUpdate(
-                { studentNo: user.studentNo },
-                { name: user.trueName || user.username, phone: user.phone }
-            );
-        }
-        // If user is a teacher, sync name to Class collection (Legacy single teacher)
-        // For multi-teacher, we don't sync names automatically as it's a list.
-        
+        if (user.role === 'STUDENT') await Student.findOneAndUpdate({ studentNo: user.studentNo }, { name: user.trueName || user.username, phone: user.phone });
         res.json({ success: true, user });
-    } catch (e) {
-        console.error(e);
-        res.status(500).json({ error: e.message });
-    }
+    } catch (e) { res.status(500).json({ error: e.message }); }
 });
-
 app.post('/api/auth/register', async (req, res) => {
     const { role, username, password, schoolId, trueName, seatNo } = req.body;
     const className = req.body.className || req.body.homeroomClass; 
-    
     try {
         if (role === 'STUDENT') {
-            if (!trueName || !className) {
-                return res.status(400).json({ error: 'MISSING_FIELDS', message: '姓名和班级不能为空' });
-            }
-
+            if (!trueName || !className) return res.status(400).json({ error: 'MISSING_FIELDS', message: '姓名和班级不能为空' });
             const cleanName = trueName.trim();
             const cleanClass = className.trim();
-
-            const existingProfile = await Student.findOne({ 
-                schoolId,
-                name: { $regex: new RegExp(`^${cleanName}$`, 'i') },
-                className: cleanClass
-            });
-
+            const existingProfile = await Student.findOne({ schoolId, name: { $regex: new RegExp(`^${cleanName}$`, 'i') }, className: cleanClass });
             let finalUsername = '';
-
             if (existingProfile) {
-                if (existingProfile.studentNo && existingProfile.studentNo.length > 5) {
-                    finalUsername = existingProfile.studentNo;
-                } else {
-                    finalUsername = await generateStudentNo();
-                    existingProfile.studentNo = finalUsername;
-                    await existingProfile.save();
-                }
-
+                if (existingProfile.studentNo && existingProfile.studentNo.length > 5) finalUsername = existingProfile.studentNo;
+                else { finalUsername = await generateStudentNo(); existingProfile.studentNo = finalUsername; await existingProfile.save(); }
                 const userExists = await User.findOne({ username: finalUsername, schoolId });
-                if (userExists) {
-                    if (userExists.status === 'active') {
-                        return res.status(409).json({ error: 'ACCOUNT_EXISTS', message: '该学生账号已存在且激活，请直接登录。' });
-                    }
-                    if (userExists.status === 'pending') {
-                        return res.status(409).json({ error: 'ACCOUNT_PENDING', message: '该学生的注册申请正在审核中，请耐心等待。' });
-                    }
-                }
-            } else {
-                finalUsername = await generateStudentNo();
-            }
-
-            await User.create({
-                username: finalUsername,
-                password,
-                role: 'STUDENT',
-                trueName: cleanName,
-                schoolId,
-                status: 'pending', 
-                homeroomClass: cleanClass, 
-                studentNo: finalUsername, 
-                seatNo: seatNo || '',     
-                parentName: req.body.parentName,
-                parentPhone: req.body.parentPhone,
-                address: req.body.address,
-                idCard: req.body.idCard,
-                gender: req.body.gender || 'Male',
-                createTime: new Date()
-            });
-
+                if (userExists) return res.status(409).json({ error: userExists.status === 'active' ? 'ACCOUNT_EXISTS' : 'ACCOUNT_PENDING', message: '账号已存在' });
+            } else finalUsername = await generateStudentNo();
+            await User.create({ username: finalUsername, password, role: 'STUDENT', trueName: cleanName, schoolId, status: 'pending', homeroomClass: cleanClass, studentNo: finalUsername, seatNo: seatNo || '', parentName: req.body.parentName, parentPhone: req.body.parentPhone, address: req.body.address, idCard: req.body.idCard, gender: req.body.gender || 'Male', createTime: new Date() });
             return res.json({ username: finalUsername });
         } 
-        
         const existing = await User.findOne({ username });
         if (existing) return res.status(409).json({ error: 'USERNAME_EXISTS', message: '用户名已存在' });
-
         await User.create({...req.body, status: 'pending', createTime: new Date()});
         res.json({ username });
-
-    } catch(e) {
-        console.error(e);
-        res.status(500).json({ error: e.message });
-    }
+    } catch(e) { res.status(500).json({ error: e.message }); }
 });
-
 app.get('/api/users', async (req, res) => {
     const filter = getQueryFilter(req);
-    const requesterRole = req.headers['x-user-role'];
-    if (requesterRole === 'PRINCIPAL') filter.role = { $ne: 'ADMIN' };
+    if (req.headers['x-user-role'] === 'PRINCIPAL') filter.role = { $ne: 'ADMIN' };
     if (req.query.role) filter.role = req.query.role;
     res.json(await User.find(filter).sort({ createTime: -1 })); 
 });
-
 app.put('/api/users/:id', async (req, res) => {
     const userId = req.params.id;
     const updates = req.body;
-    const requesterRole = req.headers['x-user-role'];
-
     try {
         const user = await User.findById(userId);
         if (!user) return res.status(404).json({ error: 'User not found' });
-        
-        if (requesterRole === 'PRINCIPAL') {
-            if (user.schoolId !== req.headers['x-school-id']) return res.status(403).json({ error: 'Permission denied' });
-            if (user.role === 'ADMIN' || updates.role === 'ADMIN') return res.status(403).json({ error: 'Cannot modify Admin users' });
-        }
-
-        if (user.status !== 'active' && updates.status === 'active') {
-            // Updated logic: We don't automatically assign teacherName on user activation anymore for multi-homeroom
-            // The class assignment happens in Class management
-            if (user.role === 'STUDENT') {
-                const profileData = {
-                    schoolId: user.schoolId,
-                    studentNo: user.studentNo, 
-                    seatNo: user.seatNo,
-                    name: user.trueName,
-                    className: user.homeroomClass,
-                    gender: user.gender || 'Male',
-                    parentName: user.parentName,
-                    parentPhone: user.parentPhone,
-                    address: user.address,
-                    idCard: user.idCard,
-                    status: 'Enrolled',
-                    birthday: '2015-01-01' 
-                };
-                await Student.findOneAndUpdate(
-                    { studentNo: user.studentNo, schoolId: user.schoolId },
-                    { $set: profileData },
-                    { upsert: true, new: true }
-                );
-            }
+        if (user.status !== 'active' && updates.status === 'active' && user.role === 'STUDENT') {
+            await Student.findOneAndUpdate({ studentNo: user.studentNo, schoolId: user.schoolId }, { $set: { schoolId: user.schoolId, studentNo: user.studentNo, seatNo: user.seatNo, name: user.trueName, className: user.homeroomClass, gender: user.gender || 'Male', parentName: user.parentName, parentPhone: user.parentPhone, address: user.address, idCard: user.idCard, status: 'Enrolled', birthday: '2015-01-01' } }, { upsert: true, new: true });
         }
         await User.findByIdAndUpdate(userId, updates);
         res.json({});
-    } catch (e) {
-        console.error(e);
-        res.status(500).json({ error: e.message });
-    }
+    } catch (e) { res.status(500).json({ error: e.message }); }
 });
-
 app.post('/api/users/class-application', async (req, res) => {
     const { userId, type, targetClass, action } = req.body; 
     const userRole = req.headers['x-user-role'];
     const schoolId = req.headers['x-school-id'];
-
     if (action === 'APPLY') {
-        // ... (existing apply logic)
         try {
             const user = await User.findById(userId);
             if(!user) return res.status(404).json({error:'User not found'});
-            await User.findByIdAndUpdate(userId, {
-                classApplication: { type: type, targetClass: targetClass || '', status: 'PENDING' }
-            });
-            const typeText = type === 'CLAIM' ? '申请班主任' : '申请卸任';
-            await NotificationModel.create({
-                schoolId, targetUserId: userId, title: '申请已提交', content: `您已成功提交 ${typeText} (${type === 'CLAIM' ? targetClass : user.homeroomClass}) 的申请，等待管理员审核。`, type: 'info'
-            });
-            await NotificationModel.create({ schoolId, targetRole: 'ADMIN', title: '新的班主任任免申请', content: `${user.trueName || user.username} 申请 ${typeText}，请及时处理。`, type: 'warning' });
+            await User.findByIdAndUpdate(userId, { classApplication: { type: type, targetClass: targetClass || '', status: 'PENDING' } });
+            await NotificationModel.create({ schoolId, targetRole: 'ADMIN', title: '新的班主任任免申请', content: `${user.trueName || user.username} 申请 ${type === 'CLAIM' ? '任教' : '卸任'}，请及时处理。`, type: 'warning' });
             return res.json({ success: true });
         } catch (e) { return res.status(500).json({ error: e.message }); }
     }
-
     if (userRole === 'ADMIN' || userRole === 'PRINCIPAL') {
         const user = await User.findById(userId);
         if (!user || !user.classApplication) return res.status(404).json({ error: 'Application not found' });
         const appType = user.classApplication.type;
         const appTarget = user.classApplication.targetClass;
-
         if (action === 'APPROVE') {
             const updates = { classApplication: null };
             const classes = await ClassModel.find({ schoolId });
-            
             if (appType === 'CLAIM') {
                 updates.homeroomClass = appTarget;
                 const matchedClass = classes.find(c => (c.grade + c.className) === appTarget);
                 if (matchedClass) {
-                    // Add user ID to homeroomTeacherIds
                     const teacherIds = matchedClass.homeroomTeacherIds || [];
                     if (!teacherIds.includes(userId)) {
                         teacherIds.push(userId);
-                        // Re-generate teacherName string
                         const teachers = await User.find({ _id: { $in: teacherIds } });
                         const names = teachers.map(t => t.trueName || t.username).join(', ');
-                        await ClassModel.findByIdAndUpdate(matchedClass._id, { 
-                            homeroomTeacherIds: teacherIds,
-                            teacherName: names
-                        });
+                        await ClassModel.findByIdAndUpdate(matchedClass._id, { homeroomTeacherIds: teacherIds, teacherName: names });
                     }
                 }
             } else if (appType === 'RESIGN') {
                 updates.homeroomClass = '';
                 const matchedClass = classes.find(c => (c.grade + c.className) === user.homeroomClass);
                 if (matchedClass) {
-                    // Remove user ID
                     const teacherIds = (matchedClass.homeroomTeacherIds || []).filter(id => id !== userId);
                     const teachers = await User.find({ _id: { $in: teacherIds } });
                     const names = teachers.map(t => t.trueName || t.username).join(', ');
-                    await ClassModel.findByIdAndUpdate(matchedClass._id, { 
-                        homeroomTeacherIds: teacherIds,
-                        teacherName: names
-                    });
+                    await ClassModel.findByIdAndUpdate(matchedClass._id, { homeroomTeacherIds: teacherIds, teacherName: names });
                 }
             }
             await User.findByIdAndUpdate(userId, updates);
-            await NotificationModel.create({ schoolId, targetUserId: userId, title: '申请已通过', content: `管理员已同意您的${appType === 'CLAIM' ? '任教' : '卸任'}申请。`, type: 'success' });
-        } else {
-            await User.findByIdAndUpdate(userId, { 'classApplication.status': 'REJECTED' });
-            await NotificationModel.create({ schoolId, targetUserId: userId, title: '申请被拒绝', content: `管理员拒绝了您的${appType === 'CLAIM' ? '任教' : '卸任'}申请。`, type: 'error' });
-        }
+        } else await User.findByIdAndUpdate(userId, { 'classApplication.status': 'REJECTED' });
         return res.json({ success: true });
     }
     res.status(403).json({ error: 'Permission denied' });
 });
-
 app.post('/api/students/promote', async (req, res) => {
-    // ... Existing Promote Logic
-    // Update: If teacherFollows is true, move the homeroomTeacherIds to new class
     const { teacherFollows } = req.body; 
     const sId = req.headers['x-school-id'];
-    const role = req.headers['x-user-role'];
-    if (role !== 'ADMIN' && role !== 'PRINCIPAL') return res.status(403).json({ error: 'Permission denied' });
-
-    const GRADE_MAP = {
-      '一年级': '二年级', '二年级': '三年级', '三年级': '四年级', '四年级': '五年级', '五年级': '六年级', '六年级': '毕业',
-      '初一': '初二', '七年级': '八年级', '初二': '初三', '八年级': '九年级', '初三': '毕业', '九年级': '毕业',
-      '高一': '高二', '高二': '高三', '高三': '毕业'
-    };
-
+    const GRADE_MAP = { '一年级': '二年级', '二年级': '三年级', '三年级': '四年级', '四年级': '五年级', '五年级': '六年级', '六年级': '毕业', '初一': '初二', '七年级': '八年级', '初二': '初三', '八年级': '九年级', '初三': '毕业', '九年级': '毕业', '高一': '高二', '高二': '高三', '高三': '毕业' };
     const classes = await ClassModel.find(getQueryFilter(req));
     let promotedCount = 0;
-
     for (const cls of classes) {
         const currentGrade = cls.grade;
         const nextGrade = GRADE_MAP[currentGrade] || currentGrade;
         const suffix = cls.className; 
-
         if (nextGrade === '毕业') {
              const oldFullClass = cls.grade + cls.className;
              await Student.updateMany({ className: oldFullClass, ...getQueryFilter(req) }, { status: 'Graduated', className: '已毕业' });
-             if (teacherFollows && cls.homeroomTeacherIds?.length) {
-                 await User.updateMany({ _id: { $in: cls.homeroomTeacherIds }, schoolId: sId }, { homeroomClass: '' });
-                 await ClassModel.findByIdAndUpdate(cls._id, { teacherName: '', homeroomTeacherIds: [] });
-             }
+             if (teacherFollows && cls.homeroomTeacherIds?.length) { await User.updateMany({ _id: { $in: cls.homeroomTeacherIds }, schoolId: sId }, { homeroomClass: '' }); await ClassModel.findByIdAndUpdate(cls._id, { teacherName: '', homeroomTeacherIds: [] }); }
         } else {
              const oldFullClass = cls.grade + cls.className;
              const newFullClass = nextGrade + suffix; 
-             
-             // Find or create next class
-             await ClassModel.findOneAndUpdate(
-                 { grade: nextGrade, className: suffix, schoolId: sId }, 
-                 { 
-                     schoolId: sId, 
-                     grade: nextGrade, 
-                     className: suffix, 
-                     // If teacher follows, copy the IDs and Names
-                     teacherName: teacherFollows ? cls.teacherName : undefined,
-                     homeroomTeacherIds: teacherFollows ? cls.homeroomTeacherIds : []
-                 }, 
-                 { upsert: true }
-             );
-             
+             await ClassModel.findOneAndUpdate({ grade: nextGrade, className: suffix, schoolId: sId }, { schoolId: sId, grade: nextGrade, className: suffix, teacherName: teacherFollows ? cls.teacherName : undefined, homeroomTeacherIds: teacherFollows ? cls.homeroomTeacherIds : [] }, { upsert: true });
              const result = await Student.updateMany({ className: oldFullClass, status: 'Enrolled', ...getQueryFilter(req) }, { className: newFullClass });
              promotedCount += result.modifiedCount;
-
-             if (teacherFollows && cls.homeroomTeacherIds?.length) {
-                 await User.updateMany({ _id: { $in: cls.homeroomTeacherIds }, schoolId: sId, homeroomClass: oldFullClass }, { homeroomClass: newFullClass });
-                 // Clear old class teachers
-                 await ClassModel.findByIdAndUpdate(cls._id, { teacherName: '', homeroomTeacherIds: [] });
-             }
+             if (teacherFollows && cls.homeroomTeacherIds?.length) { await User.updateMany({ _id: { $in: cls.homeroomTeacherIds }, schoolId: sId, homeroomClass: oldFullClass }, { homeroomClass: newFullClass }); await ClassModel.findByIdAndUpdate(cls._id, { teacherName: '', homeroomTeacherIds: [] }); }
         }
     }
     res.json({ success: true, count: promotedCount });
 });
-
-// ... (Rest of existing endpoints) ...
-
-// --- GAMES ISOLATION & PERMISSION LOGIC ---
-
-// 1. Lucky Draw
-app.get('/api/games/lucky-config', async (req, res) => {
-   const filter = getQueryFilter(req);
-   const ownerFilter = await getGameOwnerFilter(req);
-   if (req.query.className) filter.className = req.query.className;
-   // Merge owner filter
-   Object.assign(filter, ownerFilter);
-   
-   const config = await LuckyDrawConfigModel.findOne(filter);
-   res.json(config || { prizes: [], dailyLimit: 3, cardCount: 9, defaultPrize: '再接再厉' });
-});
 app.post('/api/games/lucky-config', async (req, res) => {
    const data = injectSchoolId(req, req.body);
-   // Inject ownerId for teachers
    if (req.headers['x-user-role'] === 'TEACHER') {
        const user = await User.findOne({ username: req.headers['x-user-username'] });
        data.ownerId = user ? user._id.toString() : null;
    }
-   await LuckyDrawConfigModel.findOneAndUpdate(
-       { className: data.className, ...getQueryFilter(req), ownerId: data.ownerId }, 
-       data, 
-       { upsert: true }
-   );
+   await LuckyDrawConfigModel.findOneAndUpdate({ className: data.className, ...getQueryFilter(req), ownerId: data.ownerId }, data, { upsert: true });
    res.json({ success: true });
 });
 app.post('/api/games/lucky-draw', async (req, res) => {
@@ -457,33 +443,18 @@ app.post('/api/games/lucky-draw', async (req, res) => {
    try {
       const student = await Student.findById(studentId);
       if (!student) return res.status(404).json({ error: 'Student not found' });
-      
-      // Determine which config to use. 
-      // If student triggering, they need context (not currently passed well).
-      // For now, assume STUDENT role triggers draw against *their Homeroom Teacher's* config OR global if none.
-      // Ideally, student selects a "Class Session". 
-      // Simplified: If Teacher triggers, use their config. If Student, find their homeroom teacher config.
-      
       let configFilter = { className: student.className, schoolId };
       if (userRole === 'TEACHER') {
           const user = await User.findOne({ username: req.headers['x-user-username'] });
           configFilter.ownerId = user ? user._id.toString() : null;
-      } else {
-          // Student logic: Find one valid config or default?
-          // Fallback: Find *any* config for this class.
       }
-
       const config = await LuckyDrawConfigModel.findOne(configFilter);
       const prizes = config?.prizes || [];
       const defaultPrize = config?.defaultPrize || '再接再厉';
       const dailyLimit = config?.dailyLimit || 3;
       const consolationWeight = config?.consolationWeight || 0;
-
-      // ... (Rest of Draw Logic same as before) ...
-      
       const availablePrizes = prizes.filter(p => (p.count === undefined || p.count > 0));
       if (availablePrizes.length === 0 && consolationWeight === 0) return res.status(400).json({ error: 'POOL_EMPTY', message: '奖品库存不足' });
-
       if (userRole === 'STUDENT') {
           if (student.drawAttempts <= 0) return res.status(403).json({ error: '次数不足', message: '您的抽奖次数已用完' });
           const today = new Date().toISOString().split('T')[0];
@@ -499,33 +470,26 @@ app.post('/api/games/lucky-draw', async (req, res) => {
           student.drawAttempts -= 1;
           await student.save();
       }
-
       let totalWeight = consolationWeight;
       availablePrizes.forEach(p => totalWeight += (p.probability || 0));
       let random = Math.random() * totalWeight;
       let selectedPrize = defaultPrize;
       let rewardType = 'CONSOLATION'; 
       let matchedPrize = null;
-
       for (const p of availablePrizes) {
           random -= (p.probability || 0);
           if (random <= 0) { matchedPrize = p; break; }
       }
-
       if (matchedPrize) {
          selectedPrize = matchedPrize.name;
          rewardType = 'ITEM'; 
          if (config._id) await LuckyDrawConfigModel.updateOne({ _id: config._id, "prizes.id": matchedPrize.id }, { $inc: { "prizes.$.count": -1 } });
       }
-      
-      // Save reward with ownerId if teacher triggered
       let ownerId = config?.ownerId;
       await StudentRewardModel.create({ schoolId, studentId, studentName: student.name, rewardType, name: selectedPrize, count: 1, status: 'PENDING', source: '幸运大抽奖', ownerId });
       res.json({ prize: selectedPrize, rewardType });
    } catch (e) { res.status(500).json({ error: e.message }); }
 });
-
-// 2. Monster Config (Isolated)
 app.get('/api/games/monster-config', async (req, res) => {
     const filter = getQueryFilter(req);
     const ownerFilter = await getGameOwnerFilter(req);
@@ -543,8 +507,6 @@ app.post('/api/games/monster-config', async (req, res) => {
     await GameMonsterConfigModel.findOneAndUpdate({ className: data.className, ...getQueryFilter(req), ownerId: data.ownerId }, data, { upsert: true });
     res.json({ success: true });
 });
-
-// 3. Zen Config (Isolated)
 app.get('/api/games/zen-config', async (req, res) => {
     const filter = getQueryFilter(req);
     const ownerFilter = await getGameOwnerFilter(req);
@@ -562,47 +524,28 @@ app.post('/api/games/zen-config', async (req, res) => {
     await GameZenConfigModel.findOneAndUpdate({ className: data.className, ...getQueryFilter(req), ownerId: data.ownerId }, data, { upsert: true });
     res.json({ success: true });
 });
-
-// 4. MOUNTAIN GAME - SPECIAL (Shared Class + Permission Check)
-app.get('/api/games/mountain', async (req, res) => { 
-    // Everyone sees the same mountain state for a class
-    res.json(await GameSessionModel.findOne({...getQueryFilter(req), className: req.query.className})); 
-});
+app.get('/api/games/mountain', async (req, res) => { res.json(await GameSessionModel.findOne({...getQueryFilter(req), className: req.query.className})); });
 app.post('/api/games/mountain', async (req, res) => { 
     const { className } = req.body;
     const sId = req.headers['x-school-id'];
     const role = req.headers['x-user-role'];
     const username = req.headers['x-user-username'];
-
-    // Permission Check: Must be Homeroom Teacher
     if (role === 'TEACHER') {
         const user = await User.findOne({ username });
         const cls = await ClassModel.findOne({ schoolId: sId, $expr: { $eq: [{ $concat: ["$grade", "$className"] }, className] } });
-        
         if (!cls) return res.status(404).json({ error: 'Class not found' });
-        
-        // Check if user ID is in the allowed list
         const allowedIds = cls.homeroomTeacherIds || [];
-        if (!allowedIds.includes(user._id.toString())) {
-            return res.status(403).json({ error: 'PERMISSION_DENIED', message: '只有班主任可以操作登峰游戏' });
-        }
+        if (!allowedIds.includes(user._id.toString())) return res.status(403).json({ error: 'PERMISSION_DENIED', message: '只有班主任可以操作登峰游戏' });
     }
-
-    const filter = { className };
-    if(sId) filter.schoolId = sId;
-    await GameSessionModel.findOneAndUpdate(filter, injectSchoolId(req, req.body), {upsert:true}); 
+    await GameSessionModel.findOneAndUpdate({ className, ...getQueryFilter(req) }, injectSchoolId(req, req.body), {upsert:true}); 
     res.json({}); 
 });
-
-// 5. Rewards List (Isolated)
 app.get('/api/rewards', async (req, res) => { 
     const filter = getQueryFilter(req);
-    // If Teacher, only show rewards they own
     if (req.headers['x-user-role'] === 'TEACHER') {
        const user = await User.findOne({ username: req.headers['x-user-username'] });
        if (user) filter.ownerId = user._id.toString();
     }
-
     if(req.query.studentId) filter.studentId = req.query.studentId;
     if (req.query.className) {
         const classStudents = await Student.find({ className: req.query.className, ...getQueryFilter(req) }, '_id');
@@ -619,7 +562,6 @@ app.get('/api/rewards', async (req, res) => {
 app.post('/api/rewards', async (req, res) => { 
     const data = injectSchoolId(req, req.body);
     if (!data.count) data.count = 1;
-    // Inject ownerId
     if (req.headers['x-user-role'] === 'TEACHER') {
        const user = await User.findOne({ username: req.headers['x-user-username'] });
        data.ownerId = user ? user._id.toString() : null;
@@ -632,219 +574,68 @@ 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' ? '抽奖券' : '奖品');
-    
     let ownerId = null;
     if (req.headers['x-user-role'] === 'TEACHER') {
        const user = await User.findOne({ username: req.headers['x-user-username'] });
        ownerId = user ? user._id.toString() : null;
     }
-
     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, 
-        name: finalName, 
-        count: finalCount, 
-        status: rewardType === 'DRAW_COUNT' ? 'REDEEMED' : 'PENDING', 
-        source: '教师发放',
-        ownerId
-    });
+    await StudentRewardModel.create({ schoolId: req.headers['x-school-id'], studentId, studentName: (await Student.findById(studentId)).name, rewardType, name: finalName, count: finalCount, status: rewardType === 'DRAW_COUNT' ? 'REDEEMED' : 'PENDING', source: '教师发放', ownerId });
     res.json({}); 
 });
-
-// ACHIEVEMENT ROUTES (New)
-app.get('/api/achievements/config', async (req, res) => {
-    const { className } = req.query;
-    const filter = getQueryFilter(req);
-    if (className) filter.className = className;
-    res.json(await AchievementConfigModel.findOne(filter));
-});
-
-app.post('/api/achievements/config', async (req, res) => {
-    const data = injectSchoolId(req, req.body);
-    await AchievementConfigModel.findOneAndUpdate(
-        { className: data.className, ...getQueryFilter(req) }, 
-        data, 
-        { upsert: true }
-    );
-    res.json({ success: true });
-});
-
-app.get('/api/achievements/student', async (req, res) => {
-    const { studentId, semester } = req.query;
-    const filter = { studentId };
-    if (semester) filter.semester = semester;
-    res.json(await StudentAchievementModel.find(filter).sort({ createTime: -1 }));
-});
-
-app.post('/api/achievements/grant', async (req, res) => {
-    const { studentId, achievementId, semester } = req.body;
-    const sId = req.headers['x-school-id'];
-    
-    const student = await Student.findById(studentId);
-    if (!student) return res.status(404).json({ error: 'Student not found' });
-    
-    const config = await AchievementConfigModel.findOne({ className: student.className, schoolId: sId });
-    const achievement = config?.achievements.find(a => a.id === achievementId);
-    
-    if (!achievement) return res.status(404).json({ error: 'Achievement not found' });
-    
-    // Add Record
-    await StudentAchievementModel.create({
-        schoolId: sId,
-        studentId,
-        studentName: student.name,
-        achievementId: achievement.id,
-        achievementName: achievement.name,
-        achievementIcon: achievement.icon,
-        semester,
-        createTime: new Date()
-    });
-    
-    // Add Points (Flowers)
-    await Student.findByIdAndUpdate(studentId, { $inc: { flowerBalance: achievement.points } });
-    
-    res.json({ success: true });
-});
-
-app.post('/api/achievements/exchange', async (req, res) => {
-    const { studentId, ruleId } = req.body;
-    const sId = req.headers['x-school-id'];
-    
-    const student = await Student.findById(studentId);
-    if (!student) return res.status(404).json({ error: 'Student not found' });
-    
-    const config = await AchievementConfigModel.findOne({ className: student.className, schoolId: sId });
-    const rule = config?.exchangeRules.find(r => r.id === ruleId);
-    
-    if (!rule) return res.status(404).json({ error: 'Rule not found' });
-    
-    if (student.flowerBalance < rule.cost) {
-        return res.status(400).json({ error: 'INSUFFICIENT_FUNDS', message: '小红花余额不足' });
-    }
-    
-    // Deduct Flowers
-    await Student.findByIdAndUpdate(studentId, { $inc: { flowerBalance: -rule.cost } });
-    
-    // Add Reward Record (using StudentRewardModel so it appears in "GameRewards" / "Shop History")
-    await StudentRewardModel.create({
-        schoolId: sId,
-        studentId,
-        studentName: student.name,
-        rewardType: rule.rewardType, // ITEM or DRAW_COUNT
-        name: rule.rewardName,
-        count: rule.rewardValue,
-        status: rule.rewardType === 'DRAW_COUNT' ? 'REDEEMED' : 'PENDING',
-        source: '积分兑换',
-        createTime: new Date()
-    });
-    
-    // If Draw Count, add attempts immediately
-    if (rule.rewardType === 'DRAW_COUNT') {
-        await Student.findByIdAndUpdate(studentId, { $inc: { drawAttempts: rule.rewardValue } });
-    }
-    
-    res.json({ success: true });
-});
-
-// Update Class (Support multi-teachers)
 app.put('/api/classes/:id', async (req, res) => {
     const classId = req.params.id;
     const { grade, className, teacherName, homeroomTeacherIds } = req.body;
     const sId = req.headers['x-school-id'];
     const oldClass = await ClassModel.findById(classId);
-    
     if (!oldClass) return res.status(404).json({ error: 'Class not found' });
     const newFullClass = grade + className;
     const oldFullClass = oldClass.grade + oldClass.className;
-
-    // Logic: Sync User's `homeroomClass` field
-    // 1. Remove from old teachers if class changed or teachers removed
     const oldTeacherIds = oldClass.homeroomTeacherIds || [];
     const newTeacherIds = homeroomTeacherIds || [];
-    
     const removedIds = oldTeacherIds.filter(id => !newTeacherIds.includes(id));
-    if (removedIds.length > 0) {
-        await User.updateMany({ _id: { $in: removedIds }, schoolId: sId }, { homeroomClass: '' });
-    }
-    
-    // 2. Add to new teachers
-    if (newTeacherIds.length > 0) {
-        await User.updateMany({ _id: { $in: newTeacherIds }, schoolId: sId }, { homeroomClass: newFullClass });
-    }
-
-    // 3. Update class name string
+    if (removedIds.length > 0) await User.updateMany({ _id: { $in: removedIds }, schoolId: sId }, { homeroomClass: '' });
+    if (newTeacherIds.length > 0) await User.updateMany({ _id: { $in: newTeacherIds }, schoolId: sId }, { homeroomClass: newFullClass });
     let displayTeacherName = teacherName;
     if (newTeacherIds.length > 0) {
         const teachers = await User.find({ _id: { $in: newTeacherIds } });
         displayTeacherName = teachers.map(t => t.trueName || t.username).join(', ');
     }
-
     await ClassModel.findByIdAndUpdate(classId, { grade, className, teacherName: displayTeacherName, homeroomTeacherIds: newTeacherIds });
-    
     if (oldFullClass !== newFullClass) {
         await Student.updateMany({ className: oldFullClass, schoolId: sId }, { className: newFullClass });
-        // Also update users if class name changed
         await User.updateMany({ homeroomClass: oldFullClass, schoolId: sId }, { homeroomClass: newFullClass });
     }
     res.json({ success: true });
 });
-
-// Create Class
 app.post('/api/classes', async (req, res) => { 
     const data = injectSchoolId(req, req.body);
     const { homeroomTeacherIds } = req.body;
-    
-    // Generate display name
     if (homeroomTeacherIds && homeroomTeacherIds.length > 0) {
         const teachers = await User.find({ _id: { $in: homeroomTeacherIds } });
         data.teacherName = teachers.map(t => t.trueName || t.username).join(', ');
     }
-    
     await ClassModel.create(data);
-    
-    if (homeroomTeacherIds && homeroomTeacherIds.length > 0) {
-        await User.updateMany({ _id: { $in: homeroomTeacherIds }, schoolId: data.schoolId }, { homeroomClass: data.grade + data.className });
-    }
+    if (homeroomTeacherIds && homeroomTeacherIds.length > 0) await User.updateMany({ _id: { $in: homeroomTeacherIds }, schoolId: data.schoolId }, { homeroomClass: data.grade + data.className });
     res.json({}); 
 });
-
-// Update Courses to support className
 app.get('/api/courses', async (req, res) => { 
     const filter = getQueryFilter(req);
-    // Teachers only see their own courses usually, or we can filter by teacherId if passed
     if (req.query.teacherId) filter.teacherId = req.query.teacherId;
     res.json(await Course.find(filter)); 
 });
 app.post('/api/courses', async (req, res) => { 
     const data = injectSchoolId(req, req.body);
-    try {
-        await Course.create(data);
-        res.json({});
-    } catch(e) {
-        if (e.code === 11000) return res.status(409).json({ error: 'DUPLICATE', message: '该班级该科目已有任课老师' });
-        res.status(500).json({ error: e.message });
-    }
+    try { await Course.create(data); res.json({}); } catch(e) { if (e.code === 11000) return res.status(409).json({ error: 'DUPLICATE', message: '该班级该科目已有任课老师' }); res.status(500).json({ error: e.message }); }
 });
-
-// ... (Rest of server.js) ...
 app.get('/api/public/schools', async (req, res) => { res.json(await School.find({}, 'name code _id')); });
 app.get('/api/public/config', async (req, res) => { 
     const currentSem = getAutoSemester();
     let config = await ConfigModel.findOne({ key: 'main' });
     if (config) {
         let semesters = config.semesters || [];
-        if (!semesters.includes(currentSem)) {
-            semesters.unshift(currentSem);
-            config.semesters = semesters;
-            config.semester = currentSem; 
-            await ConfigModel.updateOne({ key: 'main' }, { semesters, semester: currentSem });
-        }
-    } else {
-        config = { key: 'main', allowRegister: true, semester: currentSem, semesters: [currentSem] };
-    }
+        if (!semesters.includes(currentSem)) { semesters.unshift(currentSem); config.semesters = semesters; config.semester = currentSem; await ConfigModel.updateOne({ key: 'main' }, { semesters, semester: currentSem }); }
+    } else { config = { key: 'main', allowRegister: true, semester: currentSem, semesters: [currentSem] }; }
     res.json(config); 
 });
 app.get('/api/public/meta', async (req, res) => { res.json({ classes: await ClassModel.find({ schoolId: req.query.schoolId }), subjects: await SubjectModel.find({ schoolId: req.query.schoolId }) }); });
@@ -860,29 +651,7 @@ app.post('/api/schools', async (req, res) => { res.json(await School.create(req.
 app.put('/api/schools/:id', async (req, res) => { await School.findByIdAndUpdate(req.params.id, req.body); res.json({}); });
 app.delete('/api/schools/:id', async (req, res) => {
     const schoolId = req.params.id;
-    try {
-        await School.findByIdAndDelete(schoolId);
-        await User.deleteMany({ schoolId });
-        await Student.deleteMany({ schoolId });
-        await ClassModel.deleteMany({ schoolId });
-        await SubjectModel.deleteMany({ schoolId });
-        await Course.deleteMany({ schoolId });
-        await Score.deleteMany({ schoolId });
-        await ExamModel.deleteMany({ schoolId });
-        await ScheduleModel.deleteMany({ schoolId });
-        await NotificationModel.deleteMany({ schoolId });
-        await AttendanceModel.deleteMany({ schoolId });
-        await LeaveRequestModel.deleteMany({ schoolId });
-        await GameSessionModel.deleteMany({ schoolId });
-        await StudentRewardModel.deleteMany({ schoolId });
-        await LuckyDrawConfigModel.deleteMany({ schoolId });
-        await GameMonsterConfigModel.deleteMany({ schoolId }); 
-        await GameZenConfigModel.deleteMany({ schoolId });
-        await AchievementConfigModel.deleteMany({ schoolId });
-        await StudentAchievementModel.deleteMany({ schoolId });
-        await SchoolCalendarModel.deleteMany({ schoolId });
-        res.json({ success: true });
-    } catch (e) { res.status(500).json({ error: e.message }); }
+    try { await School.findByIdAndDelete(schoolId); await User.deleteMany({ schoolId }); await Student.deleteMany({ schoolId }); await ClassModel.deleteMany({ schoolId }); await SubjectModel.deleteMany({ schoolId }); await Course.deleteMany({ schoolId }); await Score.deleteMany({ schoolId }); await ExamModel.deleteMany({ schoolId }); await ScheduleModel.deleteMany({ schoolId }); await NotificationModel.deleteMany({ schoolId }); await AttendanceModel.deleteMany({ schoolId }); await LeaveRequestModel.deleteMany({ schoolId }); await GameSessionModel.deleteMany({ schoolId }); await StudentRewardModel.deleteMany({ schoolId }); await LuckyDrawConfigModel.deleteMany({ schoolId }); await GameMonsterConfigModel.deleteMany({ schoolId }); await GameZenConfigModel.deleteMany({ schoolId }); await AchievementConfigModel.deleteMany({ schoolId }); await StudentAchievementModel.deleteMany({ schoolId }); await SchoolCalendarModel.deleteMany({ schoolId }); res.json({ success: true }); } catch (e) { res.status(500).json({ error: e.message }); }
 });
 app.delete('/api/users/:id', async (req, res) => { 
     const requesterRole = req.headers['x-user-role'];
@@ -891,8 +660,7 @@ app.delete('/api/users/:id', async (req, res) => {
         if (!user || user.schoolId !== req.headers['x-school-id']) return res.status(403).json({error: 'Permission denied'});
         if (user.role === 'ADMIN') return res.status(403).json({error: 'Cannot delete admin'});
     }
-    await User.findByIdAndDelete(req.params.id); 
-    res.json({}); 
+    await User.findByIdAndDelete(req.params.id); res.json({}); 
 });
 app.get('/api/students', async (req, res) => { res.json(await Student.find(getQueryFilter(req))); });
 app.post('/api/students', async (req, res) => { 
@@ -900,19 +668,9 @@ app.post('/api/students', async (req, res) => {
     if (data.studentNo === '') delete data.studentNo;
     try {
         const existing = await Student.findOne({ schoolId: data.schoolId, name: data.name, className: data.className });
-        if (existing) {
-            Object.assign(existing, data);
-            if (!existing.studentNo) { existing.studentNo = await generateStudentNo(); }
-            await existing.save();
-        } else {
-            if (!data.studentNo) { data.studentNo = await generateStudentNo(); }
-            await Student.create(data);
-        }
+        if (existing) { Object.assign(existing, data); if (!existing.studentNo) { existing.studentNo = await generateStudentNo(); } await existing.save(); } else { if (!data.studentNo) { data.studentNo = await generateStudentNo(); } await Student.create(data); }
         res.json({ success: true });
-    } catch (e) {
-        if (e.code === 11000) return res.status(409).json({ error: 'DUPLICATE', message: '保存失败：存在重复的系统ID' });
-        res.status(500).json({ error: e.message });
-    }
+    } catch (e) { if (e.code === 11000) return res.status(409).json({ error: 'DUPLICATE', message: '保存失败：存在重复的系统ID' }); res.status(500).json({ error: e.message }); }
 });
 app.put('/api/students/:id', async (req, res) => { await Student.findByIdAndUpdate(req.params.id, req.body); res.json({}); });
 app.delete('/api/students/:id', async (req, res) => { await Student.findByIdAndDelete(req.params.id); res.json({}); });
@@ -928,8 +686,7 @@ app.get('/api/classes', async (req, res) => {
 app.delete('/api/classes/:id', async (req, res) => { 
     const cls = await ClassModel.findById(req.params.id);
     if (cls && cls.homeroomTeacherIds) await User.updateMany({ _id: { $in: cls.homeroomTeacherIds }, schoolId: cls.schoolId }, { homeroomClass: '' });
-    await ClassModel.findByIdAndDelete(req.params.id); 
-    res.json({}); 
+    await ClassModel.findByIdAndDelete(req.params.id); res.json({}); 
 });
 app.get('/api/subjects', async (req, res) => { res.json(await SubjectModel.find(getQueryFilter(req))); });
 app.post('/api/subjects', async (req, res) => { await SubjectModel.create(injectSchoolId(req, req.body)); res.json({}); });
@@ -952,8 +709,7 @@ app.post('/api/schedules', async (req, res) => {
     const filter = { className:req.body.className, dayOfWeek:req.body.dayOfWeek, period:req.body.period };
     const sId = req.headers['x-school-id'];
     if(sId) filter.schoolId = sId;
-    await ScheduleModel.findOneAndUpdate(filter, injectSchoolId(req, req.body), {upsert:true}); 
-    res.json({}); 
+    await ScheduleModel.findOneAndUpdate(filter, injectSchoolId(req, req.body), {upsert:true}); res.json({}); 
 });
 app.delete('/api/schedules', async (req, res) => { await ScheduleModel.deleteOne({...getQueryFilter(req), ...req.query}); res.json({}); });
 app.get('/api/stats', async (req, res) => { 
@@ -973,17 +729,7 @@ app.get('/api/stats', async (req, res) => {
 app.get('/api/config', async (req, res) => { 
     const currentSem = getAutoSemester();
     let config = await ConfigModel.findOne({key:'main'});
-    if (config) {
-        let semesters = config.semesters || [];
-        if (!semesters.includes(currentSem)) {
-            semesters.unshift(currentSem);
-            config.semesters = semesters;
-            config.semester = currentSem; 
-            await ConfigModel.updateOne({ key: 'main' }, { semesters, semester: currentSem });
-        }
-    } else {
-        config = { key: 'main', allowRegister: true, semester: currentSem, semesters: [currentSem] };
-    }
+    if (config) { let semesters = config.semesters || []; if (!semesters.includes(currentSem)) { semesters.unshift(currentSem); config.semesters = semesters; config.semester = currentSem; await ConfigModel.updateOne({ key: 'main' }, { semesters, semester: currentSem }); } } else { config = { key: 'main', allowRegister: true, semester: currentSem, semesters: [currentSem] }; }
     res.json(config); 
 });
 app.post('/api/config', async (req, res) => { await ConfigModel.findOneAndUpdate({key:'main'}, req.body, {upsert:true}); res.json({}); });
@@ -996,8 +742,7 @@ app.delete('/api/rewards/:id', async (req, res) => {
         if (student && 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({});
+    await StudentRewardModel.findByIdAndDelete(req.params.id); res.json({});
 });
 app.post('/api/rewards/:id/redeem', async (req, res) => { await StudentRewardModel.findByIdAndUpdate(req.params.id, {status:'REDEEMED'}); res.json({}); });
 app.get('/api/attendance', async (req, res) => {
@@ -1036,28 +781,14 @@ app.post('/api/leave', async (req, res) => {
     if (student) await AttendanceModel.findOneAndUpdate({ studentId, date: startDate }, { schoolId: req.headers['x-school-id'], studentId, studentName: student.name, className: student.className, date: startDate, status: 'Leave', checkInTime: new Date() }, { upsert: true });
     res.json({ success: true });
 });
-// CALENDAR ROUTES
 app.get('/api/attendance/calendar', async (req, res) => {
     const { className } = req.query;
     const filter = getQueryFilter(req);
-    // Return both global holidays (className undefined or null) and class specific ones
-    const query = { 
-        $and: [
-            filter, 
-            { $or: [{ className: { $exists: false } }, { className: null }, { className }] }
-        ] 
-    };
+    const query = { $and: [ filter, { $or: [{ className: { $exists: false } }, { className: null }, { className }] } ] };
     res.json(await SchoolCalendarModel.find(query));
 });
-app.post('/api/attendance/calendar', async (req, res) => {
-    await SchoolCalendarModel.create(injectSchoolId(req, req.body));
-    res.json({ success: true });
-});
-app.delete('/api/attendance/calendar/:id', async (req, res) => {
-    await SchoolCalendarModel.findByIdAndDelete(req.params.id);
-    res.json({ success: true });
-});
-
+app.post('/api/attendance/calendar', async (req, res) => { await SchoolCalendarModel.create(injectSchoolId(req, req.body)); res.json({ success: true }); });
+app.delete('/api/attendance/calendar/:id', async (req, res) => { await SchoolCalendarModel.findByIdAndDelete(req.params.id); res.json({ success: true }); });
 app.post('/api/batch-delete', async (req, res) => { 
     if(req.body.type==='student') await Student.deleteMany({_id:{$in:req.body.ids}});
     if(req.body.type==='score') await Score.deleteMany({_id:{$in:req.body.ids}});

services/api.ts

@@ -1,4 +1,5 @@
-import { User, ClassInfo, SystemConfig, Subject, School, Schedule, GameSession, StudentReward, LuckyDrawConfig, Attendance, LeaveRequest, AchievementConfig, SchoolCalendarEntry } from '../types';
+
+import { User, ClassInfo, SystemConfig, Subject, School, Schedule, GameSession, StudentReward, LuckyDrawConfig, Attendance, LeaveRequest, AchievementConfig, SchoolCalendarEntry, TeacherExchangeConfig } from '../types';
 
 const getBaseUrl = () => {
   let isProd = false;
@@ -117,6 +118,7 @@ export const api = {
     delete: (id: string) => request(`/users/${id}`, { method: 'DELETE' }),
     applyClass: (data: { userId: string, type: 'CLAIM'|'RESIGN', targetClass?: string, action: 'APPLY'|'APPROVE'|'REJECT' }) => 
         request('/users/class-application', { method: 'POST', body: JSON.stringify(data) }),
+    getTeachersForClass: (className: string) => request(`/classes/${className}/teachers`),
   },
 
   students: {
@@ -207,7 +209,7 @@ export const api = {
   games: {
     getMountainSession: (className: string) => request(`/games/mountain?className=${className}`),
     saveMountainSession: (data: GameSession) => request('/games/mountain', { method: 'POST', body: JSON.stringify(data) }),
-    getLuckyConfig: (className?: string) => request(`/games/lucky-config${className ? `?className=${className}` : ''}`),
+    getLuckyConfig: (className?: string, ownerId?: string) => request(`/games/lucky-config?className=${className || ''}${ownerId ? `&ownerId=${ownerId}` : ''}`),
     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 }) }),
     grantReward: (data: { studentId: string, count: number, rewardType: string, name?: string }) => request('/games/grant-reward', { method: 'POST', body: JSON.stringify(data) }),
@@ -222,7 +224,11 @@ export const api = {
       saveConfig: (data: AchievementConfig) => request('/achievements/config', { method: 'POST', body: JSON.stringify(data) }),
       getStudentAchievements: (studentId: string, semester?: string) => request(`/achievements/student?studentId=${studentId}${semester ? `&semester=${semester}` : ''}`),
       grant: (data: { studentId: string, achievementId: string, semester: string }) => request('/achievements/grant', { method: 'POST', body: JSON.stringify(data) }),
-      exchange: (data: { studentId: string, ruleId: string }) => request('/achievements/exchange', { method: 'POST', body: JSON.stringify(data) }),
+      exchange: (data: { studentId: string, ruleId: string, teacherId?: string }) => request('/achievements/exchange', { method: 'POST', body: JSON.stringify(data) }),
+      // Teacher Exchange Rules
+      getMyRules: () => request('/achievements/teacher-rules'),
+      saveMyRules: (data: TeacherExchangeConfig) => request('/achievements/teacher-rules', { method: 'POST', body: JSON.stringify(data) }),
+      getRulesByTeachers: (teacherIds: string[]) => request(`/achievements/teacher-rules?teacherIds=${teacherIds.join(',')}`),
   },
 
   rewards: {
@@ -241,4 +247,4 @@ export const api = {
   batchDelete: (type: 'student' | 'score' | 'user', ids: string[]) => {
     return request('/batch-delete', { method: 'POST', body: JSON.stringify({ type, ids }) });
   }
-};
+};

types.ts

@@ -1,4 +1,46 @@
 
+// ... existing imports
+
+// ... existing types (User, School, etc.)
+
+export interface AchievementItem {
+  id: string;
+  name: string;
+  icon: string; 
+  points: number; 
+  description?: string;
+  addedBy?: string; // Teacher ID
+  addedByName?: string; // Teacher Name
+}
+
+export interface ExchangeRule {
+  id: string;
+  cost: number; 
+  rewardType: 'ITEM' | 'DRAW_COUNT';
+  rewardName: string;
+  rewardValue: number; 
+}
+
+// Class-based Config (Shared Achievement Library)
+export interface AchievementConfig {
+  _id?: string;
+  schoolId: string;
+  className: string;
+  achievements: AchievementItem[];
+  // exchangeRules is deprecated here, moving to TeacherExchangeConfig
+  exchangeRules?: ExchangeRule[]; 
+}
+
+// New: Teacher-based Config (Global Rules for a teacher)
+export interface TeacherExchangeConfig {
+  _id?: string;
+  schoolId: string;
+  teacherId: string;
+  teacherName: string;
+  rules: ExchangeRule[];
+}
+
+// ... rest of the file
 export enum UserRole {
   ADMIN = 'ADMIN',
   PRINCIPAL = 'PRINCIPAL', // 新增校长角色
@@ -227,6 +269,7 @@ export interface StudentReward {
   status: 'PENDING' | 'REDEEMED';
   source: string; 
   createTime: string;
+  ownerId?: string;
 }
 
 export interface LuckyPrize {
@@ -267,30 +310,7 @@ export interface GameMonsterConfig {
 }
 
 // --- Achievement System Types ---
-
-export interface AchievementItem {
-  id: string;
-  name: string;
-  icon: string; 
-  points: number; 
-  description?: string;
-}
-
-export interface ExchangeRule {
-  id: string;
-  cost: number; 
-  rewardType: 'ITEM' | 'DRAW_COUNT';
-  rewardName: string;
-  rewardValue: number; 
-}
-
-export interface AchievementConfig {
-  _id?: string;
-  schoolId: string;
-  className: string;
-  achievements: AchievementItem[];
-  exchangeRules: ExchangeRule[];
-}
+// (Already defined above with new fields, kept here for structure context if needed)
 
 export interface StudentAchievement {
   _id?: string;