From b5cf7173e71f26c142eac31843ea06e979569970 Mon Sep 17 00:00:00 2001
From: JUNG YI DAM <breeze@loafle.com>
Date: Thu, 4 Aug 2022 07:15:38 +0000
Subject: [PATCH] =?UTF-8?q?=EB=B3=B4=EA=B3=A0=EC=84=9C=EA=B4=80=EB=A6=AC?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/list.component.html            | 142 +++++++++++-------
 .../components/list.component.ts              |  12 +-
 .../today-bet/components/list.component.html  |   6 +-
 3 files changed, 97 insertions(+), 63 deletions(-)

diff --git a/src/app/modules/admin/report/daily-partner/components/list.component.html b/src/app/modules/admin/report/daily-partner/components/list.component.html
index 6b300f4..878f1c5 100644
--- a/src/app/modules/admin/report/daily-partner/components/list.component.html
+++ b/src/app/modules/admin/report/daily-partner/components/list.component.html
@@ -114,29 +114,29 @@
             <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"
             >
-              <div>요율</div>
-              <div>상부</div>
-              <div>
-                아이디
-                <hr style="margin: 7px 0px" />
-                닉네임
-                <hr style="margin: 7px 0px" />
-                연락처
-              </div>
-              <div>
-                등급
-                <hr style="margin: 7px 0px" />
-                레벨
-              </div>
-              <div class="hidden sm:block">예금주</div>
-              <div class="hidden md:block">보유금</div>
-              <div class="hidden md:block">
-                게임중머니
-                <hr style="margin: 7px 0px" />
-                금일콤프
-              </div>
-              <div class="hidden md:block">총입출</div>
-              <div class="hidden lg:block">카지노->캐쉬</div>
+              <div>처리날짜</div>
+              <div>이전일 보유금</div>
+              <div>회원 입출금</div>
+              <div>파트너 입출금</div>
+              <div class="hidden sm:block">전체손익</div>
+              <div class="hidden md:block">수동머니</div>
+              <div class="hidden md:block">수동콤프</div>
+              <div class="hidden md:block">카-배팅</div>
+              <div class="hidden lg:block">카-당첨</div>
+              <div class="hidden lg:block">카-윈로스(A)</div>
+              <div class="hidden lg:block">카-수수료(B)</div>
+              <div class="hidden lg:block">카-벳윈정산(A-B)</div>
+              <div class="hidden md:block">슬-배팅</div>
+              <div class="hidden lg:block">슬-당첨</div>
+              <div class="hidden lg:block">슬-윈로스(D)</div>
+              <div class="hidden lg:block">슬-수수료(E)</div>
+              <div class="hidden lg:block">슬-뱃윈정산(D-E)</div>
+              <div class="hidden md:block">파-배팅</div>
+              <div class="hidden lg:block">파-당첨</div>
+              <div class="hidden lg:block">파-윈로스(H)</div>
+              <div class="hidden lg:block">파-수수료(I)</div>
+              <div class="hidden lg:block">파-벳윈정산(H-I)</div>
+              <div class="hidden lg:block">총뱃윈정산</div>
             </div>
             <!-- Rows -->
             <ng-container *ngIf="dailyPartners$ | async as dailyPartners">
@@ -146,60 +146,90 @@
                 <div
                   class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b"
                 >
-                  <div>요율</div>
+                  <div>{{ dailyPartner.processDate }}</div>
                   <div>
-                    {{ dailyPartner.highRank }}
+                    {{ dailyPartner.lastDayHoldingMoney }}
                   </div>
                   <div>
-                    {{ dailyPartner.signinId }}
+                    충전{{ dailyPartner.memberCharge }}
                     <hr style="margin: 7px 0px" />
-                    {{ dailyPartner.nickname }}
+                    환전{{ dailyPartner.memberExchange }}
                     <hr style="margin: 7px 0px" />
-                    {{ dailyPartner.phoneNumber }}
+                    손익{{ dailyPartner.memberProfitLoss }}
                   </div>
                   <div>
-                    {{ dailyPartner.rank }}
+                    충전{{ dailyPartner.partnerCharge }}
                     <hr style="margin: 7px 0px" />
-                    LV{{ dailyPartner.level }}
+                    환전{{ dailyPartner.partnerExchange }}
+                    <hr style="margin: 7px 0px" />
+                    손익{{ dailyPartner.partnerProfitLoss }}
                   </div>
                   <div class="hidden sm:block">
-                    {{ dailyPartner.accountHolder }}
+                    {{ dailyPartner.totalProfitLoss }}
                   </div>
                   <div class="hidden md:block">
-                    캐쉬{{ dailyPartner.ownCash }}
-                    <hr style="margin: 7px 0px" />
-                    콤프{{ dailyPartner.ownComp }}P
-                    <hr style="margin: 7px 0px" />
-                    쿠폰{{ dailyPartner.ownCoupon }}
+                    {{ dailyPartner.passiveMoney }}
                   </div>
                   <div class="hidden md:block">
-                    {{ dailyPartner.gameMoney }}
-                    <hr style="margin: 7px 0px" />
-                    {{ dailyPartner.todayComp }}P
+                    {{ dailyPartner.passiveComp }}
                   </div>
                   <div class="hidden md:block">
-                    입금{{ dailyPartner.totalDeposit }}
+                    배팅{{ dailyPartner.casinoBetting }}
                     <hr style="margin: 7px 0px" />
-                    출금{{ dailyPartner.totalWithdraw }}
+                    타이{{ dailyPartner.casinoTie }}
                     <hr style="margin: 7px 0px" />
-                    차익{{ dailyPartner.balance }}
+                    취소{{ dailyPartner.casinoCancel }}
+                    <hr style="margin: 7px 0px" />
+                    유효{{ dailyPartner.casinoAvailable }}
                   </div>
                   <div class="hidden lg:block">
-                    <button
-                      mat-flat-button
-                      class="bet-mat-small-8"
-                      [color]="'primary'"
-                    >
-                      게임머니확인
-                    </button>
+                    {{ dailyPartner.casinoWinning }}
+                  </div>
+                  <div class="hidden lg:block">
+                    {{ dailyPartner.casinoWinLoss }}
+                  </div>
+                  <div class="hidden lg:block">
+                    {{ dailyPartner.casinoCommission }}
+                  </div>
+                  <div class="hidden lg:block">
+                    {{ dailyPartner.casinoBetWinCalculate }}
+                  </div>
+                  <div class="hidden md:block">
+                    배팅{{ dailyPartner.slotBetting }}
                     <hr style="margin: 7px 0px" />
-                    <button
-                      mat-flat-button
-                      class="bet-mat-small-8"
-                      [color]="'primary'"
-                    >
-                      게임머니회수
-                    </button>
+                    취소{{ dailyPartner.slotCancel }}
+                    <hr style="margin: 7px 0px" />
+                    유효{{ dailyPartner.slotAvailable }}
+                  </div>
+                  <div class="hidden lg:block">
+                    {{ dailyPartner.slotWinning }}
+                  </div>
+                  <div class="hidden lg:block">
+                    {{ dailyPartner.slotWinLoss }}
+                  </div>
+                  <div class="hidden lg:block">
+                    {{ dailyPartner.slotCommission }}
+                  </div>
+                  <div class="hidden lg:block">
+                    {{ dailyPartner.slotBetWinCalculate }}
+                  </div>
+                  <div class="hidden md:block">
+                    {{ dailyPartner.powerballBetting }}
+                  </div>
+                  <div class="hidden lg:block">
+                    {{ dailyPartner.powerballWinning }}
+                  </div>
+                  <div class="hidden lg:block">
+                    {{ dailyPartner.powerballWinLoss }}
+                  </div>
+                  <div class="hidden lg:block">
+                    {{ dailyPartner.powerballCommission }}
+                  </div>
+                  <div class="hidden lg:block">
+                    {{ dailyPartner.powerballBetWinCalculate }}
+                  </div>
+                  <div class="hidden lg:block">
+                    {{ dailyPartner.totalBetWinCalculate }}
                   </div>
                 </div>
               </ng-container>
diff --git a/src/app/modules/admin/report/daily-partner/components/list.component.ts b/src/app/modules/admin/report/daily-partner/components/list.component.ts
index f0c216e..283e6bd 100644
--- a/src/app/modules/admin/report/daily-partner/components/list.component.ts
+++ b/src/app/modules/admin/report/daily-partner/components/list.component.ts
@@ -41,18 +41,22 @@ import { Router } from '@angular/router';
     /* language=SCSS */
     `
       .inventory-grid {
-        grid-template-columns: 60px auto 40px;
+        /*                     아이디 등급  회원 */
+        grid-template-columns: 40px auto 30px;
 
         @screen sm {
-          grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px;
+          /*                     아이디 등급  회원 파트너 손익  머니  콤프  카배팅 */
+          grid-template-columns: 40px auto 30px 30px 30px 30px 30px 30px;
         }
 
         @screen md {
-          grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px 60px;
+          /*                     아이디 등급  회원 파트너 손익  머니  콤프  카배팅 카당첨 */
+          grid-template-columns: 40px auto 30px 30px 30px 30px 30px 30px 30px;
         }
 
         @screen lg {
-          grid-template-columns: 60px 70px 70px 70px 70px 100px 60px 60px auto 60px 60px 60px 60px;
+          /*                     아이디 등급  회원 파트너 손익  머니  콤프 카배팅 카당첨 카윈로스 카수수료 카정산 슬배팅 슬당첨 슬윈로스 슬수수료 슬정산 파배팅 파당첨 파윈로스 파수수료 파정산 총정산 */
+          grid-template-columns: 40px auto 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px;
         }
       }
     `,
diff --git a/src/app/modules/admin/report/today-bet/components/list.component.html b/src/app/modules/admin/report/today-bet/components/list.component.html
index 83d1421..441cac4 100644
--- a/src/app/modules/admin/report/today-bet/components/list.component.html
+++ b/src/app/modules/admin/report/today-bet/components/list.component.html
@@ -164,18 +164,18 @@
               <div class="hidden lg:block">카-당첨</div>
               <div class="hidden lg:block">카-윈로스(A)</div>
               <div class="hidden lg:block">카-수수료(B)</div>
-              <div class="hidden lg:block">카-벳윈정산(A-B)</div>
+              <div class="hidden lg:block">카-뱃윈정산(A-B)</div>
               <div class="hidden md:block">슬-배팅</div>
               <div class="hidden lg:block">슬-당첨</div>
               <div class="hidden lg:block">슬-윈로스(D)</div>
               <div class="hidden lg:block">슬-수수료(E)</div>
-              <div class="hidden lg:block">슬-벳윈정산(D-E)</div>
+              <div class="hidden lg:block">슬-뱃윈정산(D-E)</div>
               <div class="hidden md:block">파-배팅</div>
               <div class="hidden lg:block">파-당첨</div>
               <div class="hidden lg:block">파-윈로스(H)</div>
               <div class="hidden lg:block">파-수수료(I)</div>
               <div class="hidden lg:block">파-벳윈정산(H-I)</div>
-              <div class="hidden lg:block">총벳윈정산</div>
+              <div class="hidden lg:block">총뱃윈정산</div>
             </div>
             <!-- Rows -->
             <ng-container *ngIf="todayBets$ | async as todayBets">