wangqifan пре 2 година
родитељ
комит
5f036c6c7c
1 измењених фајлова са 21 додато и 3 уклоњено
  1. 21 3
      src/commission/commission.service.ts

+ 21 - 3
src/commission/commission.service.ts

@@ -72,7 +72,24 @@ export class CommissionService {
     }
 
     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
                 .createQueryBuilder()
                 .leftJoinAndMapOne(
@@ -85,7 +102,7 @@ export class CommissionService {
                 .orderBy('CommissionRecord.createdAt', 'DESC')
                 .getMany()
         ).map((record) => {
-            return new CommissionRecordDto({
+            result.push(new CommissionRecordDto({
                 id: record.id,
                 userId: record.userId,
                 fromUserId: record.fromUserId,
@@ -93,9 +110,10 @@ export class CommissionService {
                 level: record.level,
                 ratio: record.ratio,
                 amount: record.amount
-            })
+            }))
         })
 
+        return result
         // return await this.commissionRecordRepository.find({
         //     relations: {
         //         fromUser: true