|
@@ -72,7 +72,24 @@ export class CommissionService {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
async getRecords(userId: number) {
|
|
async getRecords(userId: number) {
|
|
|
- return (
|
|
|
|
|
|
|
+ const result = (
|
|
|
|
|
+ await this.usersRepository
|
|
|
|
|
+ .createQueryBuilder()
|
|
|
|
|
+ .where('users.invitor = :userId', { userId })
|
|
|
|
|
+ .orderBy('CommissionRecord.createdAt', 'DESC')
|
|
|
|
|
+ .getMany()
|
|
|
|
|
+ ).map((record) => {
|
|
|
|
|
+ return new CommissionRecordDto({
|
|
|
|
|
+ id: record.id,
|
|
|
|
|
+ userId: record.invitor,
|
|
|
|
|
+ fromUserId: record.id,
|
|
|
|
|
+ name: hideSensitiveData(record.name),
|
|
|
|
|
+ level: 1,
|
|
|
|
|
+ ratio: new BigNumber(0),
|
|
|
|
|
+ amount: new BigNumber(0)
|
|
|
|
|
+ })
|
|
|
|
|
+ })
|
|
|
|
|
+ const result2 = (
|
|
|
await this.commissionRecordRepository
|
|
await this.commissionRecordRepository
|
|
|
.createQueryBuilder()
|
|
.createQueryBuilder()
|
|
|
.leftJoinAndMapOne(
|
|
.leftJoinAndMapOne(
|
|
@@ -85,7 +102,7 @@ export class CommissionService {
|
|
|
.orderBy('CommissionRecord.createdAt', 'DESC')
|
|
.orderBy('CommissionRecord.createdAt', 'DESC')
|
|
|
.getMany()
|
|
.getMany()
|
|
|
).map((record) => {
|
|
).map((record) => {
|
|
|
- return new CommissionRecordDto({
|
|
|
|
|
|
|
+ result.push(new CommissionRecordDto({
|
|
|
id: record.id,
|
|
id: record.id,
|
|
|
userId: record.userId,
|
|
userId: record.userId,
|
|
|
fromUserId: record.fromUserId,
|
|
fromUserId: record.fromUserId,
|
|
@@ -93,9 +110,10 @@ export class CommissionService {
|
|
|
level: record.level,
|
|
level: record.level,
|
|
|
ratio: record.ratio,
|
|
ratio: record.ratio,
|
|
|
amount: record.amount
|
|
amount: record.amount
|
|
|
- })
|
|
|
|
|
|
|
+ }))
|
|
|
})
|
|
})
|
|
|
|
|
|
|
|
|
|
+ return result
|
|
|
// return await this.commissionRecordRepository.find({
|
|
// return await this.commissionRecordRepository.find({
|
|
|
// relations: {
|
|
// relations: {
|
|
|
// fromUser: true
|
|
// fromUser: true
|