From 0b37894772705e10dcdb58d52829211afe472576 Mon Sep 17 00:00:00 2001 From: Park Byung Eun Date: Wed, 10 Aug 2022 08:05:53 +0000 Subject: [PATCH 01/14] bug fixed --- .../partner/components/list.component.html | 90 ++++++++++--------- .../partner/components/list.component.ts | 17 +++- 2 files changed, 64 insertions(+), 43 deletions(-) diff --git a/src/app/modules/admin/member/partner/components/list.component.html b/src/app/modules/admin/member/partner/components/list.component.html index bdf409f..3701aa0 100644 --- a/src/app/modules/admin/member/partner/components/list.component.html +++ b/src/app/modules/admin/member/partner/components/list.component.html @@ -39,26 +39,33 @@ matSortDisableClear class="partner-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" > -
관리
-
요율
-
매장수
-
- 아이디 + + + -
+ - - - + + + @@ -73,36 +80,39 @@
-
- - - - - - - - - -
-
- 요율 -
-
- {{ partner.branchCount }}{{ partner.divisionCount - }}{{ partner.officeCount }}{{ partner.storeCount - }}{{ partner.memberCount }} + + -
+ - diff --git a/src/app/modules/admin/bank/partner-calculate/models/partner-calculate.ts b/src/app/modules/admin/bank/partner-calculate/models/partner-calculate.ts index c013c69..d8b80e6 100644 --- a/src/app/modules/admin/bank/partner-calculate/models/partner-calculate.ts +++ b/src/app/modules/admin/bank/partner-calculate/models/partner-calculate.ts @@ -1,20 +1,20 @@ export interface PartnerCalculate { - id?: string; - partnerDepositIdx?: number; // 파트너입금 idx - partnerDepositId?: string; // 파트너입금 아이디 - partnerDepositNickname?: string; // 파트너입금 닉네임 - partnerDepositRank?: string; // 파트너입금 등급 + id: string; + partnerDepositIdx?: number; // 입금파트너 idx + partnerDepositId?: string; // 입금파트너 아이디 + partnerDepositNickname?: string; // 입금파트너 닉네임 + partnerDepositRank?: string; // 입금파트너 등급 nameOfDepositer?: string; - partnerDepositAmountOfPayment?: number; // 파트너입금 결제금액 - partnerDepositRegistrationDate?: Date; // 파트너입금 신청일 - partnerDepositConfirmDate?: Date; // 파트너입금 확인일 + partnerDepositAmountOfPayment?: number; // 입금파트너 결제금액 + partnerDepositRegistDate?: Date; // 입금파트너 신청일 + partnerDepositConfirmDate?: Date; // 입금파트너 확인일 - partnerWithdrawIdx?: number; // 파트너출금 idx - partnerWithdrawId?: string; // 파트너입금 아이디 - partnerWithdrawNickname?: string; // 파트너입금 닉네임 - partnerWithdrawRank?: string; // 파트너입금 등급 + partnerWithdrawIdx?: number; // 출금파트너 idx + partnerWithdrawId?: string; // 출금파트너 아이디 + partnerWithdrawNickname?: string; // 출금파트너 닉네임 + partnerWithdrawRank?: string; // 출금파트너 등급 accountHolder?: string; - partnerWithdrawAmountOfPayment?: number; // 파트너입금 결제금액 - partnerWithdrawRegistrationDate?: Date; // 파트너입금 신청일 - partnerWithdrawConfirmDate?: Date; // 파트너입금 확인일 + partnerWithdrawAmountOfPayment?: number; // 출금파트너 결제금액 + partnerWithdrawRegistDate?: Date; // 출금파트너 신청일 + partnerWithdrawConfirmDate?: Date; // 출금파트너 확인일 } From 6cea6ab5cf355aaf499ab742fd15ffb953a06686 Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Wed, 10 Aug 2022 09:31:28 +0000 Subject: [PATCH 05/14] =?UTF-8?q?=EC=9B=B9=EC=9E=85=EC=B6=9C=EA=B8=88?= =?UTF-8?q?=EC=A0=95=EC=82=B0=20=EB=B3=80=EC=88=98=EB=AA=85=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/mock-api/apps/bank/web-calculate/data.ts | 10 +++++----- .../bank/web-calculate/components/list.component.html | 6 +++--- .../admin/bank/web-calculate/models/web-calculate.ts | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/app/mock-api/apps/bank/web-calculate/data.ts b/src/app/mock-api/apps/bank/web-calculate/data.ts index 73c782e..fc586f9 100644 --- a/src/app/mock-api/apps/bank/web-calculate/data.ts +++ b/src/app/mock-api/apps/bank/web-calculate/data.ts @@ -9,18 +9,18 @@ export const webCalculates = [ webDepositRank: '회원', nameOfDepositer: '가가가', webDepositAmountOfPayment: 100000, - webDepositRegistrationDate: '2022-06-13 12:57', + webDepositRegistDate: '2022-06-13 12:57', webDepositConfirmDate: '2022-06-13 12:58', webWithdrawIdx: 1, webWithdrawId: 'aa100', webWithdrawNickname: 'aa100', webWithdrawRank: '회원', - nameOfBank: '광주은행', + bankName: '광주은행', accountHolder: '예금주', accountNumber: '2222229999-222', webWithdrawAmountOfPayment: 5000000, - webWithdrawRegistrationDate: '2022-06-08 18:31', + webWithdrawRegistDate: '2022-06-08 18:31', webWithdrawConfirmDate: '2022-06-12 20:13', }, { @@ -31,7 +31,7 @@ export const webCalculates = [ webDepositRank: '회원', nameOfDepositer: '가가가', webDepositAmountOfPayment: 100000, - webDepositRegistrationDate: '2022-06-13 12:56', + webDepositRegistDate: '2022-06-13 12:56', webDepositConfirmDate: '2022-06-13 12:57', webWithdrawIdx: 2, @@ -40,7 +40,7 @@ export const webCalculates = [ webWithdrawRank: '회원', accountHolder: '광주은행 예금주22 565656565656', webWithdrawAmountOfPayment: 14000000, - webWithdrawRegistrationDate: '2022-06-10 18:31', + webWithdrawRegistDate: '2022-06-10 18:31', webWithdrawConfirmDate: '2022-06-10 20:13', }, ]; diff --git a/src/app/modules/admin/bank/web-calculate/components/list.component.html b/src/app/modules/admin/bank/web-calculate/components/list.component.html index 40b0f27..248d3df 100644 --- a/src/app/modules/admin/bank/web-calculate/components/list.component.html +++ b/src/app/modules/admin/bank/web-calculate/components/list.component.html @@ -117,7 +117,7 @@ {{ webCalculate.webDepositAmountOfPayment }}원
@@ -185,7 +185,7 @@
{{ webCalculate.webWithdrawRank }}
diff --git a/src/app/modules/admin/bank/web-calculate/models/web-calculate.ts b/src/app/modules/admin/bank/web-calculate/models/web-calculate.ts index c3b7eca..c115da0 100644 --- a/src/app/modules/admin/bank/web-calculate/models/web-calculate.ts +++ b/src/app/modules/admin/bank/web-calculate/models/web-calculate.ts @@ -6,7 +6,7 @@ export interface WebCalculate { webDepositRank?: string; // 웹입금 등급 nameOfDepositer?: string; // 입금자명 webDepositAmountOfPayment?: number; // 웹입금 결제금액 - webDepositRegistrationDate?: Date; // 웹입금 신청일 + webDepositRegistDate?: Date; // 웹입금 신청일 webDepositConfirmDate?: Date; // 웹입금 확인일 webWithdrawIdx?: number; // 웹출금 idx @@ -14,9 +14,9 @@ export interface WebCalculate { webWithdrawNickname?: string; // 웹출금 닉네임 webWithdrawRank?: string; // 웹출금 등급 accountHolder?: string; - nameOfBank?: string; + bankName?: string; accountNumber?: string; webWithdrawAmountOfPayment?: number; // 웹출금 결제금액 - webWithdrawRegistrationDate?: Date; // 웹출금 신청일 + webWithdrawRegistDate?: Date; // 웹출금 신청일 webWithdrawConfirmDate?: Date; // 웹출금 확인일 } From 66cad9bb8e2810b6b28b93327e3233a8c2417863 Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Wed, 10 Aug 2022 09:58:22 +0000 Subject: [PATCH 06/14] =?UTF-8?q?=EC=B6=9C=EA=B8=88=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EB=B3=80=EC=88=98=EB=AA=85=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/mock-api/apps/bank/withdraw/data.ts | 18 +++++++++--------- .../withdraw/components/list.component.html | 6 +++--- .../admin/bank/withdraw/models/withdraw.ts | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/app/mock-api/apps/bank/withdraw/data.ts b/src/app/mock-api/apps/bank/withdraw/data.ts index e6e1369..36c35d4 100644 --- a/src/app/mock-api/apps/bank/withdraw/data.ts +++ b/src/app/mock-api/apps/bank/withdraw/data.ts @@ -5,15 +5,15 @@ export const withdraws = [ rank: '회원', id: 'aa100', nickname: 'aa100', - applicationForCurrencyExchange: 14000000, + exchangeApplicationAmount: 14000000, calculateType: '롤링', accountHolder: '광주은행121212121212sss', note: '@', - registrationDate: '2022-06-10 16:51', + registDate: '2022-06-10 16:51', processDate: '2022-06-10 16:51', deposit: 41200000, withdraw: 19000000, - total: 22200000, + totalMoney: 22200000, highRank: '[매장]kgon5', state: '완료', }, @@ -21,15 +21,15 @@ export const withdraws = [ rank: '회원', id: 'aa100', nickname: 'aa100', - applicationForCurrencyExchange: 5000000, + exchangeApplicationAmount: 5000000, calculateType: '롤링', accountHolder: '광주은행121212121212sss', note: '@', - registrationDate: '2022-06-08 18:31', + registDate: '2022-06-08 18:31', processDate: '2022-06-08 20:13', deposit: 41200000, withdraw: 19000000, - total: 22200000, + totalMoney: 22200000, highRank: '[매장]kgon5', state: '완료', }, @@ -37,15 +37,15 @@ export const withdraws = [ rank: '회원', id: 'qwer12', nickname: '하하하', - applicationForCurrencyExchange: 10000, + exchangeApplicationAmount: 10000, calculateType: '롤링', accountHolder: '하나은행000210654151테스트', note: '', - registrationDate: '2022-06-08 01:22', + registDate: '2022-06-08 01:22', processDate: '2022-06-08 01:22', deposit: 10000000, withdraw: 10000, - total: 9990000, + totalMoney: 9990000, highRank: '[매장]kgon5', state: '완료', }, diff --git a/src/app/modules/admin/bank/withdraw/components/list.component.html b/src/app/modules/admin/bank/withdraw/components/list.component.html index f11085c..08aad1a 100644 --- a/src/app/modules/admin/bank/withdraw/components/list.component.html +++ b/src/app/modules/admin/bank/withdraw/components/list.component.html @@ -176,9 +176,9 @@
{{ withdraw.calculateType }}
{{ withdraw.note }}
-
{{ withdraw.applicationForCurrencyExchange }}
+
{{ withdraw.exchangeApplicationAmount }}
@@ -187,7 +187,7 @@
출금{{ withdraw.withdraw }}
- 계{{ withdraw.total }} + 계{{ withdraw.totalMoney }}
@@ -205,7 +205,7 @@ {{ partnerCalculate.partnerWithdrawAmountOfPayment }}원
diff --git a/src/app/modules/admin/bank/partner-calculate/models/partner-calculate.ts b/src/app/modules/admin/bank/partner-calculate/models/partner-calculate.ts index d8b80e6..8cadd30 100644 --- a/src/app/modules/admin/bank/partner-calculate/models/partner-calculate.ts +++ b/src/app/modules/admin/bank/partner-calculate/models/partner-calculate.ts @@ -6,7 +6,7 @@ export interface PartnerCalculate { partnerDepositRank?: string; // 입금파트너 등급 nameOfDepositer?: string; partnerDepositAmountOfPayment?: number; // 입금파트너 결제금액 - partnerDepositRegistDate?: Date; // 입금파트너 신청일 + partnerDepositregistrationDate?: Date; // 입금파트너 신청일 partnerDepositConfirmDate?: Date; // 입금파트너 확인일 partnerWithdrawIdx?: number; // 출금파트너 idx @@ -15,6 +15,6 @@ export interface PartnerCalculate { partnerWithdrawRank?: string; // 출금파트너 등급 accountHolder?: string; partnerWithdrawAmountOfPayment?: number; // 출금파트너 결제금액 - partnerWithdrawRegistDate?: Date; // 출금파트너 신청일 + partnerWithdrawregistrationDate?: Date; // 출금파트너 신청일 partnerWithdrawConfirmDate?: Date; // 출금파트너 확인일 } diff --git a/src/app/modules/admin/bank/web-calculate/components/list.component.html b/src/app/modules/admin/bank/web-calculate/components/list.component.html index 248d3df..955694d 100644 --- a/src/app/modules/admin/bank/web-calculate/components/list.component.html +++ b/src/app/modules/admin/bank/web-calculate/components/list.component.html @@ -117,7 +117,7 @@ {{ webCalculate.webDepositAmountOfPayment }}원 @@ -195,7 +195,7 @@ {{ webCalculate.webWithdrawAmountOfPayment }}원 diff --git a/src/app/modules/admin/bank/web-calculate/models/web-calculate.ts b/src/app/modules/admin/bank/web-calculate/models/web-calculate.ts index c115da0..0602d93 100644 --- a/src/app/modules/admin/bank/web-calculate/models/web-calculate.ts +++ b/src/app/modules/admin/bank/web-calculate/models/web-calculate.ts @@ -6,7 +6,7 @@ export interface WebCalculate { webDepositRank?: string; // 웹입금 등급 nameOfDepositer?: string; // 입금자명 webDepositAmountOfPayment?: number; // 웹입금 결제금액 - webDepositRegistDate?: Date; // 웹입금 신청일 + webDepositregistrationDate?: Date; // 웹입금 신청일 webDepositConfirmDate?: Date; // 웹입금 확인일 webWithdrawIdx?: number; // 웹출금 idx @@ -17,6 +17,6 @@ export interface WebCalculate { bankName?: string; accountNumber?: string; webWithdrawAmountOfPayment?: number; // 웹출금 결제금액 - webWithdrawRegistDate?: Date; // 웹출금 신청일 + webWithdrawregistrationDate?: Date; // 웹출금 신청일 webWithdrawConfirmDate?: Date; // 웹출금 확인일 } diff --git a/src/app/modules/admin/bank/withdraw/components/list.component.html b/src/app/modules/admin/bank/withdraw/components/list.component.html index 08aad1a..2bcd148 100644 --- a/src/app/modules/admin/bank/withdraw/components/list.component.html +++ b/src/app/modules/admin/bank/withdraw/components/list.component.html @@ -178,7 +178,7 @@
{{ withdraw.note }}
{{ withdraw.exchangeApplicationAmount }}
diff --git a/src/app/modules/admin/bank/withdraw/models/withdraw.ts b/src/app/modules/admin/bank/withdraw/models/withdraw.ts index b2f7a6a..72ebf5e 100644 --- a/src/app/modules/admin/bank/withdraw/models/withdraw.ts +++ b/src/app/modules/admin/bank/withdraw/models/withdraw.ts @@ -8,7 +8,7 @@ export interface Withdraw { calculateType?: string; accountHolder?: string; note?: string; - registDate?: string; + registrationDate?: string; processDate?: string; deposit?: number; withdraw?: number; diff --git a/src/app/modules/admin/game/evolution/components/list.component.html b/src/app/modules/admin/game/evolution/components/list.component.html index 3e3e8d2..d459d81 100644 --- a/src/app/modules/admin/game/evolution/components/list.component.html +++ b/src/app/modules/admin/game/evolution/components/list.component.html @@ -301,7 +301,7 @@ > diff --git a/src/app/modules/admin/game/evolution/models/evolution.ts b/src/app/modules/admin/game/evolution/models/evolution.ts index cc32f14..2924b20 100644 --- a/src/app/modules/admin/game/evolution/models/evolution.ts +++ b/src/app/modules/admin/game/evolution/models/evolution.ts @@ -47,6 +47,6 @@ export interface Evolution { commissionRate?: string; point?: string; }; - bettingRegistDate?: string; + bettingregistrationDate?: string; registrationDate?: string; } diff --git a/src/app/modules/admin/game/slot/components/list.component.html b/src/app/modules/admin/game/slot/components/list.component.html index ab61417..a07b99c 100644 --- a/src/app/modules/admin/game/slot/components/list.component.html +++ b/src/app/modules/admin/game/slot/components/list.component.html @@ -257,7 +257,7 @@ > diff --git a/src/app/modules/admin/game/slot/models/slot.ts b/src/app/modules/admin/game/slot/models/slot.ts index f5babb5..1d9645c 100644 --- a/src/app/modules/admin/game/slot/models/slot.ts +++ b/src/app/modules/admin/game/slot/models/slot.ts @@ -37,6 +37,6 @@ export interface Slot { commissionRate?: string; point?: string; }; - bettingRegistDate?: string; + bettingregistrationDate?: string; registrationDate?: string; } diff --git a/src/app/modules/admin/member/coupon-money-log/components/list.component.html b/src/app/modules/admin/member/coupon-money-log/components/list.component.html index d9eab86..fe23bb5 100644 --- a/src/app/modules/admin/member/coupon-money-log/components/list.component.html +++ b/src/app/modules/admin/member/coupon-money-log/components/list.component.html @@ -132,9 +132,9 @@ {{ couponMoneyLog.couponContents }} diff --git a/src/app/modules/admin/member/coupon-money-log/models/coupon-money-log.ts b/src/app/modules/admin/member/coupon-money-log/models/coupon-money-log.ts index 6e03061..9f4bf78 100644 --- a/src/app/modules/admin/member/coupon-money-log/models/coupon-money-log.ts +++ b/src/app/modules/admin/member/coupon-money-log/models/coupon-money-log.ts @@ -14,6 +14,6 @@ export interface CouponMoneyLog { takeCouponChangeMoney?: number; // 받은자의 변동금액 takeCouponAfterMoney?: number; // 받은자의 이후금액 couponContents?: string; // 내용 - giveCouponRegistDate?: Date; // 지급자의 등록시간 - takeCouponRegistDate?: Date; // 받은자의 등록시간 + giveCouponregistrationDate?: Date; // 지급자의 등록시간 + takeCouponregistrationDate?: Date; // 받은자의 등록시간 } diff --git a/src/app/modules/admin/member/partner/components/list.component.html b/src/app/modules/admin/member/partner/components/list.component.html index 3701aa0..d4e86c4 100644 --- a/src/app/modules/admin/member/partner/components/list.component.html +++ b/src/app/modules/admin/member/partner/components/list.component.html @@ -166,7 +166,7 @@ diff --git a/src/app/modules/admin/report/daily-partner/models/daily-partner.ts b/src/app/modules/admin/report/daily-partner/models/daily-partner.ts index edf6229..cb5a8c3 100644 --- a/src/app/modules/admin/report/daily-partner/models/daily-partner.ts +++ b/src/app/modules/admin/report/daily-partner/models/daily-partner.ts @@ -19,7 +19,7 @@ export interface DailyPartner { casinoWinning?: number; // 카지노당첨 casinoWinLoss?: number; // 카지노윈로스(A) casinoCommission?: number; // 카지노수수료(B) - casinoBetWinCalculate?: number; // 카지노벳윈정산 (A-B) + casinoBetWinCalculate?: number; // 카지노뱃윈정산 (A-B) slotBetting?: number; // 슬롯배팅 slotCancel?: number; // 슬롯취소 slotAvailable?: number; // 슬롯유효 @@ -28,11 +28,11 @@ export interface DailyPartner { slotTotalCommission?: number; // 슬롯전체수수료(E) slotBottomCommission?: number; // 슬롯하부수수료(E) slotOwnCommission?: number; // 슬롯본인수수료(E) - slotBetWinCalculate?: number; // 슬롯벳윈정산(D-E) + slotBetWinCalculate?: number; // 슬롯뱃윈정산(D-E) powerballBetting?: number; // 파워볼배팅 powerballWinning?: number; // 파워볼당첨 powerballWinLoss?: number; // 파워볼윈로스(H) powerballCommission?: number; // 파워볼수수료(I) - powerballBetWinCalculate?: number; // 파워볼벳윈정산(H-I) - totalBetWinCalculate?: number; // 총벳윈정산 + powerballBetWinCalculate?: number; // 파워볼뱃윈정산(H-I) + totalBetWinCalculate?: number; // 총뱃윈정산 } diff --git a/src/app/modules/admin/report/statistics/models/statistics.ts b/src/app/modules/admin/report/statistics/models/statistics.ts index d2d027f..895beba 100644 --- a/src/app/modules/admin/report/statistics/models/statistics.ts +++ b/src/app/modules/admin/report/statistics/models/statistics.ts @@ -10,24 +10,24 @@ export interface Statistics { casinoWinning?: number; // 카지노당첨 casinoWinLoss?: number; // 카지노윈로스(A) casinoCommission?: number; // 카지노수수료(B) - casinoBetWinCalculate?: number; // 카지노벳윈정산 (A-B) + casinoBetWinCalculate?: number; // 카지노뱃윈정산 (A-B) slotBetting?: number; // 슬롯배팅 slotCancel?: number; // 슬롯취소 slotAvailable?: number; // 슬롯유효 slotWinning?: number; // 슬롯당첨 slotWinLoss?: number; // 슬롯윈로스(D) slotTotalCommission?: number; // 슬롯전체수수료(E) - slotBetWinCalculate?: number; // 슬롯벳윈정산(D-E) + slotBetWinCalculate?: number; // 슬롯뱃윈정산(D-E) powerballBetting?: number; // 파워볼배팅 powerballWinning?: number; // 파워볼당첨 powerballWinLoss?: number; // 파워볼윈로스(H) powerballCommission?: number; // 파워볼수수료(I) - powerballBetWinCalculate?: number; // 파워볼벳윈정산(H-I) + powerballBetWinCalculate?: number; // 파워볼뱃윈정산(H-I) totalUse?: number; // 총이용회원 totalAvailable?: number; // 총유효배팅 totalBetting?: number; // 총배팅 totalCancel?: number; // 총취소 totalWinLoss?: number; // 총윈로스 totalCommission?: number; // 총수수료 - totalBetWinCalculate?: number; // 총벳윈정산 + totalBetWinCalculate?: number; // 총뱃윈정산 } 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 38ff7f6..e27ad39 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 @@ -174,7 +174,7 @@ - + diff --git a/src/app/modules/admin/report/today-bet/models/today-bet.ts b/src/app/modules/admin/report/today-bet/models/today-bet.ts index 42936c7..ec3e200 100644 --- a/src/app/modules/admin/report/today-bet/models/today-bet.ts +++ b/src/app/modules/admin/report/today-bet/models/today-bet.ts @@ -22,18 +22,18 @@ export interface TodayBet { casinoWinning?: number; // 카지노당첨 casinoWinLoss?: number; // 카지노윈로스(A) casinoCommission?: number; // 카지노수수료(B) - casinoBetWinCalculate?: number; // 카지노벳윈정산 (A-B) + casinoBetWinCalculate?: number; // 카지노뱃윈정산 (A-B) slotBetting?: number; // 슬롯배팅 slotCancel?: number; // 슬롯취소 slotAvailable?: number; // 슬롯유효 slotWinning?: number; // 슬롯당첨 slotWinLoss?: number; // 슬롯윈로스(D) slotCommission?: number; // 슬롯수수료(E) - slotBetWinCalculate?: number; // 슬롯벳윈정산(D-E) + slotBetWinCalculate?: number; // 슬롯뱃윈정산(D-E) powerballBetting?: number; // 파워볼배팅 powerballWinning?: number; // 파워볼당첨 powerballWinLoss?: number; // 파워볼윈로스(H) powerballCommission?: number; // 파워볼수수료(I) - powerballBetWinCalculate?: number; // 파워볼벳윈정산(H-I) - totalBetWinCalculate?: number; // 총벳윈정산 + powerballBetWinCalculate?: number; // 파워볼뱃윈정산(H-I) + totalBetWinCalculate?: number; // 총뱃윈정산 } From e0ff5847ff13dc807fd05fde49681c4a531b7111 Mon Sep 17 00:00:00 2001 From: Park Byung Eun Date: Wed, 10 Aug 2022 13:08:31 +0000 Subject: [PATCH 14/14] bug fixed --- .../user/components/list.component.html | 94 ++++++++++++------- 1 file changed, 61 insertions(+), 33 deletions(-) diff --git a/src/app/modules/admin/member/user/components/list.component.html b/src/app/modules/admin/member/user/components/list.component.html index 735f557..c00ca7a 100644 --- a/src/app/modules/admin/member/user/components/list.component.html +++ b/src/app/modules/admin/member/user/components/list.component.html @@ -150,13 +150,15 @@
@@ -166,7 +168,8 @@
요율
상부
- 아이디 +
아이디
+
닉네임
@@ -192,7 +195,9 @@
- +
@@ -272,6 +277,59 @@
+
+ + + + + + + + + +
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -