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

修复迁移后错误

Browse Source
This commit is contained in:
万物街
2025-09-11 22:06:19 +08:00
parent 7a20a0c50a
commit 6a3b302e69
193 changed files with 11792 additions and 1268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,20 +2,18 @@ import {
Entity,
PrimaryGeneratedColumn,
Column,
CreateDateColumn,
UpdateDateColumn,
ManyToOne,
JoinColumn,
} from 'typeorm';
import { BaseEntity } from '../../../core/base/BaseEntity';
import { Member } from './Member';
@Entity('member_account')
export class MemberAccount {
export class MemberAccount extends BaseEntity {
@PrimaryGeneratedColumn()
account_id: number;
@Column({ type: 'int', default: 0, comment: '站点ID' })
site_id: number;
// site_id 由 BaseEntity 提供
@Column({ type: 'int', comment: '会员ID' })
member_id: number;
@@ -53,14 +51,7 @@ export class MemberAccount {
@Column({ type: 'varchar', length: 255, comment: '备注' })
remark: string;
@Column({ type: 'tinyint', default: 0, comment: '是否删除 0:否 1:是' })
is_del: number;
@CreateDateColumn({ comment: '创建时间' })
create_time: Date;
@UpdateDateColumn({ comment: '更新时间' })
update_time: Date;
// is_del, create_time, update_time 由 BaseEntity 提供
// 关联关系
@ManyToOne(() => Member, (member) => member.accounts)

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

@@ -2,20 +2,18 @@ import {
Entity,
PrimaryGeneratedColumn,
Column,
CreateDateColumn,
UpdateDateColumn,
ManyToOne,
JoinColumn,
} from 'typeorm';
import { BaseEntity } from '../../../core/base/BaseEntity';
import { Member } from './Member';
@Entity('member_cash_out')
export class MemberCashOut {
export class MemberCashOut extends BaseEntity {
@PrimaryGeneratedColumn()
cash_out_id: number;
@Column({ type: 'int', default: 0, comment: '站点ID' })
site_id: number;
// site_id 由 BaseEntity 提供
@Column({ type: 'int', comment: '会员ID' })
member_id: number;
@@ -72,14 +70,7 @@ export class MemberCashOut {
@Column({ type: 'timestamp', nullable: true, comment: '提现时间' })
cash_out_time: Date;
@Column({ type: 'tinyint', default: 0, comment: '是否删除 0:否 1:是' })
is_del: number;
@CreateDateColumn({ comment: '创建时间' })
create_time: Date;
@UpdateDateColumn({ comment: '更新时间' })
update_time: Date;
// is_del, create_time, update_time 由 BaseEntity 提供
// 关联关系
@ManyToOne(() => Member, (member) => member.cashOuts)

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

@@ -2,20 +2,18 @@ import {
Entity,
PrimaryGeneratedColumn,
Column,
CreateDateColumn,
UpdateDateColumn,
ManyToOne,
JoinColumn,
} from 'typeorm';
import { BaseEntity } from '../../../core/base/BaseEntity';
import { Member } from './Member';
@Entity('member_label')
export class MemberLabel {
export class MemberLabel extends BaseEntity {
@PrimaryGeneratedColumn()
label_id: number;
@Column({ type: 'int', default: 0, comment: '站点ID' })
site_id: number;
// site_id 由 BaseEntity 提供
@Column({ type: 'int', comment: '会员ID' })
member_id: number;
@@ -35,14 +33,7 @@ export class MemberLabel {
@Column({ type: 'tinyint', default: 1, comment: '状态 1:启用 0:禁用' })
status: number;
@Column({ type: 'tinyint', default: 0, comment: '是否删除 0:否 1:是' })
is_del: number;
@CreateDateColumn({ comment: '创建时间' })
create_time: Date;
@UpdateDateColumn({ comment: '更新时间' })
update_time: Date;
// is_del, create_time, update_time 由 BaseEntity 提供
// 关联关系
@ManyToOne(() => Member, (member) => member.labels)

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

@@ -2,20 +2,18 @@ import {
Entity,
PrimaryGeneratedColumn,
Column,
CreateDateColumn,
UpdateDateColumn,
ManyToOne,
JoinColumn,
} from 'typeorm';
import { BaseEntity } from '../../../core/base/BaseEntity';
import { Member } from './Member';
@Entity('member_sign')
export class MemberSign {
export class MemberSign extends BaseEntity {
@PrimaryGeneratedColumn()
sign_id: number;
@Column({ type: 'int', default: 0, comment: '站点ID' })
site_id: number;
// site_id 由 BaseEntity 提供
@Column({ type: 'int', comment: '会员ID' })
member_id: number;
@@ -44,14 +42,7 @@ export class MemberSign {
@Column({ type: 'tinyint', default: 1, comment: '状态 1:正常 0:异常' })
status: number;
@Column({ type: 'tinyint', default: 0, comment: '是否删除 0:否 1:是' })
is_del: number;
@CreateDateColumn({ comment: '创建时间' })
create_time: Date;
@UpdateDateColumn({ comment: '更新时间' })
update_time: Date;
// is_del, create_time, update_time 由 BaseEntity 提供
// 关联关系
@ManyToOne(() => Member, (member) => member.signs)

4
wwjcloud/src/common/member/services/core/CoreMemberAddressService.ts
View File

@@ -35,7 +35,7 @@ export class CoreMemberAddressService extends BaseService<MemberAddress> {
*/
async getInfo(address_id: number) {
return this.memberAddressRepository.findOne({
where: { address_id },
where: { id: address_id },
});
}
@@ -54,6 +54,6 @@ export class CoreMemberAddressService extends BaseService<MemberAddress> {
is_default: 1,
});
return result.affected > 0;
return (result.affected || 0) > 0;
}
}

10
wwjcloud/src/common/member/services/core/CoreMemberCashOutService.ts
View File

@@ -36,7 +36,7 @@ export class CoreMemberCashOutService extends BaseService<MemberCashOut> {
*/
async getInfo(cashout_id: number) {
return this.memberCashOutRepository.findOne({
where: { cashout_id },
where: { cash_out_id: cashout_id },
});
}
@@ -48,11 +48,11 @@ export class CoreMemberCashOutService extends BaseService<MemberCashOut> {
const result = await this.memberCashOutRepository.update(cashout_id, {
status,
audit_remark,
reject_reason: audit_remark,
audit_time: Math.floor(Date.now() / 1000),
});
return result.affected > 0;
return (result.affected || 0) > 0;
}
/**
@@ -68,10 +68,10 @@ export class CoreMemberCashOutService extends BaseService<MemberCashOut> {
async complete(cashout_id: number) {
const result = await this.memberCashOutRepository.update(cashout_id, {
status: 3,
complete_time: Math.floor(Date.now() / 1000),
cash_out_time: new Date(),
});
return result.affected > 0;
return (result.affected || 0) > 0;
}
/**

16
wwjcloud/src/common/member/services/core/CoreMemberConfigService.ts
View File

@@ -1,8 +1,8 @@
import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { Repository, Like } from 'typeorm';
import { BaseService } from '@wwjCore/base/BaseService';
import { SysConfig } from '../../entities/SysConfig';
import { SysConfig } from '../../../settings/entities/sys-config.entity';
@Injectable()
export class CoreMemberConfigService extends BaseService<SysConfig> {
@@ -22,14 +22,14 @@ export class CoreMemberConfigService extends BaseService<SysConfig> {
const configs = await this.configRepository.find({
where: {
site_id,
config_key: { $like: 'member_%' },
config_key: Like('member_%'),
},
});
// 将配置转换为对象格式
const configObj = {};
const configObj: any = {};
configs.forEach(config => {
configObj[config.config_key] = config.config_value;
configObj[config.config_key] = config.value;
});
return configObj;
@@ -38,17 +38,17 @@ export class CoreMemberConfigService extends BaseService<SysConfig> {
/**
* 更新会员配置
*/
async update(dto: any) {
async update(dto: any): Promise<boolean> {
const { site_id, configs } = dto;
for (const [key, value] of Object.entries(configs)) {
await this.configRepository.update(
{ site_id, config_key: key },
{ config_value: value as string }
{ value: value as string }
);
}
return { success: true };
return true;
}
/**

10
wwjcloud/src/common/member/services/core/CoreMemberLevelService.ts
View File

@@ -24,7 +24,7 @@ export class CoreMemberLevelService extends BaseService<MemberLevel> {
where,
skip: (page - 1) * limit,
take: limit,
order: { level_value: 'ASC' },
order: { upgrade_point: 'ASC' },
});
}
@@ -43,16 +43,16 @@ export class CoreMemberLevelService extends BaseService<MemberLevel> {
async setDefault(level_id: number) {
// 先取消其他等级的默认状态
await this.memberLevelRepository.update(
{ is_default: 1 },
{ is_default: 0 }
{ sort: 0 },
{ sort: 1 }
);
// 设置当前等级为默认
const result = await this.memberLevelRepository.update(level_id, {
is_default: 1,
sort: 0,
});
return result.affected > 0;
return (result.affected || 0) > 0;
}
/**