Merge branch 'feature/BETERAN-BACKEND-APP-BROWSER-init' of https://gitlab.loafle.net/bet/beteran-backend-app-browser into feature/BETERAN-BACKEND-APP-BROWSER-init

src/app/mock-api/apps/report/daily-partner/api.ts

@@ -29,33 +29,16 @@ export class ReportDailyPartnerMockApi {
     // @ DailyPartners - GET
     // -----------------------------------------------------------------------------------------------------
     this._fuseMockApiService
-      .onGet('api/apps/report/dailyPartner/dailyPartners', 300)
+      .onGet('api/apps/report/daily-partner', 300)
       .reply(({ request }) => {
         // Get available queries
         const search = request.params.get('search');
         const sort = request.params.get('sort') || 'name';
         const order = request.params.get('order') || 'asc';
-        const page = parseInt(request.params.get('page') ?? '1', 10);
-        const size = parseInt(request.params.get('size') ?? '10', 10);
 
         // Clone the dailyPartners
         let dailyPartners: any[] | null = cloneDeep(this._dailyPartners);
 
-        // Sort the dailyPartners
-        if (sort === 'sku' || sort === 'name' || sort === 'active') {
-          dailyPartners.sort((a, b) => {
-            const fieldA = a[sort].toString().toUpperCase();
-            const fieldB = b[sort].toString().toUpperCase();
-            return order === 'asc'
-              ? fieldA.localeCompare(fieldB)
-              : fieldB.localeCompare(fieldA);
-          });
-        } else {
-          dailyPartners.sort((a, b) =>
-            order === 'asc' ? a[sort] - b[sort] : b[sort] - a[sort]
-          );
-        }
-
         // If search exists...
         if (search) {
           // Filter the dailyPartners
@@ -66,47 +49,11 @@ export class ReportDailyPartnerMockApi {
           );
         }
 
-        // Paginate - Start
-        const dailyPartnersLength = dailyPartners.length;
-
-        // Calculate pagination details
-        const begin = page * size;
-        const end = Math.min(size * (page + 1), dailyPartnersLength);
-        const lastPage = Math.max(Math.ceil(dailyPartnersLength / size), 1);
-
-        // Prepare the pagination object
-        let pagination = {};
-
-        // If the requested page number is bigger than
-        // the last possible page number, return null for
-        // dailyPartners but also send the last possible page so
-        // the app can navigate to there
-        if (page > lastPage) {
-          dailyPartners = null;
-          pagination = {
-            lastPage,
-          };
-        } else {
-          // Paginate the results by size
-          dailyPartners = dailyPartners.slice(begin, end);
-
-          // Prepare the pagination mock-api
-          pagination = {
-            length: dailyPartnersLength,
-            size: size,
-            page: page,
-            lastPage: lastPage,
-            startIndex: begin,
-            endIndex: end - 1,
-          };
-        }
-
         // Return the response
         return [
           200,
           {
             dailyPartners,
-            pagination,
           },
         ];
       });
@@ -114,27 +61,27 @@ export class ReportDailyPartnerMockApi {
     // -----------------------------------------------------------------------------------------------------
     // @ DailyPartner - GET
     // -----------------------------------------------------------------------------------------------------
-    this._fuseMockApiService
+    // this._fuseMockApiService
-      .onGet('api/apps/report/daily-partner/daily-partner')
+    //   .onGet('api/apps/report/daily-partner')
-      .reply(({ request }) => {
+    //   .reply(({ request }) => {
-        // Get the id from the params
+    //     // Get the id from the params
-        const id = request.params.get('id');
+    //     const id = request.params.get('id');
 
-        // Clone the dailyPartners
+    //     // Clone the dailyPartners
-        const dailyPartners = cloneDeep(this._dailyPartners);
+    //     const dailyPartners = cloneDeep(this._dailyPartners);
 
-        // Find the dailyPartner
+    //     // Find the dailyPartner
-        const dailyPartner = dailyPartners.find((item: any) => item.id === id);
+    //     const dailyPartner = dailyPartners.find((item: any) => item.id === id);
 
-        // Return the response
+    //     // Return the response
-        return [200, dailyPartner];
+    //     return [200, dailyPartner];
-      });
+    //   });
 
     // -----------------------------------------------------------------------------------------------------
     // @ DailyPartner - POST
     // -----------------------------------------------------------------------------------------------------
     this._fuseMockApiService
-      .onPost('api/apps/report/daily-partner/daily-partner')
+      .onPost('api/apps/report/daily-partner')
       .reply(() => {
         // Generate a new dailyPartner
         const newDailyPartner = {
@@ -170,7 +117,7 @@ export class ReportDailyPartnerMockApi {
     // @ DailyPartner - PATCH
     // -----------------------------------------------------------------------------------------------------
     this._fuseMockApiService
-      .onPatch('api/apps/report/daily-partner/daily-partner')
+      .onPatch('api/apps/report/daily-partner')
       .reply(({ request }) => {
         // Get the id and dailyPartner
         const id = request.body.id;
@@ -202,7 +149,7 @@ export class ReportDailyPartnerMockApi {
     // @ DailyPartner - DELETE
     // -----------------------------------------------------------------------------------------------------
     this._fuseMockApiService
-      .onDelete('api/apps/report/daily-partner/daily-partner')
+      .onDelete('api/apps/report/daily-partner')
       .reply(({ request }) => {
         // Get the id
         const id = request.params.get('id');

src/app/mock-api/apps/report/daily-partner/data.ts

@@ -1,33 +1,545 @@
 /* eslint-disable */
 
 export const dailyPartners = [
+  // {
+  //   id: 'on00',
+  //   totalPartnerCount: '5',
+  //   totalHoldingMoney: 303675,
+  //   totalComp: 108933,
+  //   total: 412608,
+  //   branchCount: 1,
+  //   divisionCount: 1,
+  //   officeCount: 1,
+  //   storeCount: 1,
+  //   memberCount: 1,
+  //   nickname: 'on00',
+  //   accountHolder: '11',
+  //   phoneNumber: '010-1111-1111',
+  //   calculateType: '롤링',
+  //   ownCash: 50000,
+  //   ownComp: 1711,
+  //   ownCoupon: 50000,
+  //   gameMoney: 0,
+  //   todayComp: 0,
+  //   totalDeposit: 0,
+  //   totalWithdraw: 0,
+  //   balance: 0,
+  //   registDate: '2022-06-12 15:38',
+  //   finalSigninDate: '',
+  //   ip: '',
+  //   state: '정상',
+  //   note: '',
+  // },
   {
-    id: 'on00',
+    user: {
-    totalPartnerCount: '5',
+      id: '1',
-    totalHoldingMoney: 303675,
+      signinId: 'kgon1',
-    totalComp: 108933,
+      type: '본사',
-    total: 412608,
+      parentId: 0,
-    branchCount: 1,
+    },
-    divisionCount: 1,
+    bank: {
-    officeCount: 1,
+      users: {
-    storeCount: 1,
+        deposit: '0',
-    memberCount: 1,
+        withdraw: '0',
-    nickname: 'on00',
+        netProfit: 0,
-    accountHolder: '11',
+      },
-    phoneNumber: '010-1111-1111',
+      parthners: {
-    calculateType: '롤링',
+        deposit: '0',
-    ownCash: 50000,
+        withdraw: '0',
-    ownComp: 1711,
+        netProfit: '0',
-    ownCoupon: 50000,
+      },
-    gameMoney: 0,
+      totalNetProfit: '0',
-    todayComp: 0,
+      passiveMoney: '0',
-    totalDeposit: 0,
+      passiveComp: '0',
-    totalWithdraw: 0,
+      casino: {
-    balance: 0,
+        betting: '382,000',
-    registDate: '2022-06-12 15:38',
+        bettingTie: '33,000',
-    finalSigninDate: '',
+        bettingCancel: '0',
-    ip: '',
+        bettingValid: '351,000',
-    state: '정상',
+        bettingWin: '357,050',
-    note: '',
+        winLoss: '26,950',
+        commission: {
+          total: '7,020',
+          partner: '5,265',
+          me: '1,755',
+        },
+        betWinSettle: '19,930',
+      },
+      slot: {
+        betting: '382,000',
+        bettingCancel: '0',
+        bettingValid: '351,000',
+        bettingWin: '357,050',
+        winLoss: '26,950',
+        commission: {
+          total: '7,020',
+          partner: '5,265',
+          me: '1,755',
+        },
+        betWinSettle: '19,930',
+      },
+      powerball: {
+        betting: '0',
+        bettingCancel: '0',
+        bettingValid: '0',
+        bettingWin: '0',
+        winLoss: '0',
+        commission: {
+          total: '0',
+          partner: '0',
+          me: '0',
+        },
+        betWinSettle: '19,930',
+      },
+    },
+    totalBetSettle: '119,400',
+  },
+  {
+    user: {
+      id: '2',
+      signinId: 'kgon2',
+      type: '대본',
+      parentId: 1,
+    },
+    bank: {
+      users: {
+        deposit: '0',
+        withdraw: '0',
+        netProfit: 0,
+      },
+      parthners: {
+        deposit: '0',
+        withdraw: '0',
+        netProfit: '0',
+      },
+      totalNetProfit: '0',
+      passiveMoney: '0',
+      passiveComp: '0',
+      casino: {
+        betting: '382,000',
+        bettingTie: '33,000',
+        bettingCancel: '0',
+        bettingValid: '351,000',
+        bettingWin: '357,050',
+        winLoss: '26,950',
+        commission: {
+          total: '7,020',
+          partner: '5,265',
+          me: '1,755',
+        },
+        betWinSettle: '19,930',
+      },
+      slot: {
+        betting: '382,000',
+        bettingCancel: '0',
+        bettingValid: '351,000',
+        bettingWin: '357,050',
+        winLoss: '26,950',
+        commission: {
+          total: '7,020',
+          partner: '5,265',
+          me: '1,755',
+        },
+        betWinSettle: '19,930',
+      },
+      powerball: {
+        betting: '0',
+        bettingCancel: '0',
+        bettingValid: '0',
+        bettingWin: '0',
+        winLoss: '0',
+        commission: {
+          total: '0',
+          partner: '0',
+          me: '0',
+        },
+        betWinSettle: '19,930',
+      },
+    },
+    totalBetSettle: '119,400',
+  },
+  {
+    user: {
+      id: '3',
+      signinId: 'kgon1',
+      type: '본사',
+      parentId: 2,
+    },
+    bank: {
+      users: {
+        deposit: '0',
+        withdraw: '0',
+        netProfit: 0,
+      },
+      parthners: {
+        deposit: '0',
+        withdraw: '0',
+        netProfit: '0',
+      },
+      totalNetProfit: '0',
+      passiveMoney: '0',
+      passiveComp: '0',
+      casino: {
+        betting: '382,000',
+        bettingTie: '33,000',
+        bettingCancel: '0',
+        bettingValid: '351,000',
+        bettingWin: '357,050',
+        winLoss: '26,950',
+        commission: {
+          total: '7,020',
+          partner: '5,265',
+          me: '1,755',
+        },
+        betWinSettle: '19,930',
+      },
+      slot: {
+        betting: '382,000',
+        bettingCancel: '0',
+        bettingValid: '351,000',
+        bettingWin: '357,050',
+        winLoss: '26,950',
+        commission: {
+          total: '7,020',
+          partner: '5,265',
+          me: '1,755',
+        },
+        betWinSettle: '19,930',
+      },
+      powerball: {
+        betting: '0',
+        bettingCancel: '0',
+        bettingValid: '0',
+        bettingWin: '0',
+        winLoss: '0',
+        commission: {
+          total: '0',
+          partner: '0',
+          me: '0',
+        },
+        betWinSettle: '19,930',
+      },
+    },
+    totalBetSettle: '119,400',
+  },
+  {
+    user: {
+      id: '4',
+      signinId: 'kgon1',
+      type: '부본',
+      parentId: 3,
+    },
+    bank: {
+      users: {
+        deposit: '0',
+        withdraw: '0',
+        netProfit: 0,
+      },
+      parthners: {
+        deposit: '0',
+        withdraw: '0',
+        netProfit: '0',
+      },
+      totalNetProfit: '0',
+      passiveMoney: '0',
+      passiveComp: '0',
+      casino: {
+        betting: '382,000',
+        bettingTie: '33,000',
+        bettingCancel: '0',
+        bettingValid: '351,000',
+        bettingWin: '357,050',
+        winLoss: '26,950',
+        commission: {
+          total: '7,020',
+          partner: '5,265',
+          me: '1,755',
+        },
+        betWinSettle: '19,930',
+      },
+      slot: {
+        betting: '382,000',
+        bettingCancel: '0',
+        bettingValid: '351,000',
+        bettingWin: '357,050',
+        winLoss: '26,950',
+        commission: {
+          total: '7,020',
+          partner: '5,265',
+          me: '1,755',
+        },
+        betWinSettle: '19,930',
+      },
+      powerball: {
+        betting: '0',
+        bettingCancel: '0',
+        bettingValid: '0',
+        bettingWin: '0',
+        winLoss: '0',
+        commission: {
+          total: '0',
+          partner: '0',
+          me: '0',
+        },
+        betWinSettle: '19,930',
+      },
+    },
+    totalBetSettle: '119,400',
+  },
+  {
+    user: {
+      id: '5',
+      signinId: 'kgon1',
+      type: '본사',
+      parentId: 0,
+    },
+    bank: {
+      users: {
+        deposit: '0',
+        withdraw: '0',
+        netProfit: 0,
+      },
+      parthners: {
+        deposit: '0',
+        withdraw: '0',
+        netProfit: '0',
+      },
+      totalNetProfit: '0',
+      passiveMoney: '0',
+      passiveComp: '0',
+      casino: {
+        betting: '382,000',
+        bettingTie: '33,000',
+        bettingCancel: '0',
+        bettingValid: '351,000',
+        bettingWin: '357,050',
+        winLoss: '26,950',
+        commission: {
+          total: '7,020',
+          partner: '5,265',
+          me: '1,755',
+        },
+        betWinSettle: '19,930',
+      },
+      slot: {
+        betting: '382,000',
+        bettingCancel: '0',
+        bettingValid: '351,000',
+        bettingWin: '357,050',
+        winLoss: '26,950',
+        commission: {
+          total: '7,020',
+          partner: '5,265',
+          me: '1,755',
+        },
+        betWinSettle: '19,930',
+      },
+      powerball: {
+        betting: '0',
+        bettingCancel: '0',
+        bettingValid: '0',
+        bettingWin: '0',
+        winLoss: '0',
+        commission: {
+          total: '0',
+          partner: '0',
+          me: '0',
+        },
+        betWinSettle: '19,930',
+      },
+    },
+    totalBetSettle: '119,400',
+  },
+  {
+    user: {
+      id: '6',
+      signinId: 'kgon1',
+      type: '본사',
+      parentId: 0,
+    },
+    bank: {
+      users: {
+        deposit: '0',
+        withdraw: '0',
+        netProfit: 0,
+      },
+      parthners: {
+        deposit: '0',
+        withdraw: '0',
+        netProfit: '0',
+      },
+      totalNetProfit: '0',
+      passiveMoney: '0',
+      passiveComp: '0',
+      casino: {
+        betting: '382,000',
+        bettingTie: '33,000',
+        bettingCancel: '0',
+        bettingValid: '351,000',
+        bettingWin: '357,050',
+        winLoss: '26,950',
+        commission: {
+          total: '7,020',
+          partner: '5,265',
+          me: '1,755',
+        },
+        betWinSettle: '19,930',
+      },
+      slot: {
+        betting: '382,000',
+        bettingCancel: '0',
+        bettingValid: '351,000',
+        bettingWin: '357,050',
+        winLoss: '26,950',
+        commission: {
+          total: '7,020',
+          partner: '5,265',
+          me: '1,755',
+        },
+        betWinSettle: '19,930',
+      },
+      powerball: {
+        betting: '0',
+        bettingCancel: '0',
+        bettingValid: '0',
+        bettingWin: '0',
+        winLoss: '0',
+        commission: {
+          total: '0',
+          partner: '0',
+          me: '0',
+        },
+        betWinSettle: '19,930',
+      },
+    },
+    totalBetSettle: '119,400',
+  },
+  {
+    user: {
+      id: '7',
+      signinId: 'kgon1',
+      type: '본사',
+      parentId: 0,
+    },
+    bank: {
+      users: {
+        deposit: '0',
+        withdraw: '0',
+        netProfit: 0,
+      },
+      parthners: {
+        deposit: '0',
+        withdraw: '0',
+        netProfit: '0',
+      },
+      totalNetProfit: '0',
+      passiveMoney: '0',
+      passiveComp: '0',
+      casino: {
+        betting: '382,000',
+        bettingTie: '33,000',
+        bettingCancel: '0',
+        bettingValid: '351,000',
+        bettingWin: '357,050',
+        winLoss: '26,950',
+        commission: {
+          total: '7,020',
+          partner: '5,265',
+          me: '1,755',
+        },
+        betWinSettle: '19,930',
+      },
+      slot: {
+        betting: '382,000',
+        bettingCancel: '0',
+        bettingValid: '351,000',
+        bettingWin: '357,050',
+        winLoss: '26,950',
+        commission: {
+          total: '7,020',
+          partner: '5,265',
+          me: '1,755',
+        },
+        betWinSettle: '19,930',
+      },
+      powerball: {
+        betting: '0',
+        bettingCancel: '0',
+        bettingValid: '0',
+        bettingWin: '0',
+        winLoss: '0',
+        commission: {
+          total: '0',
+          partner: '0',
+          me: '0',
+        },
+        betWinSettle: '19,930',
+      },
+    },
+    totalBetSettle: '119,400',
+  },
+  {
+    user: {
+      id: '8',
+      signinId: 'kgon1',
+      type: '본사',
+      parentId: 0,
+    },
+    bank: {
+      users: {
+        deposit: '0',
+        withdraw: '0',
+        netProfit: 0,
+      },
+      parthners: {
+        deposit: '0',
+        withdraw: '0',
+        netProfit: '0',
+      },
+      totalNetProfit: '0',
+      passiveMoney: '0',
+      passiveComp: '0',
+      casino: {
+        betting: '382,000',
+        bettingTie: '33,000',
+        bettingCancel: '0',
+        bettingValid: '351,000',
+        bettingWin: '357,050',
+        winLoss: '26,950',
+        commission: {
+          total: '7,020',
+          partner: '5,265',
+          me: '1,755',
+        },
+        betWinSettle: '19,930',
+      },
+      slot: {
+        betting: '382,000',
+        bettingCancel: '0',
+        bettingValid: '351,000',
+        bettingWin: '357,050',
+        winLoss: '26,950',
+        commission: {
+          total: '7,020',
+          partner: '5,265',
+          me: '1,755',
+        },
+        betWinSettle: '19,930',
+      },
+      powerball: {
+        betting: '0',
+        bettingCancel: '0',
+        bettingValid: '0',
+        bettingWin: '0',
+        winLoss: '0',
+        commission: {
+          total: '0',
+          partner: '0',
+          me: '0',
+        },
+        betWinSettle: '19,930',
+      },
+    },
+    totalBetSettle: '119,400',
   },
 ];

src/app/modules/admin/report/daily-partner/components/list.component.html

@@ -1,356 +1,233 @@
+<div class="flex flex-col flex-auto min-w-0">
+  <div class="flex-auto border-t -mt-px pt-4 sm:pt-6">
+    <div class="w-full max-w-screen-xl mx-auto">
+      <div class="grid grid-cols-1 sm:grid-cols-6 gap-6 w-full min-w-0">
+        <!-- Budget distribution -->
         <div
-  class="sm:absolute sm:inset-0 flex flex-col flex-auto min-w-0 sm:overflow-hidden bg-card dark:bg-transparent"
+          class="sm:col-span-6 flex flex-col flex-auto p-6 bg-card shadow rounded-2xl overflow-hidden"
         >
-  <!-- Header -->
+          <div class="text-lg font-medium tracking-tight leading-6 truncate">
-  <div
+            대본별 계좌 설정
-    class="relative flex flex-col sm:flex-row flex-0 sm:items-center sm:justify-between py-8 px-6 md:px-8 border-b"
-  >
-    <!-- Loader -->
-    <div class="absolute inset-x-0 bottom-0" *ngIf="isLoading">
-      <mat-progress-bar [mode]="'indeterminate'"></mat-progress-bar>
           </div>
-    <!-- Title -->
+          <div class="flex flex-col flex-auto mt-2 overflow-x-auto">
-    <div class="text-4xl font-extrabold tracking-tight">파트너일일현황</div>
+            <form [formGroup]="dailyParthnerForm" autocomplete="off">
-    <!-- Actions -->
+              <table
-    <div class="flex shrink-0 items-center mt-6 sm:mt-0 sm:ml-4">
+                class="min-w-240 overflow-y-visible"
-      <!-- Memo -->
+                mat-table
-      <!-- <mat-form-field>
+                [dataSource]="dailyPartnerDataSource"
-        <ng-container *ngIf="dailyPartners$ | async as dailyPartners">
-          <ng-container
-            *ngFor="let dailyPartner of dailyPartners; trackBy: __trackByFn"
               >
-            <div
+                <!-- 정보 -->
-              class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b"
+                <ng-container matColumnDef="partnerInfo">
-            >
+                  <th mat-header-cell *matHeaderCellDef>정보</th>
-              <fieldset>
+                  <td mat-cell *matCellDef="let info">
-                총 파트너수:{{ dailyPartner.totalPartnerCount }} 총 보유머니:{{
+                    <span class="font-medium text-right">
-                  dailyPartner.totalHoldingMoney
+                      {{ info?.user.signinId }}
-                }}
+                    </span>
-                총 콤프:{{ dailyPartner.totalComp }} 총 합계:{{
+                    <span class="font-medium text-right">
-                  dailyPartner.total
+                      {{ info?.user.type }}
-                }}
+                    </span>
-              </fieldset>
+                    <span class="font-medium text-right"> 매출보기 </span>
-            </div>
+                  </td>
-          </ng-container>
-        </ng-container>
-      </mat-form-field> -->
-
-      <!-- SelectBox -->
-      <mat-form-field>
-        <mat-select placeholder="리스트수">
-          <mat-option value="40">40</mat-option>
-          <mat-option value="60">60</mat-option>
-          <mat-option value="80">80</mat-option>
-          <mat-option value="100">100</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <mat-form-field>
-        <mat-select placeholder="레벨">
-          <mat-option value="level1">LV.1</mat-option>
-          <mat-option value="level2">LV.2</mat-option>
-          <mat-option value="level3">LV.3</mat-option>
-          <mat-option value="level4">LV.4</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <mat-form-field>
-        <mat-select placeholder="상태">
-          <mat-option value="">정상</mat-option>
-          <mat-option value="">대기</mat-option>
-          <mat-option value="">탈퇴</mat-option>
-          <mat-option value="">휴면</mat-option>
-          <mat-option value="">블랙</mat-option>
-          <mat-option value="">정지</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <mat-form-field>
-        <mat-select placeholder="제한">
-          <mat-option value="">카지노제한</mat-option>
-          <mat-option value="">슬롯제한</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <mat-form-field>
-        <mat-select placeholder="입금">
-          <mat-option value="">계좌입금</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <mat-form-field>
-        <mat-select placeholder="내용">
-          <mat-option value="">카지노콤프</mat-option>
-          <mat-option value="">슬롯콤프</mat-option>
-          <mat-option value="">배팅콤프</mat-option>
-          <mat-option value="">첫충콤프</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <!-- <mat-form-field>
-        <mat-select placeholder="입금">
-          <mat-option value="">계좌입금</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <mat-form-field>
-        <mat-select placeholder="아이디">
-          <mat-option value="">아이디</mat-option>
-          <mat-option value="">닉네임</mat-option>
-          <mat-option value="">이름</mat-option>
-          <mat-option value="">사이트</mat-option>
-          <mat-option value="">파트너수동지급</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <mat-form-field>
-        <mat-select placeholder="가입일 정렬">
-          <mat-option value="">가입일 정렬</mat-option>
-          <mat-option value="">아이디 정렬</mat-option>
-          <mat-option value="">닉네임 정렬</mat-option>
-          <mat-option value="">캐쉬 정렬</mat-option>
-          <mat-option value="">콤프 정렬</mat-option>
-          <mat-option value="">쿠폰 정렬</mat-option>
-          <mat-option value="">입금 정렬</mat-option>
-          <mat-option value="">출금 정렬</mat-option>
-          <mat-option value="">차익 정렬</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <mat-form-field>
-        <mat-select placeholder="내림차순">
-          <mat-option value="">내림차순</mat-option>
-          <mat-option value="">오름차순</mat-option>
-        </mat-select>
-      </mat-form-field> -->
-      <!-- Search -->
-      <mat-form-field
-        class="fuse-mat-dense fuse-mat-no-subscript fuse-mat-rounded min-w-64"
-      >
-        <mat-icon
-          class="icon-size-5"
-          matPrefix
-          [svgIcon]="'heroicons_solid:search'"
-        ></mat-icon>
-        <input
-          matInput
-          [formControl]="searchInputControl"
-          [autocomplete]="'off'"
-          [placeholder]="'Search'"
-        />
-      </mat-form-field>
-      <!-- Add user button -->
-      <button
-        class="ml-4"
-        mat-flat-button
-        [color]="'primary'"
-        (click)="__createProduct()"
-      >
-        <!-- <mat-icon [svgIcon]="'heroicons_outline:plus'"></mat-icon> -->
-        <span class="ml-2 mr-1">검색하기</span>
-      </button>
-      <button>엑셀저장</button>
-      <button>카지노머니확인</button>
-    </div>
-  </div>
-
-  <!-- Main -->
-  <div class="flex flex-auto overflow-hidden">
-    <!-- Products list -->
-    <div
-      class="flex flex-col flex-auto sm:mb-18 overflow-hidden sm:overflow-y-auto"
-    >
-      <ng-container *ngIf="dailyPartners$ | async as dailyPartners">
-        <ng-container *ngIf="dailyPartners.length > 0; else noDailyPartner">
-          <div class="grid">
-            <!-- Header -->
-            <div
-              class="inventory-grid z-10 sticky top-0 grid gap-4 py-4 px-6 md:px-8 shadow text-md font-semibold text-secondary bg-gray-50 dark:bg-black dark:bg-opacity-5"
-              matSort
-              matSortDisableClear
-            >
-              <div class="hidden sm:block"><mat-checkbox></mat-checkbox></div>
-              <div class="hidden sm:block">요율</div>
-              <div class="hidden sm:block">상부트리</div>
-              <div class="hidden sm:block">관리</div>
-              <div class="hidden sm:block">매장수</div>
-              <div class="hidden sm:block">회원수</div>
-              <div class="hidden sm:block">아이디</div>
-              <div class="hidden sm:block">닉네임</div>
-              <div class="hidden sm:block">예금주</div>
-              <div class="hidden sm:block">연락처</div>
-              <div class="hidden sm:block">정산</div>
-              <div class="hidden sm:block">보유금</div>
-              <div class="hidden sm:block">게임중머니</div>
-              <div class="hidden sm:block">카지노->캐쉬</div>
-              <div class="hidden sm:block">금일콤프</div>
-              <div class="hidden sm:block">총입출</div>
-              <div class="hidden sm:block">로그</div>
-              <div class="hidden sm:block">상태</div>
-              <div class="hidden sm:block">회원수</div>
-              <div class="hidden sm:block">비고</div>
-            </div>
-            <!-- Rows -->
-            <ng-container *ngIf="dailyPartners$ | async as dailyPartners">
-              <ng-container
-                *ngFor="let dailyPartner of dailyPartners; trackBy: __trackByFn"
-              >
-                <div
-                  class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b"
-                >
-                  <div class="hidden sm:block truncate">
-                    <mat-checkbox></mat-checkbox>
-                  </div>
-                  <!-- rate -->
-                  <div class="hidden sm:block truncate">
-                    <button
-                      mat-button
-                      color="primary"
-                      matTooltip="요율확인
-                                카지노-바카라: 0%
-                                카지노-룰렛: 0%
-                                카지노-드레곤타이거: 0%
-                                카지노-그외: 0%
-                                슬롯: 0%
-                                카지노루징: 0%
-                                슬롯루징: 0%"
-                    >
-                      요율
-                    </button>
-                    <div class="hidden sm:block truncate">
-                      <!-- 관리 -->
-                      <button mat-flat-button [color]="'primary'">
-                        <mat-form-field>
-                          <mat-select placeholder="관리">
-                            <mat-option value="">보유금지급/회수</mat-option>
-                            <mat-option value="">수수료설정</mat-option>
-                            <mat-option value="">콤프지급/회수</mat-option>
-                            <mat-option value="">쿠폰머니지급/회수</mat-option>
-                            <mat-option value="">쪽지보내기</mat-option>
-                            <mat-option value="">베팅리스트</mat-option>
-                            <mat-option value="">강제로그아웃</mat-option>
-                          </mat-select>
-                        </mat-form-field>
-                      </button>
-                    </div>
-                  </div>
-                  <!-- 매장수 -->
-                  <div class="hidden sm:block truncate">
-                    <button mat-flat-button [color]="'primary'">
-                      {{ dailyPartner.branchCount }}
-                    </button>
-                    <button mat-flat-button [color]="'primary'">
-                      {{ dailyPartner.divisionCount }}
-                    </button>
-                    <button mat-flat-button [color]="'primary'">
-                      {{ dailyPartner.officeCount }}
-                    </button>
-                    <button mat-flat-button [color]="'primary'">
-                      {{ dailyPartner.storeCount }}
-                    </button>
-                  </div>
-                  <!-- 회원수 -->
-                  <div class="hidden sm:block truncate">
-                    <button mat-flat-button [color]="'primary'">
-                      {{ dailyPartner.memberCount }}
-                    </button>
-                  </div>
-                  <!-- id -->
-                  <ng-container *ngIf="users$ | async as users">
-                    <ng-container
-                      *ngFor="let user of users; trackBy: __trackByFn"
-                    >
-                      <div
-                        class="hidden sm:block truncate"
-                        (click)="viewUserDetail(user.id!)"
-                      >
-                        {{ dailyPartner.id }}
-                      </div>
-                    </ng-container>
-                  </ng-container>
-                  <!-- nickname -->
-                  <div class="hidden sm:block truncate">
-                    {{ dailyPartner.nickname }}
-                  </div>
-                  <!-- accountHolder -->
-                  <div class="hidden sm:block truncate">
-                    {{ dailyPartner.accountHolder }}
-                  </div>
-                  <!-- 연락처 -->
-                  <div class="hidden sm:block truncate">
-                    {{ dailyPartner.phoneNumber }}
-                  </div>
-                  <!-- 정산 -->
-                  <div class="hidden sm:block truncate">
-                    {{ dailyPartner.calculateType }}
-                  </div>
-                  <!-- 보유금 -->
-                  <div class="hidden sm:block truncate">
-                    캐쉬{{ dailyPartner.ownCash }} 콤프{{
-                      dailyPartner.ownComp
-                    }}
-                    쿠폰{{ dailyPartner.ownCoupon }}
-                  </div>
-                  <!-- gameMoney -->
-                  <div class="hidden sm:block truncate">
-                    {{ dailyPartner.gameMoney }}
-                  </div>
-                  <!-- casinoCash -->
-                  <div class="hidden sm:block truncate">
-                    <button mat-flat-button [color]="'primary'">
-                      게임머니확인
-                    </button>
-                    <button mat-flat-button [color]="'primary'">
-                      게임머니회수
-                    </button>
-                  </div>
-                  <!-- todayComp -->
-                  <div class="hidden sm:block truncate">
-                    {{ dailyPartner.todayComp }}P
-                  </div>
-                  <!-- 총입출 -->
-                  <div class="hidden sm:block truncate">
-                    입금{{ dailyPartner.totalDeposit }} 출금{{
-                      dailyPartner.totalWithdraw
-                    }}
-                    차익{{ dailyPartner.balance }}
-                  </div>
-                  <!-- log -->
-                  <div class="hidden sm:block truncate">
-                    가입{{ dailyPartner.registDate }} 최종{{
-                      dailyPartner.finalSigninDate
-                    }}
-                    IP{{ dailyPartner.ip }}
-                  </div>
-                  <!-- state -->
-                  <div class="hidden sm:block truncate">
-                    {{ dailyPartner.state }}
-                  </div>
-                  <!-- 회원수 -->
-                  <div class="hidden sm:block truncate">
-                    {{ dailyPartner.memberCount }}
-                  </div>
-                  <!-- 비고 -->
-                  <div class="hidden sm:block truncate">
-                    <button mat-flat-button [color]="'primary'">
-                      {{ dailyPartner.note }}
-                    </button>
-                  </div>
-                </div>
-              </ng-container>
-            </ng-container>
-          </div>
-
-          <mat-paginator
-            class="sm:absolute sm:inset-x-0 sm:bottom-0 border-b sm:border-t sm:border-b-0 z-10 bg-gray-50 dark:bg-transparent"
-            [ngClass]="{ 'pointer-events-none': isLoading }"
-            [length]="pagination?.length"
-            [pageIndex]="pagination?.page"
-            [pageSize]="pagination?.size"
-            [pageSizeOptions]="[5, 10, 25, 100]"
-            [showFirstLastButtons]="true"
-          ></mat-paginator>
                 </ng-container>
+                <!-- 정보 -->
+                <ng-container matColumnDef="expansionBtn">
+                  <th mat-header-cell *matHeaderCellDef></th>
+                  <td mat-cell *matCellDef="let info">+</td>
                 </ng-container>
 
-      <ng-template #noDailyPartner>
+                <!-- 정보 -->
-        <div
+                <!-- <ng-container matColumnDef="betInfo">
-          class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
+                  <th
+                    mat-header-cell
+                    *matHeaderCellDef
+                    [attr.rowspan]="2"
+                    [attr.colspan]="2"
+                  ></th>
+                </ng-container> -->
+
+                <!-- 회원입출 -->
+                <ng-container matColumnDef="depositDetails">
+                  <th mat-header-cell *matHeaderCellDef>회원입출</th>
+                  <td mat-cell *matCellDef="let info">
+                    <span>{{ info?.bank.users.deposit }}</span>
+                    <span>{{ info?.bank.users.withdraw }}</span>
+                    <span>{{ info?.bank.users.netProfit }}</span>
+                  </td>
+                </ng-container>
+
+                <!-- 파트너입출 -->
+                <ng-container matColumnDef="depositPartnerDetails">
+                  <th mat-header-cell *matHeaderCellDef>파트너입출</th>
+                  <td mat-cell *matCellDef="let info">
+                    <span>{{ info?.bank.parthners.deposit }}</span>
+                    <span>{{ info?.bank.parthners.withdraw }}</span>
+                    <span>{{ info?.bank.parthners.netProfit }}</span>
+                  </td>
+                </ng-container>
+
+                <!-- 총손익 -->
+                <ng-container matColumnDef="totalProfit">
+                  <th mat-header-cell *matHeaderCellDef>총손익</th>
+                  <td mat-cell *matCellDef="let info">
+                    {{ info?.bank.totalNetProfit }}
+                  </td>
+                </ng-container>
+                <!-- 수동머니 -->
+                <ng-container matColumnDef="passiveMoney">
+                  <th mat-header-cell *matHeaderCellDef>수동머니</th>
+                  <td mat-cell *matCellDef="let info">
+                    {{ info?.bank.passiveMoney }}
+                  </td>
+                </ng-container>
+                <!-- 수동콤프 -->
+                <ng-container matColumnDef="passiveComp">
+                  <th mat-header-cell *matHeaderCellDef>수동콤프</th>
+                  <td mat-cell *matCellDef="let info">
+                    {{ info?.bank.passiveComp }}
+                  </td>
+                </ng-container>
+                <!-- 배팅 -->
+                <ng-container matColumnDef="casinoBetDetatils">
+                  <th mat-header-cell *matHeaderCellDef>배팅</th>
+                  <td mat-cell *matCellDef="let info">
+                    {{ info?.bank.casino.betting }}
+                  </td>
+                </ng-container>
+                <!-- 당첨 -->
+                <ng-container matColumnDef="casinoWinningDetatils">
+                  <th mat-header-cell *matHeaderCellDef>당첨</th>
+                  <td mat-cell *matCellDef="let info">
+                    {{ info?.bank.casino.bettingWin }}
+                  </td>
+                </ng-container>
+                <!-- 윈로스(A) -->
+                <ng-container matColumnDef="casinoWinLoss">
+                  <th mat-header-cell *matHeaderCellDef>윈로스(A)</th>
+                  <td mat-cell *matCellDef="let info">
+                    {{ info?.bank.casino.winLoss }}
+                  </td>
+                </ng-container>
+                <!-- 수수료(B) -->
+                <ng-container matColumnDef="casinoCommission">
+                  <th mat-header-cell *matHeaderCellDef>수수료(B)</th>
+                  <td mat-cell *matCellDef="let info">
+                    {{ info?.bank.casino.commission.total }}
+                  </td>
+                </ng-container>
+                <!-- 벳윈정산(A-B) -->
+                <ng-container matColumnDef="casinoSettle">
+                  <th mat-header-cell *matHeaderCellDef>벳윈정산(A-B)</th>
+                  <td mat-cell *matCellDef="let info">
+                    {{ info?.bank.casino.betWinSettle }}
+                  </td>
+                </ng-container>
+
+                <!-- 배팅 -->
+                <ng-container matColumnDef="slotBetDetails">
+                  <th mat-header-cell *matHeaderCellDef>배팅</th>
+                  <td mat-cell *matCellDef="let info">
+                    {{ info?.bank.slot.betting }}
+                  </td>
+                </ng-container>
+                <!-- 당첨 -->
+                <ng-container matColumnDef="slotWinningDetatils">
+                  <th mat-header-cell *matHeaderCellDef>당첨</th>
+                  <td mat-cell *matCellDef="let info">
+                    {{ info?.bank.slot.bettingWin }}
+                  </td>
+                </ng-container>
+                <!-- 윈로스(D) -->
+                <ng-container matColumnDef="slotWinLoss">
+                  <th mat-header-cell *matHeaderCellDef>윈로스(D)</th>
+                  <td mat-cell *matCellDef="let info">
+                    {{ info?.bank.slot.winLoss }}
+                  </td>
+                </ng-container>
+                <!-- 수수료(E) -->
+                <ng-container matColumnDef="slotCommission">
+                  <th mat-header-cell *matHeaderCellDef>수수료(E)</th>
+                  <td mat-cell *matCellDef="let info">
+                    {{ info?.bank.slot.commission.total }}
+                  </td>
+                </ng-container>
+                <!-- 벳윈정산(A-B) -->
+                <ng-container matColumnDef="slotSettle">
+                  <th mat-header-cell *matHeaderCellDef>벳윈정산(A-B)</th>
+                  <td mat-cell *matCellDef="let info">
+                    {{ info?.bank.slot.commission.betWinSettle }}
+                  </td>
+                </ng-container>
+
+                <!-- 배팅 -->
+                <ng-container matColumnDef="powerballBetDetails">
+                  <th mat-header-cell *matHeaderCellDef>배팅</th>
+                  <td mat-cell *matCellDef="let info">
+                    {{ info?.bank.powerball.betting }}
+                  </td>
+                </ng-container>
+                <!-- 당첨 -->
+                <ng-container matColumnDef="powerballWinningDetatils">
+                  <th mat-header-cell *matHeaderCellDef>당첨</th>
+                  <td mat-cell *matCellDef="let info">
+                    {{ info?.bank.powerball.bettingWin }}
+                  </td>
+                </ng-container>
+                <!-- 윈로스(G) -->
+                <ng-container matColumnDef="powerballWinLoss">
+                  <th mat-header-cell *matHeaderCellDef>윈로스(G)</th>
+                  <td mat-cell *matCellDef="let info">
+                    {{ info?.bank.powerball.winLoss }}
+                  </td>
+                </ng-container>
+                <!-- 수수료(G) -->
+                <ng-container matColumnDef="powerballCommission">
+                  <th mat-header-cell *matHeaderCellDef>수수료(H)</th>
+                  <td mat-cell *matCellDef="let info">
+                    {{ info?.bank.powerball.commission.total }}
+                  </td>
+                </ng-container>
+                <!-- 벳윈정산(G-H) -->
+                <ng-container matColumnDef="powerballSettle">
+                  <th mat-header-cell *matHeaderCellDef>벳윈정산(G-H)</th>
+                  <td mat-cell *matCellDef="let info">
+                    {{ info?.bank.powerball.commission.betWinSettle }}
+                  </td>
+                </ng-container>
+
+                <!-- 총벳윈정산 -->
+                <ng-container matColumnDef="totalBetWinSettle">
+                  <th mat-header-cell *matHeaderCellDef>총벳윈정산</th>
+                  <td mat-cell *matCellDef="let info">
+                    {{ info?.totalBetSettle }}
+                  </td>
+                </ng-container>
+
+                <!-- Header row second group -->
+                <ng-container matColumnDef="header-row-info-group">
+                  <th
+                    mat-header-cell
+                    *matHeaderCellDef
+                    [attr.colspan]="2"
+                    [attr.rowspan]="2"
                   >
-          There are no dailyPartners!
+                    Second group
-        </div>
+                  </th>
-      </ng-template>
+                </ng-container>
+
+                <!-- <tr mat-header-row *matHeaderRowDef="['betInfo']"></tr> -->
+                <tr
+                  mat-header-row
+                  *matHeaderRowDef="dailyPartnerTableColumns"
+                ></tr>
+                <tr
+                  mat-row
+                  *matRowDef="let row; columns: dailyPartnerTableColumns"
+                ></tr>
+              </table>
+            </form>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </div>

src/app/modules/admin/report/daily-partner/components/list.component.ts

@@ -14,9 +14,7 @@ import {
   FormGroup,
   Validators,
 } from '@angular/forms';
-import { MatCheckboxChange } from '@angular/material/checkbox';
+
-import { MatPaginator } from '@angular/material/paginator';
-import { MatSort } from '@angular/material/sort';
 import {
   debounceTime,
   map,
@@ -26,6 +24,9 @@ import {
   switchMap,
   takeUntil,
 } from 'rxjs';
+
+import { MatTableDataSource } from '@angular/material/table';
+
 import { fuseAnimations } from '@fuse/animations';
 import { FuseConfirmationService } from '@fuse/services/confirmation';
 
@@ -63,17 +64,41 @@ import { Router } from '@angular/router';
   animations: fuseAnimations,
 })
 export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
-  @ViewChild(MatPaginator) private _paginator!: MatPaginator;
+  dailyPartners$!: Observable<any | undefined>;
-  @ViewChild(MatSort) private _sort!: MatSort;
-
-  dailyPartners$!: Observable<DailyPartner[] | undefined>;
   users$!: Observable<User[] | undefined>;
 
   isLoading = false;
   searchInputControl = new FormControl();
   selectedDailyPartner?: DailyPartner;
-  pagination?: DailyPartnerPagination;
 
+  dailyParthnerForm!: FormGroup;
+
+  dailyPartnerDataSource: MatTableDataSource<any> = new MatTableDataSource();
+  dailyPartnerTableColumns: string[] = [
+    'partnerInfo',
+    'expansionBtn',
+    'depositDetails',
+    'depositPartnerDetails',
+    'totalProfit',
+    'passiveMoney',
+    'passiveComp',
+    'casinoBetDetatils',
+    'casinoWinningDetatils',
+    'casinoWinLoss',
+    'casinoCommission',
+    'casinoSettle',
+    'slotBetDetails',
+    'slotWinningDetatils',
+    'slotWinLoss',
+    'slotCommission',
+    'slotSettle',
+    'powerballBetDetails',
+    'powerballWinningDetatils',
+    'powerballWinLoss',
+    'powerballCommission',
+    'powerballSettle',
+    'totalBetWinSettle',
+  ];
   private _unsubscribeAll: Subject<any> = new Subject<any>();
 
   /**
@@ -95,14 +120,19 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
    * On init
    */
   ngOnInit(): void {
+    this.dailyParthnerForm = this._formBuilder.group({
+      bankName: [''],
+      accountNumber: [''],
+      accountHolder: [''],
+    });
     // Get the pagination
-    this._dailyPartnerService.pagination$
+    this._dailyPartnerService
+      .getDailyPartners()
       .pipe(takeUntil(this._unsubscribeAll))
-      .subscribe((pagination: DailyPartnerPagination | undefined) => {
+      .subscribe((dailyPartners: any) => {
-        // Update the pagination
-        this.pagination = pagination;
-
         // Mark for check
+        this.dailyPartnerDataSource = dailyPartners.dailyPartners;
+        console.log(dailyPartners);
         this._changeDetectorRef.markForCheck();
       });
 
@@ -113,45 +143,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
   /**
    * After view init
    */
-  ngAfterViewInit(): void {
+  ngAfterViewInit(): void {}
-    if (this._sort && this._paginator) {
-      // Set the initial sort
-      this._sort.sort({
-        id: 'name',
-        start: 'asc',
-        disableClear: true,
-      });
-
-      // Mark for check
-      this._changeDetectorRef.markForCheck();
-
-      // If the dailyPartner changes the sort order...
-      this._sort.sortChange
-        .pipe(takeUntil(this._unsubscribeAll))
-        .subscribe(() => {
-          // Reset back to the first page
-          this._paginator.pageIndex = 0;
-        });
-
-      // Get products if sort or page changes
-      merge(this._sort.sortChange, this._paginator.page)
-        .pipe(
-          switchMap(() => {
-            this.isLoading = true;
-            return this._dailyPartnerService.getDailyPartners(
-              this._paginator.pageIndex,
-              this._paginator.pageSize,
-              this._sort.active,
-              this._sort.direction
-            );
-          }),
-          map(() => {
-            this.isLoading = false;
-          })
-        )
-        .subscribe();
-    }
-  }
 
   /**
    * On destroy
@@ -195,4 +187,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
   __trackByFn(index: number, item: any): any {
     return item.id || index;
   }
+  __testData(info: any): any {
+    console.log(info);
+  }
 }

src/app/modules/admin/report/daily-partner/daily-partner.module.ts

@@ -15,6 +15,7 @@ import { MatGridListModule } from '@angular/material/grid-list';
 import { MatSlideToggleModule } from '@angular/material/slide-toggle';
 import { MatRadioModule } from '@angular/material/radio';
 import { MatCheckboxModule } from '@angular/material/checkbox';
+import { MatTableModule } from '@angular/material/table';
 
 import { TranslocoModule } from '@ngneat/transloco';
 
@@ -45,6 +46,7 @@ import { dailyPartnerRoutes } from './daily-partner.routing';
     MatSlideToggleModule,
     MatRadioModule,
     MatCheckboxModule,
+    MatTableModule,
   ],
 })
 export class DailyPartnerModule {}

src/app/modules/admin/report/daily-partner/resolvers/daily-partner.resolver.ts

@@ -81,9 +81,8 @@ export class DailyPartnersResolver implements Resolve<any> {
     route: ActivatedRouteSnapshot,
     state: RouterStateSnapshot
   ): Observable<{
-    pagination: DailyPartnerPagination;
     dailyPartners: DailyPartner[];
   }> {
-    return this._dailyPartnerService.getDailyPartners();
+    return this._dailyPartnerService.getDailyPartners('');
   }
 }

src/app/modules/admin/report/daily-partner/services/daily-partner.service.ts

@@ -74,32 +74,19 @@ export class DailyPartnerService {
    * @param order
    * @param search
    */
-  getDailyPartners(
+  getDailyPartners(search: string = ''): Observable<{
-    page: number = 0,
+    dailyPartners: any;
-    size: number = 10,
-    sort: string = 'name',
-    order: 'asc' | 'desc' | '' = 'asc',
-    search: string = ''
-  ): Observable<{
-    pagination: DailyPartnerPagination;
-    dailyPartners: DailyPartner[];
   }> {
     return this._httpClient
       .get<{
-        pagination: DailyPartnerPagination;
+        dailyPartners: any;
-        dailyPartners: DailyPartner[];
+      }>('api/apps/report/daily-partner', {
-      }>('api/apps/report/daily/dailys', {
         params: {
-          page: '' + page,
-          size: '' + size,
-          sort,
-          order,
           search,
         },
       })
       .pipe(
         tap((response) => {
-          this.__pagination.next(response.pagination);
           this.__dailyPartners.next(response.dailyPartners);
         })
       );