feat: add student wallet utility billing

apps/server/src/expenses/expenses.service.ts

@@ -9,8 +9,10 @@ import {
   CreateRoomExpenseDto,
   CreatePersonalExpenseDto,
   BatchRoomExpenseDto,
+  CreateStudentUtilityBillDto,
 } from './dto/expense.dto';
 import { RoomsService } from '../rooms/rooms.service';
+import { BillsService } from '../bills/bills.service';
 
 
 @Injectable()
@@ -20,6 +22,7 @@ export class ExpensesService {
     @InjectRepository(PersonalExpense) private personalExpRepo: Repository<PersonalExpense>,
     @InjectRepository(Room) private roomRepo: Repository<Room>,
     @InjectRepository(Student) private studentRepo: Repository<Student>,
+    private billsService: BillsService,
   ) {}
 
   async getFormLookups() {
@@ -96,6 +99,30 @@ export class ExpensesService {
     return this.roomExpRepo.save(e);
   }
 
+  async createStudentUtilityBill(dto: CreateStudentUtilityBillDto, userId?: number) {
+    if (dto.periodEnd < dto.periodStart) throw new BadRequestException('账期结束日期不能早于开始日期');
+    const student = await this.studentRepo.findOne({ where: { id: dto.studentId } });
+    if (!student) throw new NotFoundException('学生不存在');
+    const expense = await this.personalExpRepo.save(
+      this.personalExpRepo.create({
+        studentId: dto.studentId,
+        expenseType: dto.expenseType,
+        amount: dto.amount,
+        expenseDate: dto.periodEnd,
+        description: dto.description || (dto.expenseType === 'water' ? '学生水费' : '学生电费'),
+        recordedBy: userId,
+        billId: null,
+      }),
+    );
+    try {
+      const bill = await this.billsService.createImmediatePersonalBill(expense, dto.periodStart, dto.periodEnd, userId);
+      return { expense, bill };
+    } catch (error) {
+      await this.personalExpRepo.delete(expense.id);
+      throw error;
+    }
+  }
+
   // 个人附加费
   async createPersonalExpense(dto: CreatePersonalExpenseDto, userId?: number) {
     const student = await this.studentRepo.findOne({ where: { id: dto.studentId } });