wanwu/wwjcloud-nest-v1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 完成 NestJS 后端核心底座开发 (M1-M6) 和 Ant Design Vue 前端迁移

Browse Source 
主要更新：
1. 后端核心底座完成 (M1-M6)：
   - 健康检查、指标监控、分布式锁
   - 事件总线、队列系统、事务管理
   - 安全守卫、多租户隔离、存储适配器
   - 审计日志、配置管理、多语言支持

2. 前端迁移到 Ant Design Vue：
   - 从 Element Plus 迁移到 Ant Design Vue
   - 完善 system 模块 (role/menu/dept)
   - 修复依赖和配置问题

3. 文档完善：
   - AI 开发工作流文档
   - 架构约束和开发规范
   - 项目进度跟踪

4. 其他改进：
   - 修复编译错误和类型问题
   - 完善测试用例
   - 优化项目结构
This commit is contained in:
万物街
2025-08-27 11:24:22 +08:00
parent be07b9ffec
commit 1cd5d3bdef
696 changed files with 36708 additions and 16868 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
wwjcloud/src/common/member/controllers/adminapi/MemberController.ts
View File

@@ -1,7 +1,31 @@
import { Controller, Get, Post, Put, Delete, Body, Param, Query, UseGuards } from '@nestjs/common';
import { ApiTags, ApiOperation, ApiResponse, ApiBearerAuth } from '@nestjs/swagger';
import {
Controller,
Get,
Post,
Put,
Delete,
Body,
Param,
Query,
UseGuards,
} from '@nestjs/common';
import {
ApiTags,
ApiOperation,
ApiResponse,
ApiBearerAuth,
} from '@nestjs/swagger';
import { MemberService } from '../../services/admin/MemberService';
import { CreateMemberDto, UpdateMemberDto, QueryMemberDto, BatchUpdateStatusDto, BatchAssignLevelDto, AdjustPointsDto, AdjustBalanceDto, ResetPasswordDto } from '../../dto/admin/MemberDto';
import {
CreateMemberAdminDto,
UpdateMemberDto,
QueryMemberDto,
BatchUpdateMemberStatusDto,
BatchAssignLevelDto,
AdjustPointsDto,
AdjustBalanceDto,
ResetMemberPasswordDto,
} from '../../dto/admin/MemberDto';
import { Roles } from '../../../auth/decorators/RolesDecorator';
import { JwtAuthGuard } from '../../../auth/guards/JwtAuthGuard';
import { RolesGuard } from '../../../auth/guards/RolesGuard';
@@ -17,7 +41,7 @@ export class MemberController {
@Roles('admin')
@ApiOperation({ summary: '创建会员' })
@ApiResponse({ status: 201, description: '会员创建成功' })
async createMember(@Body() createMemberDto: CreateMemberDto) {
async createMember(@Body() createMemberDto: CreateMemberAdminDto) {
return await this.memberService.createMember(createMemberDto);
}
@@ -42,7 +66,7 @@ export class MemberController {
@ApiResponse({ status: 200, description: '会员更新成功' })
async updateMember(
@Param('id') id: number,
@Body() updateMemberDto: UpdateMemberDto
@Body() updateMemberDto: UpdateMemberDto,
) {
return await this.memberService.updateMember(id, updateMemberDto);
}
@@ -68,8 +92,13 @@ export class MemberController {
@Post('batch-update-status')
@ApiOperation({ summary: '批量更新会员状态' })
@ApiResponse({ status: 200, description: '状态更新成功' })
async batchUpdateMemberStatus(@Body() batchUpdateStatusDto: BatchUpdateStatusDto) {
await this.memberService.batchUpdateMemberStatus(batchUpdateStatusDto.member_ids, batchUpdateStatusDto.status);
async batchUpdateMemberStatus(
@Body() batchUpdateStatusDto: BatchUpdateMemberStatusDto,
) {
await this.memberService.batchUpdateMemberStatus(
batchUpdateStatusDto.member_ids,
batchUpdateStatusDto.status,
);
return { message: '状态更新成功' };
}
@@ -77,8 +106,13 @@ export class MemberController {
@Roles('admin')
@ApiOperation({ summary: '批量分配会员等级' })
@ApiResponse({ status: 200, description: '批量分配等级成功' })
async batchAssignMemberLevel(@Body() batchAssignLevelDto: BatchAssignLevelDto) {
await this.memberService.batchAssignMemberLevel(batchAssignLevelDto.member_ids, batchAssignLevelDto.level_id);
async batchAssignMemberLevel(
@Body() batchAssignLevelDto: BatchAssignLevelDto,
) {
await this.memberService.batchAssignMemberLevel(
batchAssignLevelDto.member_ids,
batchAssignLevelDto.level_id,
);
return { message: '批量分配等级成功' };
}
@@ -86,7 +120,11 @@ export class MemberController {
@ApiOperation({ summary: '调整会员积分' })
@ApiResponse({ status: 200, description: '积分调整成功' })
async adjustMemberPoints(@Body() adjustPointsDto: AdjustPointsDto) {
await this.memberService.adjustMemberPoints(adjustPointsDto.member_id, adjustPointsDto.points, adjustPointsDto.reason);
await this.memberService.adjustMemberPoints(
adjustPointsDto.member_id,
adjustPointsDto.points,
adjustPointsDto.reason,
);
return { message: '积分调整成功' };
}
@@ -94,22 +132,35 @@ export class MemberController {
@ApiOperation({ summary: '调整会员余额' })
@ApiResponse({ status: 200, description: '余额调整成功' })
async adjustMemberBalance(@Body() adjustBalanceDto: AdjustBalanceDto) {
await this.memberService.adjustMemberBalance(adjustBalanceDto.member_id, adjustBalanceDto.amount, adjustBalanceDto.reason);
await this.memberService.adjustMemberBalance(
adjustBalanceDto.member_id,
adjustBalanceDto.amount,
adjustBalanceDto.reason,
);
return { message: '余额调整成功' };
}
@Post(':id/reset-password')
@ApiOperation({ summary: '重置会员密码' })
@ApiResponse({ status: 200, description: '密码重置成功' })
async resetMemberPassword(@Param('id') id: number, @Body() resetPasswordDto: ResetPasswordDto) {
await this.memberService.resetMemberPassword(id, resetPasswordDto.new_password);
async resetMemberPassword(
@Param('id') id: number,
@Body() resetPasswordDto: ResetMemberPasswordDto,
) {
await this.memberService.resetMemberPassword(
id,
resetPasswordDto.new_password,
);
return { message: '密码重置成功' };
}
@Put(':id/status')
@ApiOperation({ summary: '更新会员状态' })
@ApiResponse({ status: 200, description: '状态更新成功' })
async updateMemberStatus(@Param('id') id: number, @Body() body: { status: number }) {
async updateMemberStatus(
@Param('id') id: number,
@Body() body: { status: number },
) {
await this.memberService.updateMemberStatus(id, body.status);
return { message: '状态更新成功' };
}
@@ -127,4 +178,4 @@ export class MemberController {
async getMemberStats(@Query('site_id') site_id: number) {
return await this.memberService.getMemberStats(site_id);
}
}
}

69
wwjcloud/src/common/member/controllers/api/MemberController.ts
View File

@@ -1,7 +1,29 @@
import { Controller, Get, Post, Put, Delete, Body, Param, Query, UseGuards, Request } from '@nestjs/common';
import { ApiTags, ApiOperation, ApiResponse, ApiBearerAuth } from '@nestjs/swagger';
import {
Controller,
Get,
Post,
Put,
Delete,
Body,
Param,
Query,
UseGuards,
Request,
} from '@nestjs/common';
import {
ApiTags,
ApiOperation,
ApiResponse,
ApiBearerAuth,
} from '@nestjs/swagger';
import { MemberService } from '../../services/api/MemberService';
import { CreateMemberDto, UpdateProfileDto, ChangePasswordDto, ResetPasswordDto, SignDto } from '../../dto/api/MemberDto';
import {
CreateMemberApiDto,
UpdateProfileDto,
ChangePasswordDto,
ResetPasswordDto,
SignDto,
} from '../../dto/api/MemberDto';
@ApiTags('前台-会员管理')
@ApiBearerAuth()
@@ -12,14 +34,23 @@ export class MemberController {
@Post('register')
@ApiOperation({ summary: '会员注册' })
@ApiResponse({ status: 201, description: '注册成功' })
async register(@Body() createMemberDto: CreateMemberDto) {
async register(@Body() createMemberDto: CreateMemberApiDto) {
return await this.memberService.register(createMemberDto);
}
@Post('login')
@ApiOperation({ summary: '会员登录' })
@ApiResponse({ status: 200, description: '登录成功' })
async login(@Body() loginDto: { username: string; password: string; ip?: string; address?: string; device?: string }) {
async login(
@Body()
loginDto: {
username: string;
password: string;
ip?: string;
address?: string;
device?: string;
},
) {
return await this.memberService.login(loginDto);
}
@@ -34,7 +65,10 @@ export class MemberController {
@Put('profile')
@ApiOperation({ summary: '更新个人资料' })
@ApiResponse({ status: 200, description: '更新成功' })
async updateProfile(@Request() req: any, @Body() updateProfileDto: UpdateProfileDto) {
async updateProfile(
@Request() req: any,
@Body() updateProfileDto: UpdateProfileDto,
) {
const memberId = req.user.member_id;
return await this.memberService.updateProfile(memberId, updateProfileDto);
}
@@ -42,7 +76,10 @@ export class MemberController {
@Post('change-password')
@ApiOperation({ summary: '修改密码' })
@ApiResponse({ status: 200, description: '修改成功' })
async changePassword(@Request() req: any, @Body() changePasswordDto: ChangePasswordDto) {
async changePassword(
@Request() req: any,
@Body() changePasswordDto: ChangePasswordDto,
) {
const memberId = req.user.member_id;
return await this.memberService.changePassword(memberId, changePasswordDto);
}
@@ -65,7 +102,10 @@ export class MemberController {
@Get('points/history')
@ApiOperation({ summary: '获取积分历史' })
@ApiResponse({ status: 200, description: '获取成功' })
async getPointsHistory(@Request() req: any, @Query() query: { page?: number; limit?: number }) {
async getPointsHistory(
@Request() req: any,
@Query() query: { page?: number; limit?: number },
) {
const memberId = req.user.member_id;
return await this.memberService.getPointsHistory(memberId, query);
}
@@ -73,7 +113,10 @@ export class MemberController {
@Get('balance/history')
@ApiOperation({ summary: '获取余额历史' })
@ApiResponse({ status: 200, description: '获取成功' })
async getBalanceHistory(@Request() req: any, @Query() query: { page?: number; limit?: number }) {
async getBalanceHistory(
@Request() req: any,
@Query() query: { page?: number; limit?: number },
) {
const memberId = req.user.member_id;
return await this.memberService.getBalanceHistory(memberId, query);
}
@@ -97,7 +140,11 @@ export class MemberController {
@Put('address/:id')
@ApiOperation({ summary: '更新地址' })
@ApiResponse({ status: 200, description: '更新成功' })
async updateAddress(@Request() req: any, @Param('id') id: number, @Body() addressDto: any) {
async updateAddress(
@Request() req: any,
@Param('id') id: number,
@Body() addressDto: any,
) {
const memberId = req.user.member_id;
return await this.memberService.updateAddress(memberId, id, addressDto);
}
@@ -133,4 +180,4 @@ export class MemberController {
const memberId = req.user.member_id;
return await this.memberService.logout(memberId);
}
}
}

114
wwjcloud/src/common/member/dto/admin/MemberDto.ts
View File

@@ -1,7 +1,51 @@
import { IsString, IsEmail, IsOptional, IsMobilePhone, MinLength, MaxLength, IsNumber, IsInt, IsDateString } from 'class-validator';
import {
IsString,
IsEmail,
IsOptional,
IsMobilePhone,
MinLength,
MaxLength,
IsNumber,
IsInt,
IsDateString,
IsArray,
ValidateNested,
} from 'class-validator';
import { ApiProperty } from '@nestjs/swagger';
import { Type } from 'class-transformer';
export class CreateMemberDto {
export class MemberAddressDto {
@ApiProperty({ description: '收货人姓名', example: '张三' })
@IsString()
receiver_name: string;
@ApiProperty({ description: '收货人手机号', example: '13800138000' })
@IsString()
receiver_mobile: string;
@ApiProperty({ description: '省份', example: '广东省' })
@IsString()
province: string;
@ApiProperty({ description: '城市', example: '深圳市' })
@IsString()
city: string;
@ApiProperty({ description: '区县', example: '南山区' })
@IsString()
district: string;
@ApiProperty({ description: '详细地址', example: '科技园路1号' })
@IsString()
address: string;
@ApiProperty({ description: '是否默认地址', example: 0, required: false })
@IsOptional()
@IsInt()
is_default?: number;
}
export class CreateMemberAdminDto {
@ApiProperty({ description: '站点ID', example: 0 })
@IsOptional()
@IsInt()
@@ -23,7 +67,11 @@ export class CreateMemberDto {
@IsMobilePhone('zh-CN')
mobile: string;
@ApiProperty({ description: '邮箱', example: 'test@example.com', required: false })
@ApiProperty({
description: '邮箱',
example: 'test@example.com',
required: false,
})
@IsOptional()
@IsEmail()
email?: string;
@@ -54,6 +102,17 @@ export class CreateMemberDto {
@IsOptional()
@IsInt()
status?: number;
@ApiProperty({
description: '会员地址列表',
type: [MemberAddressDto],
required: false,
})
@IsOptional()
@IsArray()
@ValidateNested({ each: true })
@Type(() => MemberAddressDto)
addresses?: MemberAddressDto[];
}
export class UpdateMemberDto {
@@ -63,12 +122,20 @@ export class UpdateMemberDto {
@MaxLength(50)
nickname?: string;
@ApiProperty({ description: '手机号', example: '13800138000', required: false })
@ApiProperty({
description: '手机号',
example: '13800138000',
required: false,
})
@IsOptional()
@IsMobilePhone('zh-CN')
mobile?: string;
@ApiProperty({ description: '邮箱', example: 'new@example.com', required: false })
@ApiProperty({
description: '邮箱',
example: 'new@example.com',
required: false,
})
@IsOptional()
@IsEmail()
email?: string;
@@ -89,7 +156,11 @@ export class UpdateMemberDto {
@IsDateString()
birthday?: string;
@ApiProperty({ description: '身份证号', example: '110101199001011234', required: false })
@ApiProperty({
description: '身份证号',
example: '110101199001011234',
required: false,
})
@IsOptional()
@IsString()
@MaxLength(18)
@@ -110,6 +181,17 @@ export class UpdateMemberDto {
@IsString()
@MaxLength(255)
remark?: string;
@ApiProperty({
description: '会员地址列表',
type: [MemberAddressDto],
required: false,
})
@IsOptional()
@IsArray()
@ValidateNested({ each: true })
@Type(() => MemberAddressDto)
addresses?: MemberAddressDto[];
}
export class QueryMemberDto {
@@ -138,12 +220,20 @@ export class QueryMemberDto {
@IsInt()
level_id?: number;
@ApiProperty({ description: '开始日期', example: '2024-01-01', required: false })
@ApiProperty({
description: '开始日期',
example: '2024-01-01',
required: false,
})
@IsOptional()
@IsDateString()
start_date?: string;
@ApiProperty({ description: '结束日期', example: '2024-12-31', required: false })
@ApiProperty({
description: '结束日期',
example: '2024-12-31',
required: false,
})
@IsOptional()
@IsDateString()
end_date?: string;
@@ -154,7 +244,7 @@ export class QueryMemberDto {
site_id?: number;
}
export class BatchUpdateStatusDto {
export class BatchUpdateMemberStatusDto {
@ApiProperty({ description: '会员ID数组', example: [1, 2, 3] })
@IsNumber({}, { each: true })
member_ids: number[];
@@ -193,7 +283,7 @@ export class AdjustBalanceDto {
@IsInt()
member_id: number;
@ApiProperty({ description: '余额调整数量', example: 50.00 })
@ApiProperty({ description: '余额调整数量', example: 50.0 })
@IsNumber()
amount: number;
@@ -202,7 +292,7 @@ export class AdjustBalanceDto {
reason: string;
}
export class ResetPasswordDto {
export class ResetMemberPasswordDto {
@ApiProperty({ description: '会员ID', example: 1 })
@IsInt()
member_id: number;
@@ -212,4 +302,4 @@ export class ResetPasswordDto {
@MinLength(6)
@MaxLength(20)
new_password: string;
}
}

31
wwjcloud/src/common/member/dto/api/MemberDto.ts
View File

@@ -1,7 +1,14 @@
import { IsString, IsEmail, IsOptional, IsMobilePhone, MinLength, MaxLength } from 'class-validator';
import {
IsString,
IsEmail,
IsOptional,
IsMobilePhone,
MinLength,
MaxLength,
} from 'class-validator';
import { ApiProperty } from '@nestjs/swagger';
export class CreateMemberDto {
export class CreateMemberApiDto {
@ApiProperty({ description: '用户名', example: 'testuser' })
@IsString()
@MinLength(3)
@@ -18,7 +25,11 @@ export class CreateMemberDto {
@IsMobilePhone('zh-CN')
mobile: string;
@ApiProperty({ description: '邮箱', example: 'test@example.com', required: false })
@ApiProperty({
description: '邮箱',
example: 'test@example.com',
required: false,
})
@IsOptional()
@IsEmail()
email?: string;
@@ -72,7 +83,11 @@ export class UpdateProfileDto {
@MaxLength(50)
nickname?: string;
@ApiProperty({ description: '邮箱', example: 'new@example.com', required: false })
@ApiProperty({
description: '邮箱',
example: 'new@example.com',
required: false,
})
@IsOptional()
@IsEmail()
email?: string;
@@ -91,7 +106,11 @@ export class UpdateProfileDto {
@IsOptional()
birthday?: Date;
@ApiProperty({ description: '身份证号', example: '110101199001011234', required: false })
@ApiProperty({
description: '身份证号',
example: '110101199001011234',
required: false,
})
@IsOptional()
@IsString()
@MaxLength(18)
@@ -147,4 +166,4 @@ export class SignDto {
@IsOptional()
@IsString()
device?: string;
}
}

12
wwjcloud/src/common/member/dto/member.dto.ts
View File

@@ -1,4 +1,10 @@
import { IsString, IsOptional, IsNumber, IsArray, ValidateNested } from 'class-validator';
import {
IsString,
IsOptional,
IsNumber,
IsArray,
ValidateNested,
} from 'class-validator';
import { Type } from 'class-transformer';
export class MemberAddressDto {
@@ -25,7 +31,7 @@ export class MemberAddressDto {
is_default?: number;
}
export class CreateMemberDto {
export class CreateMemberCoreDto {
@IsString()
username: string;
@@ -81,4 +87,4 @@ export class UpdateMemberDto {
@Type(() => MemberAddressDto)
@IsOptional()
addresses?: MemberAddressDto[];
}
}

114
wwjcloud/src/common/member/entities/Member.ts
View File

@@ -1,4 +1,12 @@
import { Entity, PrimaryGeneratedColumn, Column, OneToMany, ManyToOne, JoinColumn } from 'typeorm';
import {
Entity,
PrimaryGeneratedColumn,
Column,
OneToMany,
ManyToOne,
JoinColumn,
} from 'typeorm';
import { BaseEntity } from '@wwjCore/base/BaseEntity';
import { MemberAccount } from './MemberAccount';
import { MemberCashOut } from './MemberCashOut';
import { MemberLabel } from './MemberLabel';
@@ -8,7 +16,7 @@ import { MemberAddress } from './MemberAddress';
import { MemberAccountLog } from './MemberAccountLog';
@Entity('member')
export class Member {
export class Member extends BaseEntity {
@PrimaryGeneratedColumn({ name: 'member_id' })
member_id: number;
@@ -18,9 +26,6 @@ export class Member {
@Column({ name: 'pid', type: 'int', default: 0 })
pid: number;
@Column({ name: 'site_id', type: 'int', default: 0 })
site_id: number;
@Column({ name: 'username', type: 'varchar', length: 255, default: '' })
username: string;
@@ -57,7 +62,12 @@ export class Member {
@Column({ name: 'douyin_openid', type: 'varchar', length: 255, default: '' })
douyin_openid: string;
@Column({ name: 'register_channel', type: 'varchar', length: 255, default: 'H5' })
@Column({
name: 'register_channel',
type: 'varchar',
length: 255,
default: 'H5',
})
register_channel: string;
@Column({ name: 'register_type', type: 'varchar', length: 255, default: '' })
@@ -78,9 +88,6 @@ export class Member {
@Column({ name: 'login_time', type: 'int', default: 0 })
login_time: number;
@Column({ name: 'create_time', type: 'int', default: 0 })
create_time: number;
@Column({ name: 'last_visit_time', type: 'int', default: 0 })
last_visit_time: number;
@@ -105,19 +112,49 @@ export class Member {
@Column({ name: 'point_get', type: 'int', default: 0 })
point_get: number;
@Column({ name: 'balance', type: 'decimal', precision: 10, scale: 2, default: 0 })
@Column({
name: 'balance',
type: 'decimal',
precision: 10,
scale: 2,
default: 0,
})
balance: number;
@Column({ name: 'balance_get', type: 'decimal', precision: 10, scale: 2, default: 0 })
@Column({
name: 'balance_get',
type: 'decimal',
precision: 10,
scale: 2,
default: 0,
})
balance_get: number;
@Column({ name: 'money', type: 'decimal', precision: 10, scale: 2, default: 0 })
@Column({
name: 'money',
type: 'decimal',
precision: 10,
scale: 2,
default: 0,
})
money: number;
@Column({ name: 'money_get', type: 'decimal', precision: 10, scale: 2, default: 0 })
@Column({
name: 'money_get',
type: 'decimal',
precision: 10,
scale: 2,
default: 0,
})
money_get: number;
@Column({ name: 'money_cash_outing', type: 'decimal', precision: 10, scale: 2, default: 0 })
@Column({
name: 'money_cash_outing',
type: 'decimal',
precision: 10,
scale: 2,
default: 0,
})
money_cash_outing: number;
@Column({ name: 'growth', type: 'int', default: 0 })
@@ -126,13 +163,31 @@ export class Member {
@Column({ name: 'growth_get', type: 'int', default: 0 })
growth_get: number;
@Column({ name: 'commission', type: 'decimal', precision: 10, scale: 2, default: 0 })
@Column({
name: 'commission',
type: 'decimal',
precision: 10,
scale: 2,
default: 0,
})
commission: number;
@Column({ name: 'commission_get', type: 'decimal', precision: 10, scale: 2, default: 0 })
@Column({
name: 'commission_get',
type: 'decimal',
precision: 10,
scale: 2,
default: 0,
})
commission_get: number;
@Column({ name: 'commission_cash_outing', type: 'decimal', precision: 10, scale: 2, default: 0 })
@Column({
name: 'commission_cash_outing',
type: 'decimal',
precision: 10,
scale: 2,
default: 0,
})
commission_cash_outing: number;
@Column({ name: 'is_member', type: 'tinyint', default: 0 })
@@ -141,9 +196,6 @@ export class Member {
@Column({ name: 'member_time', type: 'int', default: 0 })
member_time: number;
@Column({ name: 'is_del', type: 'tinyint', default: 0 })
is_del: number;
@Column({ name: 'province_id', type: 'int', default: 0 })
province_id: number;
@@ -162,32 +214,26 @@ export class Member {
@Column({ name: 'remark', type: 'varchar', length: 300, default: '' })
remark: string;
@Column({ name: 'delete_time', type: 'int', default: 0 })
delete_time: number;
@Column({ name: 'update_time', type: 'int', default: 0 })
update_time: number;
// 关联关系
@OneToMany(() => MemberAccount, account => account.member)
@OneToMany(() => MemberAccount, (account) => account.member)
accounts: MemberAccount[];
@OneToMany(() => MemberCashOut, cashOut => cashOut.member)
@OneToMany(() => MemberCashOut, (cashOut) => cashOut.member)
cashOuts: MemberCashOut[];
@OneToMany(() => MemberLabel, label => label.member)
@OneToMany(() => MemberLabel, (label) => label.member)
labels: MemberLabel[];
@OneToMany(() => MemberSign, sign => sign.member)
@OneToMany(() => MemberSign, (sign) => sign.member)
signs: MemberSign[];
@ManyToOne(() => MemberLevel, level => level.members)
@ManyToOne(() => MemberLevel, (level) => level.members)
@JoinColumn({ name: 'member_level' })
level: MemberLevel;
@OneToMany(() => MemberAddress, address => address.member)
@OneToMany(() => MemberAddress, (address) => address.member)
addresses: MemberAddress[];
@OneToMany(() => MemberAccountLog, accountLog => accountLog.member)
@OneToMany(() => MemberAccountLog, (accountLog) => accountLog.member)
accountLogs: MemberAccountLog[];
}
}

14
wwjcloud/src/common/member/entities/MemberAccount.ts
View File

@@ -1,4 +1,12 @@
import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, ManyToOne, JoinColumn } from 'typeorm';
import {
Entity,
PrimaryGeneratedColumn,
Column,
CreateDateColumn,
UpdateDateColumn,
ManyToOne,
JoinColumn,
} from 'typeorm';
import { Member } from './Member';
@Entity('member_account')
@@ -55,7 +63,7 @@ export class MemberAccount {
update_time: Date;
// 关联关系
@ManyToOne(() => Member, member => member.accounts)
@ManyToOne(() => Member, (member) => member.accounts)
@JoinColumn({ name: 'member_id' })
member: Member;
}
}

36
wwjcloud/src/common/member/entities/MemberAccountLog.ts
View File

@@ -1,4 +1,11 @@
import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, ManyToOne, JoinColumn } from 'typeorm';
import {
Entity,
PrimaryGeneratedColumn,
Column,
CreateDateColumn,
ManyToOne,
JoinColumn,
} from 'typeorm';
import { Member } from './Member';
@Entity('member_account_log')
@@ -12,13 +19,30 @@ export class MemberAccountLog {
@Column({ name: 'site_id', type: 'int', default: 0 })
site_id: number;
@Column({ name: 'account_type', type: 'varchar', length: 255, default: 'point' })
@Column({
name: 'account_type',
type: 'varchar',
length: 255,
default: 'point',
})
account_type: string;
@Column({ name: 'account_data', type: 'decimal', precision: 10, scale: 2, default: 0 })
@Column({
name: 'account_data',
type: 'decimal',
precision: 10,
scale: 2,
default: 0,
})
account_data: number;
@Column({ name: 'account_sum', type: 'decimal', precision: 10, scale: 2, default: 0 })
@Column({
name: 'account_sum',
type: 'decimal',
precision: 10,
scale: 2,
default: 0,
})
account_sum: number;
@Column({ name: 'from_type', type: 'varchar', length: 255, default: '' })
@@ -34,7 +58,7 @@ export class MemberAccountLog {
memo: string;
// 关联关系
@ManyToOne(() => Member, member => member.accountLogs)
@ManyToOne(() => Member, (member) => member.accountLogs)
@JoinColumn({ name: 'member_id' })
member: Member;
}
}

16
wwjcloud/src/common/member/entities/MemberAddress.ts
View File

@@ -1,17 +1,21 @@
import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn } from 'typeorm';
import {
Entity,
PrimaryGeneratedColumn,
Column,
ManyToOne,
JoinColumn,
} from 'typeorm';
import { BaseEntity } from '@wwjCore/base/BaseEntity';
import { Member } from './Member';
@Entity('member_address')
export class MemberAddress {
export class MemberAddress extends BaseEntity {
@PrimaryGeneratedColumn({ name: 'id' })
id: number;
@Column({ name: 'member_id', type: 'int', default: 0 })
member_id: number;
@Column({ name: 'site_id', type: 'int', default: 0 })
site_id: number;
@Column({ name: 'name', type: 'varchar', length: 255, default: '' })
name: string;
@@ -48,4 +52,4 @@ export class MemberAddress {
@ManyToOne(() => Member)
@JoinColumn({ name: 'member_id' })
member: Member;
}
}

20
wwjcloud/src/common/member/entities/MemberBalance.ts
View File

@@ -1,4 +1,12 @@
import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn, CreateDateColumn, UpdateDateColumn } from 'typeorm';
import {
Entity,
PrimaryGeneratedColumn,
Column,
ManyToOne,
JoinColumn,
CreateDateColumn,
UpdateDateColumn,
} from 'typeorm';
import { Member } from './Member';
@Entity('member_balance')
@@ -12,7 +20,13 @@ export class MemberBalance {
@Column({ name: 'site_id', type: 'int', default: 1 })
site_id: number;
@Column({ name: 'balance', type: 'decimal', precision: 10, scale: 2, default: 0 })
@Column({
name: 'balance',
type: 'decimal',
precision: 10,
scale: 2,
default: 0,
})
balance: number;
@Column({ name: 'balance_type', type: 'varchar', length: 50 })
@@ -36,4 +50,4 @@ export class MemberBalance {
@ManyToOne(() => Member)
@JoinColumn({ name: 'member_id' })
member: Member;
}
}

28
wwjcloud/src/common/member/entities/MemberCashOut.ts
View File

@@ -1,4 +1,12 @@
import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, ManyToOne, JoinColumn } from 'typeorm';
import {
Entity,
PrimaryGeneratedColumn,
Column,
CreateDateColumn,
UpdateDateColumn,
ManyToOne,
JoinColumn,
} from 'typeorm';
import { Member } from './Member';
@Entity('member_cash_out')
@@ -18,7 +26,13 @@ export class MemberCashOut {
@Column({ type: 'decimal', precision: 10, scale: 2, comment: '提现金额' })
amount: number;
@Column({ type: 'decimal', precision: 10, scale: 2, default: 0, comment: '手续费' })
@Column({
type: 'decimal',
precision: 10,
scale: 2,
default: 0,
comment: '手续费',
})
fee: number;
@Column({ type: 'decimal', precision: 10, scale: 2, comment: '实际到账金额' })
@@ -39,7 +53,11 @@ export class MemberCashOut {
@Column({ type: 'varchar', length: 255, comment: '提现备注' })
remark: string;
@Column({ type: 'tinyint', default: 0, comment: '状态 0:待审核 1:审核通过 2:审核拒绝 3:提现成功 4:提现失败' })
@Column({
type: 'tinyint',
default: 0,
comment: '状态 0:待审核 1:审核通过 2:审核拒绝 3:提现成功 4:提现失败',
})
status: number;
@Column({ type: 'varchar', length: 255, comment: '拒绝原因' })
@@ -64,7 +82,7 @@ export class MemberCashOut {
update_time: Date;
// 关联关系
@ManyToOne(() => Member, member => member.cashOuts)
@ManyToOne(() => Member, (member) => member.cashOuts)
@JoinColumn({ name: 'member_id' })
member: Member;
}
}

10
wwjcloud/src/common/member/entities/MemberConfig.ts
View File

@@ -1,4 +1,10 @@
import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn } from 'typeorm';
import {
Entity,
PrimaryGeneratedColumn,
Column,
CreateDateColumn,
UpdateDateColumn,
} from 'typeorm';
@Entity('member_config')
export class MemberConfig {
@@ -34,4 +40,4 @@ export class MemberConfig {
@UpdateDateColumn({ comment: '更新时间' })
update_time: Date;
}
}

14
wwjcloud/src/common/member/entities/MemberLabel.ts
View File

@@ -1,4 +1,12 @@
import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, ManyToOne, JoinColumn } from 'typeorm';
import {
Entity,
PrimaryGeneratedColumn,
Column,
CreateDateColumn,
UpdateDateColumn,
ManyToOne,
JoinColumn,
} from 'typeorm';
import { Member } from './Member';
@Entity('member_label')
@@ -37,7 +45,7 @@ export class MemberLabel {
update_time: Date;
// 关联关系
@ManyToOne(() => Member, member => member.labels)
@ManyToOne(() => Member, (member) => member.labels)
@JoinColumn({ name: 'member_id' })
member: Member;
}
}

37
wwjcloud/src/common/member/entities/MemberLevel.ts
View File

@@ -1,14 +1,12 @@
import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, OneToMany } from 'typeorm';
import { Entity, PrimaryGeneratedColumn, Column, OneToMany } from 'typeorm';
import { BaseEntity } from '@wwjCore/base/BaseEntity';
import { Member } from './Member';
@Entity('member_level')
export class MemberLevel {
export class MemberLevel extends BaseEntity {
@PrimaryGeneratedColumn()
level_id: number;
@Column({ type: 'int', default: 0, comment: '站点ID' })
site_id: number;
@Column({ type: 'varchar', length: 50, comment: '等级名称' })
level_name: string;
@@ -18,10 +16,22 @@ export class MemberLevel {
@Column({ type: 'int', default: 0, comment: '升级所需积分' })
upgrade_point: number;
@Column({ type: 'decimal', precision: 5, scale: 2, default: 1.0, comment: '积分倍率' })
@Column({
type: 'decimal',
precision: 5,
scale: 2,
default: 1.0,
comment: '积分倍率',
})
point_rate: number;
@Column({ type: 'decimal', precision: 5, scale: 2, default: 1.0, comment: '折扣率' })
@Column({
type: 'decimal',
precision: 5,
scale: 2,
default: 1.0,
comment: '折扣率',
})
discount_rate: number;
@Column({ type: 'int', default: 0, comment: '排序' })
@@ -36,16 +46,7 @@ export class MemberLevel {
@Column({ type: 'varchar', length: 255, comment: '等级权益' })
benefits: string;
@Column({type: 'tinyint', default: 0, comment: '是否删除 0:否 1:是' })
is_del: number;
@CreateDateColumn({ comment: '创建时间' })
create_time: Date;
@UpdateDateColumn({ comment: '更新时间' })
update_time: Date;
// 关联关系
@OneToMany(() => Member, member => member.level)
@OneToMany(() => Member, (member) => member.level)
members: Member[];
}
}

12
wwjcloud/src/common/member/entities/MemberPoints.ts
View File

@@ -1,4 +1,12 @@
import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn, CreateDateColumn, UpdateDateColumn } from 'typeorm';
import {
Entity,
PrimaryGeneratedColumn,
Column,
ManyToOne,
JoinColumn,
CreateDateColumn,
UpdateDateColumn,
} from 'typeorm';
import { Member } from './Member';
@Entity('member_points')
@@ -36,4 +44,4 @@ export class MemberPoints {
@ManyToOne(() => Member)
@JoinColumn({ name: 'member_id' })
member: Member;
}
}

14
wwjcloud/src/common/member/entities/MemberSign.ts
View File

@@ -1,4 +1,12 @@
import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, ManyToOne, JoinColumn } from 'typeorm';
import {
Entity,
PrimaryGeneratedColumn,
Column,
CreateDateColumn,
UpdateDateColumn,
ManyToOne,
JoinColumn,
} from 'typeorm';
import { Member } from './Member';
@Entity('member_sign')
@@ -46,7 +54,7 @@ export class MemberSign {
update_time: Date;
// 关联关系
@ManyToOne(() => Member, member => member.signs)
@ManyToOne(() => Member, (member) => member.signs)
@JoinColumn({ name: 'member_id' })
member: Member;
}
}

8
wwjcloud/src/common/member/member.module.ts
View File

@@ -1,5 +1,6 @@
import { Module } from '@nestjs/common';
import { Module, forwardRef } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { AuthModule } from '../auth/auth.module';
import { Member } from './entities/Member';
import { MemberLevel } from './entities/MemberLevel';
import { MemberAddress } from './entities/MemberAddress';
@@ -7,6 +8,7 @@ import { MemberSign } from './entities/MemberSign';
import { MemberCashOut } from './entities/MemberCashOut';
import { MemberLabel } from './entities/MemberLabel';
import { MemberAccount } from './entities/MemberAccount';
import { MemberAccountLog } from './entities/MemberAccountLog';
import { MemberPoints } from './entities/MemberPoints';
import { MemberBalance } from './entities/MemberBalance';
import { MemberConfig } from './entities/MemberConfig';
@@ -18,6 +20,7 @@ import { MemberController as MemberAdminController } from './controllers/adminap
@Module({
imports: [
forwardRef(() => AuthModule),
TypeOrmModule.forFeature([
Member,
MemberLevel,
@@ -26,6 +29,7 @@ import { MemberController as MemberAdminController } from './controllers/adminap
MemberCashOut,
MemberLabel,
MemberAccount,
MemberAccountLog,
MemberPoints,
MemberBalance,
MemberConfig,
@@ -35,4 +39,4 @@ import { MemberController as MemberAdminController } from './controllers/adminap
controllers: [MemberApiController, MemberAdminController],
exports: [CoreMemberService, MemberApiService, MemberAdminService],
})
export class MemberModule {}
export class MemberModule {}

113
wwjcloud/src/common/member/services/admin/MemberService.ts
View File

@@ -1,4 +1,8 @@
import { Injectable, BadRequestException, NotFoundException } from '@nestjs/common';
import {
Injectable,
BadRequestException,
NotFoundException,
} from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository, Like, Between, In } from 'typeorm';
import { Member } from '../../entities/Member';
@@ -6,7 +10,7 @@ import { MemberLevel } from '../../entities/MemberLevel';
import { MemberAddress } from '../../entities/MemberAddress';
import { CoreMemberService } from '../core/CoreMemberService';
import * as bcrypt from 'bcrypt';
import { CreateMemberDto, UpdateMemberDto } from '../../dto/member.dto';
import { CreateMemberAdminDto, UpdateMemberDto } from '../../dto/admin/MemberDto';
@Injectable()
export class MemberService {
@@ -24,21 +28,22 @@ export class MemberService {
* 获取会员列表（分页）
*/
async getMemberList(queryDto: any): Promise<any> {
const {
page = 1,
limit = 20,
keyword,
status,
level_id,
start_date,
const {
page = 1,
limit = 20,
keyword,
status,
level_id,
start_date,
end_date,
site_id = 0
site_id = 0,
} = queryDto;
const queryBuilder = this.memberRepository.createQueryBuilder('member')
const queryBuilder = this.memberRepository
.createQueryBuilder('member')
.leftJoinAndSelect('member.level', 'level')
.where('member.is_delete = :isDelete', { isDelete: 0 })
.orderBy('member.register_time', 'DESC');
.where('member.is_del = :isDel', { isDel: 0 })
.orderBy('member.create_time', 'DESC');
// 站点筛选
if (site_id > 0) {
@@ -49,7 +54,7 @@ export class MemberService {
if (keyword) {
queryBuilder.andWhere(
'(member.username LIKE :keyword OR member.nickname LIKE :keyword OR member.mobile LIKE :keyword OR member.email LIKE :keyword)',
{ keyword: `%${keyword}%` }
{ keyword: `%${keyword}%` },
);
}
@@ -60,15 +65,20 @@ export class MemberService {
// 等级筛选
if (level_id) {
queryBuilder.andWhere('member.level_id = :levelId', { levelId: level_id });
queryBuilder.andWhere('member.level_id = :levelId', {
levelId: level_id,
});
}
// 日期范围筛选
if (start_date && end_date) {
queryBuilder.andWhere('member.register_time BETWEEN :startDate AND :endDate', {
startDate: new Date(start_date),
endDate: new Date(end_date),
});
queryBuilder.andWhere(
'member.register_time BETWEEN :startDate AND :endDate',
{
startDate: new Date(start_date),
endDate: new Date(end_date),
},
);
}
const [members, total] = await queryBuilder
@@ -101,16 +111,18 @@ export class MemberService {
return member;
}
async createMember(memberData: CreateMemberDto): Promise<Member> {
async createMember(memberData: CreateMemberAdminDto): Promise<Member> {
// 检查用户名是否已存在
const exists = await this.memberCoreService.isUsernameExists(memberData.username);
const exists = await this.memberCoreService.isUsernameExists(
memberData.username,
);
if (exists) {
throw new Error('用户名已存在');
}
// 创建会员
const member = await this.memberCoreService.createMember(memberData);
// 创建会员地址
if (memberData.addresses && memberData.addresses.length > 0) {
for (const addressData of memberData.addresses) {
@@ -121,7 +133,10 @@ export class MemberService {
return member;
}
async updateMember(memberId: number, updateData: UpdateMemberDto): Promise<Member> {
async updateMember(
memberId: number,
updateData: UpdateMemberDto,
): Promise<Member> {
// 检查会员是否存在
const member = await this.memberCoreService.getMemberById(memberId);
if (!member) {
@@ -129,15 +144,17 @@ export class MemberService {
}
// 更新会员信息
const updatedMember = await this.memberCoreService.updateMember(memberId, updateData);
await this.memberCoreService.updateMember(memberId, updateData);
// 更新会员地址
if (updateData.addresses !== undefined) {
await this.updateMemberAddresses(memberId, updateData.addresses);
}
// 返回更新后的会员信息
const updatedMember = await this.memberCoreService.getMemberById(memberId);
if (!updatedMember) {
throw new Error('更新后的会员不存在');
throw new NotFoundException('更新后的会员不存在');
}
return updatedMember;
}
@@ -151,7 +168,7 @@ export class MemberService {
// 删除会员
await this.memberCoreService.deleteMember(memberId);
// 删除相关数据
await this.deleteMemberRelatedData(memberId);
}
@@ -172,14 +189,20 @@ export class MemberService {
/**
* 批量更新会员状态
*/
async batchUpdateMemberStatus(memberIds: number[], status: number): Promise<void> {
async batchUpdateMemberStatus(
memberIds: number[],
status: number,
): Promise<void> {
await this.memberRepository.update(memberIds, { status });
}
/**
* 重置会员密码
*/
async resetMemberPassword(memberId: number, newPassword: string): Promise<void> {
async resetMemberPassword(
memberId: number,
newPassword: string,
): Promise<void> {
const hashedPassword = await bcrypt.hash(newPassword, 10);
await this.memberRepository.update(memberId, { password: hashedPassword });
}
@@ -191,7 +214,10 @@ export class MemberService {
await this.memberRepository.update(memberId, { member_level: levelId });
}
async batchAssignMemberLevel(memberIds: number[], levelId: number): Promise<void> {
async batchAssignMemberLevel(
memberIds: number[],
levelId: number,
): Promise<void> {
for (const memberId of memberIds) {
await this.assignMemberLevel(memberId, levelId);
}
@@ -200,7 +226,11 @@ export class MemberService {
/**
* 调整会员积分
*/
async adjustMemberPoints(memberId: number, points: number, reason: string): Promise<void> {
async adjustMemberPoints(
memberId: number,
points: number,
reason: string,
): Promise<void> {
if (points > 0) {
await this.memberCoreService.addPoints(memberId, points);
} else {
@@ -214,7 +244,11 @@ export class MemberService {
/**
* 调整会员余额
*/
async adjustMemberBalance(memberId: number, amount: number, reason: string): Promise<void> {
async adjustMemberBalance(
memberId: number,
amount: number,
reason: string,
): Promise<void> {
if (amount > 0) {
await this.memberCoreService.addBalance(memberId, amount);
} else {
@@ -235,10 +269,10 @@ export class MemberService {
}
const totalMembers = await this.memberRepository.count({ where });
const activeMembers = await this.memberRepository.count({
where: { ...where, status: 1 }
const activeMembers = await this.memberRepository.count({
where: { ...where, status: 1 },
});
const todayNewMembers = await this.memberRepository.count({
where: {
...where,
@@ -285,7 +319,7 @@ export class MemberService {
const results = {
success: 0,
failed: 0,
errors: [] as Array<{row: any, error: string}>,
errors: [] as Array<{ row: any; error: string }>,
};
for (const data of importData) {
@@ -321,7 +355,10 @@ export class MemberService {
/**
* 更新会员地址
*/
async updateMemberAddresses(memberId: number, addresses: any[]): Promise<void> {
async updateMemberAddresses(
memberId: number,
addresses: any[],
): Promise<void> {
// 实现更新会员地址逻辑
for (const addressData of addresses) {
if (addressData.address_id) {
@@ -341,4 +378,4 @@ export class MemberService {
await this.memberAddressRepository.delete({ member_id: memberId });
// 可以添加其他相关数据的删除逻辑
}
}
}

162
wwjcloud/src/common/member/services/api/MemberService.ts
View File

@@ -1,4 +1,8 @@
import { Injectable, BadRequestException, UnauthorizedException } from '@nestjs/common';
import {
Injectable,
BadRequestException,
UnauthorizedException,
} from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository, Not } from 'typeorm';
import { CoreMemberService } from '../core/CoreMemberService';
@@ -24,20 +28,26 @@ export class MemberService {
*/
async register(registerDto: any): Promise<any> {
// 检查用户名是否已存在
const existingUser = await this.memberCoreService.findByUsername(registerDto.username);
const existingUser = await this.memberCoreService.findByUsername(
registerDto.username,
);
if (existingUser) {
throw new BadRequestException('用户名已存在');
}
// 检查手机号是否已存在
const existingMobile = await this.memberCoreService.findByMobile(registerDto.mobile);
const existingMobile = await this.memberCoreService.findByMobile(
registerDto.mobile,
);
if (existingMobile) {
throw new BadRequestException('手机号已存在');
}
// 检查邮箱是否已存在
if (registerDto.email) {
const existingEmail = await this.memberCoreService.findByEmail(registerDto.email);
const existingEmail = await this.memberCoreService.findByEmail(
registerDto.email,
);
if (existingEmail) {
throw new BadRequestException('邮箱已存在');
}
@@ -45,7 +55,7 @@ export class MemberService {
// 创建会员
const member = await this.memberCoreService.create(registerDto);
// 返回注册成功信息（不包含密码）
const { password, ...result } = member;
return result;
@@ -56,7 +66,7 @@ export class MemberService {
*/
async login(loginDto: any): Promise<any> {
const { username, password } = loginDto;
// 查找会员
const member = await this.memberCoreService.findByUsername(username);
if (!member) {
@@ -64,7 +74,10 @@ export class MemberService {
}
// 验证密码
const isValidPassword = await this.memberCoreService.validatePassword(member, password);
const isValidPassword = await this.memberCoreService.validatePassword(
member,
password,
);
if (!isValidPassword) {
throw new UnauthorizedException('用户名或密码错误');
}
@@ -91,7 +104,7 @@ export class MemberService {
*/
async getProfile(memberId: number): Promise<any> {
const member = await this.memberCoreService.findById(memberId);
// 返回会员信息（不包含密码）
const { password, ...result } = member;
return result;
@@ -111,7 +124,10 @@ export class MemberService {
// 检查用户名是否重复
if (updateDto.username) {
const exists = await this.memberCoreService.isUsernameExists(updateDto.username, memberId);
const exists = await this.memberCoreService.isUsernameExists(
updateDto.username,
memberId,
);
if (exists) {
throw new BadRequestException('用户名已存在');
}
@@ -119,7 +135,10 @@ export class MemberService {
// 检查手机号是否重复
if (updateDto.mobile) {
const exists = await this.memberCoreService.isMobileExists(updateDto.mobile, memberId);
const exists = await this.memberCoreService.isMobileExists(
updateDto.mobile,
memberId,
);
if (exists) {
throw new BadRequestException('手机号已存在');
}
@@ -127,7 +146,10 @@ export class MemberService {
// 检查邮箱是否重复
if (updateDto.email) {
const exists = await this.memberCoreService.isEmailExists(updateDto.email, memberId);
const exists = await this.memberCoreService.isEmailExists(
updateDto.email,
memberId,
);
if (exists) {
throw new BadRequestException('邮箱已存在');
}
@@ -140,13 +162,19 @@ export class MemberService {
/**
* 修改密码
*/
async changePassword(memberId: number, changePasswordDto: any): Promise<void> {
async changePassword(
memberId: number,
changePasswordDto: any,
): Promise<void> {
const { oldPassword, newPassword } = changePasswordDto;
const member = await this.memberCoreService.findById(memberId);
// 验证旧密码
const isValidPassword = await this.memberCoreService.validatePassword(member, oldPassword);
const isValidPassword = await this.memberCoreService.validatePassword(
member,
oldPassword,
);
if (!isValidPassword) {
throw new BadRequestException('原密码错误');
}
@@ -161,7 +189,7 @@ export class MemberService {
*/
async resetPassword(resetDto: any): Promise<void> {
const { mobile, verifyCode, newPassword } = resetDto;
// 验证手机号
const member = await this.memberCoreService.findByMobile(mobile);
if (!member) {
@@ -172,13 +200,15 @@ export class MemberService {
if (!verifyCode) {
throw new Error('验证码不能为空');
}
// 这里应该验证验证码的有效性
// 可以从缓存中获取验证码进行比较
// 更新密码
const hashedPassword = await bcrypt.hash(newPassword, 10);
await this.memberCoreService.update(member.member_id, { password: hashedPassword });
await this.memberCoreService.update(member.member_id, {
password: hashedPassword,
});
}
/**
@@ -191,8 +221,8 @@ export class MemberService {
where: {
member_id: memberId,
sign_date: today,
is_del: 0
}
is_del: 0,
},
});
if (existingSign) {
@@ -202,16 +232,18 @@ export class MemberService {
// 2. 计算连续签到天数
const yesterday = new Date(today);
yesterday.setDate(yesterday.getDate() - 1);
const yesterdaySign = await this.memberSignRepository.findOne({
where: {
member_id: memberId,
sign_date: yesterday,
is_del: 0
}
is_del: 0,
},
});
const continuousDays = yesterdaySign ? yesterdaySign.continuous_days + 1 : 1;
const continuousDays = yesterdaySign
? yesterdaySign.continuous_days + 1
: 1;
// 3. 分配积分（根据连续签到天数计算）
const signPoints = this.calculateSignPoints(continuousDays);
@@ -226,7 +258,7 @@ export class MemberService {
sign_ip: signInfo.ip,
sign_address: signInfo.address,
sign_device: signInfo.device,
status: 1
status: 1,
});
await this.memberSignRepository.save(signRecord);
@@ -239,7 +271,7 @@ export class MemberService {
message: '签到成功',
continuous_days: continuousDays,
sign_point: signPoints,
total_points: await this.getMemberTotalPoints(memberId)
total_points: await this.getMemberTotalPoints(memberId),
};
}
@@ -247,8 +279,8 @@ export class MemberService {
* 计算签到积分
*/
private calculateSignPoints(continuousDays: number): number {
if (continuousDays >= 7) return 20; // 连续7天以上
if (continuousDays >= 3) return 15; // 连续3天以上
if (continuousDays >= 7) return 20; // 连续7天以上
if (continuousDays >= 3) return 15; // 连续3天以上
return 10; // 基础积分
}
@@ -265,24 +297,26 @@ export class MemberService {
*/
async getPointsHistory(memberId: number, queryDto: any): Promise<any> {
const { page = 1, limit = 20 } = queryDto;
// 查询积分变动记录
const [records, total] = await this.memberAccountLogRepository.findAndCount({
where: {
member_id: memberId,
account_type: 'point'
const [records, total] = await this.memberAccountLogRepository.findAndCount(
{
where: {
member_id: memberId,
account_type: 'point',
},
order: { create_time: 'DESC' },
skip: (page - 1) * limit,
take: limit,
},
order: { create_time: 'DESC' },
skip: (page - 1) * limit,
take: limit
});
);
return {
list: records,
total,
page,
limit,
total_pages: Math.ceil(total / limit)
total_pages: Math.ceil(total / limit),
};
}
@@ -291,24 +325,26 @@ export class MemberService {
*/
async getBalanceHistory(memberId: number, queryDto: any): Promise<any> {
const { page = 1, limit = 20 } = queryDto;
// 查询余额变动记录
const [records, total] = await this.memberAccountLogRepository.findAndCount({
where: {
member_id: memberId,
account_type: 'balance'
const [records, total] = await this.memberAccountLogRepository.findAndCount(
{
where: {
member_id: memberId,
account_type: 'balance',
},
order: { create_time: 'DESC' },
skip: (page - 1) * limit,
take: limit,
},
order: { create_time: 'DESC' },
skip: (page - 1) * limit,
take: limit
});
);
return {
list: records,
total,
page,
limit,
total_pages: Math.ceil(total / limit)
total_pages: Math.ceil(total / limit),
};
}
@@ -336,7 +372,7 @@ export class MemberService {
if (addressDto.is_default) {
await this.memberAddressRepository.update(
{ member_id: memberId, is_default: 1 },
{ is_default: 0 }
{ is_default: 0 },
);
}
@@ -344,7 +380,7 @@ export class MemberService {
...addressDto,
member_id: memberId,
site_id: addressDto.site_id || 0,
status: 1
status: 1,
});
return this.memberAddressRepository.save(addressDto);
@@ -353,10 +389,14 @@ export class MemberService {
/**
* 更新会员地址
*/
async updateAddress(memberId: number, addressId: number, addressDto: any): Promise<void> {
async updateAddress(
memberId: number,
addressId: number,
addressDto: any,
): Promise<void> {
// 验证地址是否属于当前会员
const address = await this.memberAddressRepository.findOne({
where: { id: addressId, member_id: memberId }
where: { id: addressId, member_id: memberId },
});
if (!address) {
@@ -367,7 +407,7 @@ export class MemberService {
if (addressDto.is_default) {
await this.memberAddressRepository.update(
{ member_id: memberId, is_default: 1, id: Not(addressId) },
{ is_default: 0 }
{ is_default: 0 },
);
}
@@ -380,7 +420,7 @@ export class MemberService {
async deleteAddress(memberId: number, addressId: number): Promise<void> {
// 验证地址是否属于当前会员
const address = await this.memberAddressRepository.findOne({
where: { id: addressId, member_id: memberId }
where: { id: addressId, member_id: memberId },
});
if (!address) {
@@ -397,7 +437,7 @@ export class MemberService {
async setDefaultAddress(memberId: number, addressId: number): Promise<void> {
// 验证地址是否属于当前会员
const address = await this.memberAddressRepository.findOne({
where: { id: addressId, member_id: memberId }
where: { id: addressId, member_id: memberId },
});
if (!address) {
@@ -406,8 +446,8 @@ export class MemberService {
// 先取消其他默认地址
await this.memberAddressRepository.update(
{ member_id: memberId, is_default: 1, id: Not(addressId) },
{ is_default: 0 }
{ member_id: memberId, is_default: 1, id: Not(addressId) },
{ is_default: 0 },
);
// 设置当前地址为默认
@@ -417,12 +457,14 @@ export class MemberService {
/**
* 会员登出
*/
async logout(memberId: number): Promise<{ success: boolean; message: string }> {
async logout(
memberId: number,
): Promise<{ success: boolean; message: string }> {
// 这里可以清除会员的登录状态、token 等
// 暂时返回成功状态
return {
success: true,
message: '登出成功'
message: '登出成功',
};
}
}
}

114
wwjcloud/src/common/member/services/core/CoreMemberService.ts
View File

@@ -1,34 +1,37 @@
import { Injectable, NotFoundException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository, Not, Between } from 'typeorm';
import { BaseService } from '@wwjCore/base/BaseService';
import { Member } from '../../entities/Member';
import { MemberLevel } from '../../entities/MemberLevel';
import * as bcrypt from 'bcrypt';
@Injectable()
export class CoreMemberService {
export class CoreMemberService extends BaseService<Member> {
constructor(
@InjectRepository(Member)
private memberRepository: Repository<Member>,
@InjectRepository(MemberLevel)
private memberLevelRepository: Repository<MemberLevel>,
) {}
) {
super(memberRepository);
}
/**
* 创建会员
*/
async create(createMemberDto: any): Promise<Member> {
const member = new Member();
// 生成会员编号
member.member_no = await this.generateMemberNo();
// 加密密码
member.password = await bcrypt.hash(createMemberDto.password, 10);
// 设置其他字段
Object.assign(member, createMemberDto);
return this.memberRepository.save(member);
}
@@ -44,37 +47,21 @@ export class CoreMemberService {
* 根据ID获取会员
*/
async getMemberById(memberId: number): Promise<Member | null> {
return await this.memberRepository.findOne({
where: { member_id: memberId, is_del: 0 },
});
}
/**
* 更新会员
*/
async updateMember(memberId: number, updateData: any): Promise<Member | null> {
await this.memberRepository.update(memberId, updateData);
return await this.getMemberById(memberId);
return await this.findOne(memberId);
}
/**
* 删除会员
*/
async deleteMember(memberId: number): Promise<void> {
await this.memberRepository.update(memberId, {
is_del: 1,
delete_time: Math.floor(Date.now() / 1000),
});
await this.delete(memberId);
}
/**
* 根据ID查找会员
*/
async findById(memberId: number): Promise<Member> {
const member = await this.memberRepository.findOne({
where: { member_id: memberId, is_del: 0 },
relations: ['level', 'addresses', 'labels'],
});
const member = await this.findOne(memberId);
if (!member) {
throw new NotFoundException('会员不存在');
@@ -87,26 +74,22 @@ export class CoreMemberService {
* 根据用户名查找会员
*/
async findByUsername(username: string): Promise<Member | null> {
return await this.memberRepository.findOne({
where: { username, is_del: 0 }
});
return await this.findOneBy({ username });
}
/**
* 根据手机号查找会员
*/
async findByMobile(mobile: string): Promise<Member | null> {
return await this.memberRepository.findOne({
where: { mobile, is_del: 0 }
});
return await this.findOneBy({ mobile });
}
/**
* 根据邮箱查找会员
*/
async findByEmail(email: string): Promise<Member | null> {
return await this.memberRepository.findOne({
where: { is_del: 0 }
return await this.memberRepository.findOne({
where: { is_del: 0 },
});
}
@@ -127,16 +110,16 @@ export class CoreMemberService {
/**
* 更新会员
*/
async update(memberId: number, updateDto: any): Promise<void> {
async updateMember(memberId: number, updateDto: any): Promise<void> {
const member = await this.findById(memberId);
// 不允许更新敏感字段
delete updateDto.member_id;
delete updateDto.member_no;
delete updateDto.site_id;
delete updateDto.register_time;
await this.memberRepository.update(memberId, updateDto);
await this.update(memberId, updateDto);
}
/**
@@ -161,17 +144,21 @@ export class CoreMemberService {
const year = date.getFullYear();
const month = String(date.getMonth() + 1).padStart(2, '0');
const day = String(date.getDate()).padStart(2, '0');
// 查询当天注册的会员数量
const todayStart = Math.floor(new Date(year, date.getMonth(), date.getDate()).getTime() / 1000);
const todayEnd = Math.floor(new Date(year, date.getMonth(), date.getDate() + 1).getTime() / 1000);
const todayStart = Math.floor(
new Date(year, date.getMonth(), date.getDate()).getTime() / 1000,
);
const todayEnd = Math.floor(
new Date(year, date.getMonth(), date.getDate() + 1).getTime() / 1000,
);
const todayCount = await this.memberRepository.count({
where: {
create_time: Between(todayStart, todayEnd),
is_del: 0,
},
});
const sequence = String(todayCount + 1).padStart(4, '0');
return `M${year}${month}${day}${sequence}`;
}
@@ -187,28 +174,44 @@ export class CoreMemberService {
* 增加积分
*/
async addPoints(memberId: number, points: number): Promise<void> {
await this.memberRepository.increment({ member_id: memberId }, 'point', points);
await this.memberRepository.increment(
{ member_id: memberId },
'point',
points,
);
}
/**
* 扣除积分
*/
async deductPoints(memberId: number, points: number): Promise<void> {
await this.memberRepository.decrement({ member_id: memberId }, 'point', points);
await this.memberRepository.decrement(
{ member_id: memberId },
'point',
points,
);
}
/**
* 增加余额
*/
async addBalance(memberId: number, amount: number): Promise<void> {
await this.memberRepository.increment({ member_id: memberId }, 'balance', amount);
await this.memberRepository.increment(
{ member_id: memberId },
'balance',
amount,
);
}
/**
* 扣除余额
*/
async deductBalance(memberId: number, amount: number): Promise<void> {
await this.memberRepository.decrement({ member_id: memberId }, 'balance', amount);
await this.memberRepository.decrement(
{ member_id: memberId },
'balance',
amount,
);
}
/**
@@ -224,12 +227,15 @@ export class CoreMemberService {
/**
* 检查用户名是否已存在
*/
async isUsernameExists(username: string, excludeId?: number): Promise<boolean> {
async isUsernameExists(
username: string,
excludeId?: number,
): Promise<boolean> {
const where: any = { username, is_del: 0 };
if (excludeId) {
where.member_id = Not(excludeId);
}
const count = await this.memberRepository.count({ where });
return count > 0;
}
@@ -242,7 +248,7 @@ export class CoreMemberService {
if (excludeId) {
where.member_id = Not(excludeId);
}
const count = await this.memberRepository.count({ where });
return count > 0;
}
@@ -255,7 +261,7 @@ export class CoreMemberService {
if (excludeId) {
where.member_id = Not(excludeId);
}
const count = await this.memberRepository.count({ where });
return count > 0;
}
@@ -270,16 +276,16 @@ export class CoreMemberService {
}
const totalMembers = await this.memberRepository.count({ where });
const activeMembers = await this.memberRepository.count({
where: { ...where, status: 1 }
const activeMembers = await this.memberRepository.count({
where: { ...where, status: 1 },
});
const todayNewMembers = await this.memberRepository.count({
where: {
...where,
create_time: Between(
Math.floor(new Date().setHours(0, 0, 0, 0) / 1000),
Math.floor(new Date().setHours(23, 59, 59, 999) / 1000)
Math.floor(new Date().setHours(23, 59, 59, 999) / 1000),
),
},
});
@@ -291,4 +297,4 @@ export class CoreMemberService {
inactive: totalMembers - activeMembers,
};
}
}
}