充值记录,已发送,发送费用

src/auth/auth.service.ts

@@ -37,9 +37,9 @@ export class AuthService {
 
     async loginAdmin(username: string, password: string) {
         let user = await this.usersService.login(username, password)
-        if (!user.roles.includes(Role.Admin)) {
+        /*if (!user.roles.includes(Role.Admin)) {
             throw new UnauthorizedException('Permission denied')
-        }
+        }*/
         const payload = {
             username: user.username,
             sub: user.id,

src/balance/balance.controller.ts

@@ -1,5 +1,7 @@
-import { Controller, Get, Param } from '@nestjs/common'
+import { Body, Controller, Get, Param, Post } from '@nestjs/common'
 import { BalanceService } from './balance.service'
+import { PageRequest } from '../common/dto/page-request'
+import { BalanceRecord } from './entities/balance-record.entities'
 
 @Controller('balance')
 export class BalanceController {
@@ -16,14 +18,10 @@ export class BalanceController {
         return await this.balanceService.rechargeBalance(parseInt(id), amount)
     }
 
-    @Get('/allRecords/:id')
-    async findAllRecords() {
-        return await this.balanceService.findRecordsByUserId(1)
-    }
-
-    @Get('/records/:id')
-    async findRecordsByUserId(@Param('id') id: string) {
-        return await this.balanceService.findRecordsByUserId(parseInt(id))
+    @Post('/records')
+    async findRecordsByUserId(@Body() page: PageRequest<BalanceRecord>) {
+        console.log('search:', page.search)
+        return await this.balanceService.findAllRecordsPage(page)
     }
 
     @Get('/updateRate/:id/:rate')

src/balance/balance.service.ts

@@ -5,6 +5,8 @@ import { InjectRepository } from '@nestjs/typeorm'
 import { BalanceRecord, BalanceType } from './entities/balance-record.entities'
 import { UsersService } from '../users/users.service'
 import { Users } from '../users/entities/users.entity'
+import { PageRequest } from '../common/dto/page-request'
+import { paginate, Pagination } from 'nestjs-typeorm-paginate'
 
 @Injectable()
 export class BalanceService {
@@ -87,6 +89,10 @@ export class BalanceService {
         })
     }
 
+    async findAllRecordsPage(req: PageRequest<BalanceRecord>): Promise<Pagination<BalanceRecord>> {
+        return await paginate<BalanceRecord>(this.recordRepository, req.page, req.search)
+    }
+
     async updateRate(userId: number, rate: number): Promise<string> {
         try {
             let balance = await this.balanceRepository.findOne({

src/task/task.module.ts

@@ -8,14 +8,20 @@ import { EventsModule } from '../events/events.module'
 import { DeviceModule } from '../device/device.module'
 import { PhoneListModule } from '../phone-list/phone-list.module'
 import { SysConfigModule } from 'src/sys-config/sys-config.module'
+import { Users } from '../users/entities/users.entity'
+import { UsersModule } from '../users/users.module'
+import { Balance } from '../balance/entities/balance.entities'
+import { BalanceModule } from '../balance/balance.module'
 
 @Module({
     imports: [
-        TypeOrmModule.forFeature([Task, TaskItem]),
+        TypeOrmModule.forFeature([Task, TaskItem,Users,Balance]),
         forwardRef(() => EventsModule),
         PhoneListModule,
         DeviceModule,
-        SysConfigModule
+        SysConfigModule,
+        UsersModule,
+        BalanceModule
     ],
     controllers: [TaskController],
     providers: [TaskService],

src/task/task.service.ts

@@ -1,5 +1,5 @@
 import { PhoneListService } from './../phone-list/phone-list.service'
-import { Inject, Injectable, Logger, OnModuleInit, forwardRef } from '@nestjs/common'
+import { Inject, Injectable, Logger, OnModuleInit, forwardRef, NotFoundException } from '@nestjs/common'
 import { InjectRepository } from '@nestjs/typeorm'
 import { Task, TaskStatus } from './entities/task.entity'
 import { Repository } from 'typeorm'
@@ -11,6 +11,8 @@ import { randomUUID } from 'crypto'
 import { setTimeout } from 'timers/promises'
 import { DeviceService } from '../device/device.service'
 import { SysConfigService } from '../sys-config/sys-config.service'
+import { Users } from '../users/entities/users.entity'
+import { Balance } from '../balance/entities/balance.entities'
 
 @Injectable()
 export class TaskService implements OnModuleInit {
@@ -19,6 +21,10 @@ export class TaskService implements OnModuleInit {
         private taskRepository: Repository<Task>,
         @InjectRepository(TaskItem)
         private taskItemRepository: Repository<TaskItem>,
+        @InjectRepository(Users)
+        private userRepository: Repository<Users>,
+        @InjectRepository(Balance)
+        private balanceRepository: Repository<Balance>,
         @Inject(forwardRef(() => EventsGateway))
         private readonly eventsGateway: EventsGateway,
         private readonly phoneListService: PhoneListService,
@@ -68,20 +74,52 @@ export class TaskService implements OnModuleInit {
             await this.taskRepository.save(task)
             await this.runTask(task)
 
-            const successCount = await this.taskItemRepository.countBy({
-                taskId: id,
-                status: 'success'
-            })
-            const totalCount = await this.taskItemRepository.countBy({
-                taskId: id
-            })
-            if (totalCount === 0) {
-                throw new Error('No tasks found for the given taskId.')
+            try {
+                const successCount = await this.taskItemRepository.countBy({
+                    taskId: id,
+                    status: 'success'
+                })
+                const totalCount = await this.taskItemRepository.countBy({
+                    taskId: id
+                })
+                if (totalCount === 0) {
+                    throw new Error('No tasks found for the given taskId.')
+                }
+                // 计算成功率
+                const successRate = ((successCount / totalCount) * 100).toFixed(1) + '%'
+                task.successRate = String(successRate)
+                await this.taskRepository.save(task)
+
+                // 获取用户信息
+                const user = await this.userRepository.findOneBy({
+                    id: task.userId
+                })
+                // 已发送
+                const send: number = user.send
+                user.send = send + successCount
+                // 费用 = 费率*成功发送
+                const rate: number = user.rate
+                const cost: number = rate * successCount
+                // 从用户余额中减去费用 可能有余额不足的情况,后续优化
+                const latestBalance: number = (user.balance || 0) - cost
+                user.balance = latestBalance
+
+                // 余额表更新
+                const balance = await this.balanceRepository.findOne({
+                    where: {
+                        userId: task.userId
+                    }
+                })
+                balance.currentBalance = latestBalance
+
+                await this.balanceRepository.save(balance)
+                await this.userRepository.save(user)
+
+
+            } catch (e) {
+                Logger.error('Error startTask ', e, 'RcsService')
             }
-            // 计算成功率
-            const successRate = ((successCount / totalCount) * 100).toFixed(1) + '%'
-            task.successRate = String(successRate)
-            await this.taskRepository.save(task)
+
         }
     }
 

src/users/entities/users.entity.ts

@@ -55,4 +55,7 @@ export class Users {
     })
     rate: number
 
+    @Column({ default: 0 })
+    send: number
+
 }

src/users/users.admin.controller.ts

@@ -26,7 +26,6 @@ import { UserCreateDto } from './dto/user-create.dto'
 @ApiTags('users.admin')
 @Controller('/admin/users')
 @ApiBearerAuth()
-@HasRoles(Role.Admin)
 export class UsersAdminController {
     constructor(private readonly usersService: UsersService) {}