diff --git a/src/app/mock-api/apps/member/coupon-money-log/data.ts b/src/app/mock-api/apps/member/coupon-money-log/data.ts
index 94594ec..0d42b6c 100644
--- a/src/app/mock-api/apps/member/coupon-money-log/data.ts
+++ b/src/app/mock-api/apps/member/coupon-money-log/data.ts
@@ -9,13 +9,47 @@ export const couponMoneyLogs = [
takeCouponId: 'on04',
takeCouponRank: '매장',
giveCouponBeforeMoney: 0,
- giveCouponVarianceMoney: -50000,
+ giveCouponChangeMoney: -50000,
giveCouponAfterMoney: 0,
takeCouponBeforeMoney: 0,
- takeCouponVarianceMoney: 50000,
+ takeCouponChangeMoney: 50000,
takeCouponAfterMoney: 50000,
couponContents: '오링쿠폰',
giveCouponRegistrationDate: '2022-06-12 16:22',
takeCouponRegistrationDate: '2022-06-12 16:22',
},
+ {
+ id: '00b0292f-3d50-4669-a0c4-7a9d85efc98d',
+ idx: 14,
+ giveCouponId: 'ADMIN',
+ giveCouponRank: 'ADMIN',
+ takeCouponId: 'on03',
+ takeCouponRank: '총판',
+ giveCouponBeforeMoney: 0,
+ giveCouponChangeMoney: -50000,
+ giveCouponAfterMoney: 0,
+ takeCouponBeforeMoney: 0,
+ takeCouponChangeMoney: 50000,
+ takeCouponAfterMoney: 50000,
+ couponContents: '쿠폰테스스',
+ giveCouponRegistrationDate: '2022-06-12 16:22',
+ takeCouponRegistrationDate: '2022-06-12 16:22',
+ },
+ {
+ id: 'b899ec30-b85a-40ab-bb1f-18a596d5c6de',
+ idx: 13,
+ giveCouponId: 'on00',
+ giveCouponRank: '본사',
+ takeCouponId: 'ADMIN',
+ takeCouponRank: 'ADMIN',
+ giveCouponBeforeMoney: 100000,
+ giveCouponChangeMoney: -50000,
+ giveCouponAfterMoney: 50000,
+ takeCouponBeforeMoney: 0,
+ takeCouponChangeMoney: 50000,
+ takeCouponAfterMoney: 0,
+ couponContents: '쿠폰테스스',
+ giveCouponRegistrationDate: '2022-06-12 16:17',
+ takeCouponRegistrationDate: '2022-06-12 16:17',
+ },
];
diff --git a/src/app/mock-api/apps/report/payment-log/api.ts b/src/app/mock-api/apps/report/payment-log/api.ts
index 6f98a33..18ea648 100644
--- a/src/app/mock-api/apps/report/payment-log/api.ts
+++ b/src/app/mock-api/apps/report/payment-log/api.ts
@@ -33,7 +33,7 @@ export class ReportPaymentLogMockApi {
.reply(({ request }) => {
// Get available queries
const search = request.params.get('search');
- const sort = request.params.get('sort') || 'name';
+ const sort = request.params.get('sort') || 'giveId';
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);
@@ -42,7 +42,7 @@ export class ReportPaymentLogMockApi {
let paymentLogs: any[] | null = cloneDeep(this._paymentLogs);
// Sort the paymentLogs
- if (sort === 'sku' || sort === 'name' || sort === 'active') {
+ if (sort === 'giveId' || sort === 'takeId' || sort === 'idx') {
paymentLogs.sort((a, b) => {
const fieldA = a[sort].toString().toUpperCase();
const fieldB = b[sort].toString().toUpperCase();
diff --git a/src/app/mock-api/apps/report/payment-log/data.ts b/src/app/mock-api/apps/report/payment-log/data.ts
index 98e4bc4..ffc8a6d 100644
--- a/src/app/mock-api/apps/report/payment-log/data.ts
+++ b/src/app/mock-api/apps/report/payment-log/data.ts
@@ -2,32 +2,99 @@
export const paymentLogs = [
{
- 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: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
+ idx: 6,
+ giveRank: '회원',
+ takeRank: '총판',
+ giveId: 'onon6',
+ takeId: 'on03',
+ giveBeforeMoney: 0,
+ giveChangeMoney: 10000,
+ giveAfterMoney: 10000,
+ takeBeforeMoney: 213940,
+ takeChangeMoney: -10000,
+ takeAfterMoney: 203940,
+ giveRegistrationDate: '2022-06-12 17:43',
+ takeRegistrationDate: '2022-06-12 17:43',
+ },
+ {
+ id: '00b0292f-3d50-4669-a0c4-7a9d85efc98d',
+ idx: 5,
+ giveRank: '매장',
+ takeRank: '회원',
+ giveId: 'on04',
+ takeId: 'onon6',
+ giveBeforeMoney: 0,
+ giveChangeMoney: 200000,
+ giveAfterMoney: 200000,
+ takeBeforeMoney: 200000,
+ takeChangeMoney: -200000,
+ takeAfterMoney: 0,
+ giveRegistrationDate: '2022-06-12 16:22',
+ takeRegistrationDate: '2022-06-12 16:22',
+ },
+ {
+ id: 'b899ec30-b85a-40ab-bb1f-18a596d5c6de',
+ idx: 4,
+ giveRank: '총판',
+ takeRank: '매장',
+ giveId: 'on03',
+ takeId: 'on04',
+ giveBeforeMoney: 0,
+ giveChangeMoney: 200000,
+ giveAfterMoney: 200000,
+ takeBeforeMoney: 200000,
+ takeChangeMoney: -200000,
+ takeAfterMoney: 0,
+ giveRegistrationDate: '2022-06-12 16:21',
+ takeRegistrationDate: '2022-06-12 16:21',
+ },
+ {
+ id: '8fcce528-d878-4cc8-99f7-bd3451ed5405',
+ idx: 3,
+ giveRank: '부본사',
+ takeRank: '총판',
+ giveId: 'on02',
+ takeId: 'on03',
+ giveBeforeMoney: 0,
+ giveChangeMoney: 200000,
+ giveAfterMoney: 200000,
+ takeBeforeMoney: 200000,
+ takeChangeMoney: -200000,
+ takeAfterMoney: 0,
+ giveRegistrationDate: '2022-06-12 16:20',
+ takeRegistrationDate: '2022-06-12 16:20',
+ },
+ {
+ id: '8fcce528-d878-4cc8-99f7-bd3451ed5406',
+ idx: 2,
+ giveRank: '대본사',
+ takeRank: '부본사',
+ giveId: 'on01',
+ takeId: 'on02',
+ giveBeforeMoney: 0,
+ giveChangeMoney: 200000,
+ giveAfterMoney: 200000,
+ takeBeforeMoney: 250000,
+ takeChangeMoney: -200000,
+ takeAfterMoney: 50000,
+ giveRegistrationDate: '2022-06-12 16:16',
+ takeRegistrationDate: '2022-06-12 16:16',
+ },
+ {
+ id: 'd7a47d7c-4cdf-4319-bbaa-37ade38c622c',
+ idx: 1,
+ giveRank: '본사',
+ takeRank: '대본사',
+ giveId: 'on00',
+ takeId: 'on01',
+ giveBeforeMoney: 0,
+ giveChangeMoney: 250000,
+ giveAfterMoney: 250000,
+ takeBeforeMoney: 300000,
+ takeChangeMoney: -250000,
+ takeAfterMoney: 50000,
+ giveRegistrationDate: '2022-06-12 16:11',
+ takeRegistrationDate: '2022-06-12 16:11',
},
];
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 7cf958a..fbed494 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
@@ -97,7 +97,7 @@
{{ couponMoneyLog.giveCouponRank
}}{{ couponMoneyLog.takeCouponRank }}지급
+ >{{ couponMoneyLog.takeCouponRank }}지급or회수
{{ couponMoneyLog.giveCouponRank
@@ -114,19 +114,19 @@
}}{{ couponMoneyLog.giveCouponId }}
- {{ couponMoneyLog.takeCouponBeforeMoney }}
+ {{ couponMoneyLog.takeCouponBeforeMoney }}원
- {{ couponMoneyLog.giveCouponBeforeMoney }}
+ {{ couponMoneyLog.giveCouponBeforeMoney }}원
- {{ couponMoneyLog.takeCouponVarianceMoney }}
+ {{ couponMoneyLog.takeCouponChangeMoney }}원
- {{ couponMoneyLog.giveCouponVarianceMoney }}
+ {{ couponMoneyLog.giveCouponChangeMoney }}원
- {{ couponMoneyLog.takeCouponAfterMoney }}
+ {{ couponMoneyLog.takeCouponAfterMoney }}원
- {{ couponMoneyLog.giveCouponAfterMoney }}
+ {{ couponMoneyLog.giveCouponAfterMoney }}원
{{ couponMoneyLog.couponContents }}
diff --git a/src/app/modules/admin/member/coupon-money-log/components/list.component.ts b/src/app/modules/admin/member/coupon-money-log/components/list.component.ts
index d4df12f..f1b29e3 100644
--- a/src/app/modules/admin/member/coupon-money-log/components/list.component.ts
+++ b/src/app/modules/admin/member/coupon-money-log/components/list.component.ts
@@ -42,22 +42,22 @@ import { Router } from '@angular/router';
/* language=SCSS */
`
.inventory-grid {
- /* 번호 비고 정보 아이디 이전 */
- grid-template-columns: 20px 140px 140px auto 140px;
+ /* 번호 비고 정보 아이디 이전 */
+ grid-template-columns: 100px 200px auto 100px 100px;
@screen sm {
- /* 번호 비고 정보 아이디 이전 변동 */
- grid-template-columns: 20px 140px 140px auto 140px 40px 140px 140px;
+ /* 번호 비고 정보 아이디 이전 변동 */
+ grid-template-columns: 100px 200px auto 100px 100px 100px;
}
@screen md {
- /* 번호 비고 정보 아이디 이전 변동 이후 */
- grid-template-columns: 20px 140px 140px auto 140px 40px 140px;
+ /* 번호 비고 정보 아이디 이전 변동 이후 */
+ grid-template-columns: 100px 200px auto 100px 100px 100px 140px;
}
@screen lg {
- /* 번호 비고 정보 아이디 이전 변동 이후 내용 등록시간 */
- grid-template-columns: 20px 140px 140px auto 140px 140px 140px 140px 140px;
+ /* 번호 비고 정보 아이디 이전 변동 이후 내용 등록시간 */
+ grid-template-columns: 100px 200px auto 100px 100px 100px 140px 140px 140px;
}
}
`,
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 661a40b..0200eda 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
@@ -3,41 +3,17 @@ export interface CouponMoneyLog {
idx?: number;
giveCouponId?: string; // 쿠폰지급 해준 아이디
giveCouponRank?: string; // 쿠폰지급 해준 등급
- takeCouponId?: string; // 쿠폰지급 받은 아이디
- takeCouponRank?: string; // 쿠폰지급 받은 등급
- useCouponId?: string; // 쿠폰사용 아이디
- useCouponRank?: string; // 쿠폰사용 등급
- retrieveCouponId?: string; // 쿠폰 회수 아이디
- retrieveCouponRank?: string; // 쿠폰 회수 등급
+ takeCouponId?: string; // 쿠폰 받은 아이디
+ takeCouponRank?: string; // 쿠폰 받은 등급
giveCouponBeforeMoney?: number; // 지급자의 이전금액
- giveCouponVarianceMoney?: number; // 지급자의 변동금액
+ giveCouponChangeMoney?: number; // 지급자의 변동금액
giveCouponAfterMoney?: number; // 지급자의 이후금액
takeCouponBeforeMoney?: number; // 받은자의 이전금액
- takeCouponVarianceMoney?: number; // 받은자의 변동금액
+ takeCouponChangeMoney?: number; // 받은자의 변동금액
takeCouponAfterMoney?: number; // 받은자의 이후금액
-
- useCouponBeforeMoney?: number; // 쿠폰사용자의 이전금액
- useCouponVarianceMoney?: number; // 쿠폰사용자의 변동금액
- useCouponAfterMoney?: number; // 쿠폰사용자의 이후금액
-
- retrieveCouponBeforeMoney?: number; // 쿠폰회수자의 이전금액
- retrieveCouponVarianceMoney?: number; // 쿠폰회수자의 변동금액
- retrieveCouponAfterMoney?: number; // 쿠폰회수자의 이후금액
-
couponContents?: string; // 내용
giveCouponRegistrationDate?: Date; // 지급자의 등록시간
takeCouponRegistrationDate?: Date; // 받은자의 등록시간
- useCouponRegistrationDate?: Date; // 쿠폰사용자의 등록시간
- retrieveCouponRegistrationDate?: Date; // 쿠폰회수자의 등록시간
}
-
-// issued
-// 생성, 발행
-
-// give - take
-// 쿠폰지급 - 쿠폰지급 받음
-
-// use - retrieve
-// 쿠폰사용 - 쿠폰회수
diff --git a/src/app/modules/admin/report/payment-log/components/list.component.html b/src/app/modules/admin/report/payment-log/components/list.component.html
index 9e5f004..96b1d5e 100644
--- a/src/app/modules/admin/report/payment-log/components/list.component.html
+++ b/src/app/modules/admin/report/payment-log/components/list.component.html
@@ -10,113 +10,32 @@
-
+
-
-
-
+
+
+
+
+
+
+
+
-
-
- 40
- 60
- 80
- 100
-
-
-
-
- LV.1
- LV.2
- LV.3
- LV.4
-
-
-
-
- 정상
- 대기
- 탈퇴
- 휴면
- 블랙
- 정지
-
-
-
-
- 카지노제한
- 슬롯제한
-
-
-
-
- 계좌입금
-
-
-
-
- 카지노콤프
- 슬롯콤프
- 배팅콤프
- 첫충콤프
-
-
-
-
-
-
@@ -157,29 +74,15 @@
-
-
요율
-
상부트리
-
관리
-
매장수
-
회원수
+
번호
+
비고
+
정보
아이디
-
닉네임
-
예금주
-
연락처
-
정산
-
보유금
-
게임중머니
-
카지노->캐쉬
-
금일콤프
-
총입출
-
로그
-
상태
-
회원수
-
비고
+
이전금액
+
변동금액
+
이후금액
+
등록시간
@@ -189,143 +92,43 @@
-
-
+
+ {{ paymentLog.idx }}
-
-
-
-
-
-
-
+
+ {{ paymentLog.giveRank }}
+
+ {{ paymentLog.takeRank }}회수or지급
-
-
-
-
-
-
+
+ {{ paymentLog.giveRank }}{{ paymentLog.giveId }}
+
+ {{ paymentLog.takeRank }}{{ paymentLog.takeId }}
-
-
-
+
+ {{ paymentLog.takeRank }}{{ paymentLog.takeId }}
+
+ {{ paymentLog.giveRank }}{{ paymentLog.giveId }}
-
-
-
-
- {{ paymentLog.id }}
-
-
-
-
-
- {{ paymentLog.nickname }}
+
+ {{ paymentLog.takeBeforeMoney }}원
+
+ {{ paymentLog.giveBeforeMoney }}원
-
-
- {{ paymentLog.accountHolder }}
+
+ {{ paymentLog.takeChangeMoney }}원
+
+ {{ paymentLog.giveChangeMoney }}원
-
-
- {{ paymentLog.phoneNumber }}
+
+ {{ paymentLog.takeAfterMoney }}원
+
+ {{ paymentLog.giveAfterMoney }}원
-
-
- {{ paymentLog.calculateType }}
-
-
-
- 캐쉬{{ paymentLog.ownCash }} 콤프{{
- paymentLog.ownComp
- }}
- 쿠폰{{ paymentLog.ownCoupon }}
-
-
-
- {{ paymentLog.gameMoney }}
-
-
-
-
-
-
-
-
- {{ paymentLog.todayComp }}P
-
-
-
- 입금{{ paymentLog.totalDeposit }} 출금{{
- paymentLog.totalWithdraw
- }}
- 차익{{ paymentLog.balance }}
-
-
-
- 가입{{ paymentLog.registDate }} 최종{{
- paymentLog.finalSigninDate
- }}
- IP{{ paymentLog.ip }}
-
-
-
- {{ paymentLog.state }}
-
-
-
- {{ paymentLog.memberCount }}
-
-
-
-
+
+ {{ paymentLog.takeRegistrationDate }}
+
+ {{ paymentLog.giveRegistrationDate }}
@@ -348,7 +151,7 @@
- There are no paymentLogs!
+ There are no data!
diff --git a/src/app/modules/admin/report/payment-log/components/list.component.ts b/src/app/modules/admin/report/payment-log/components/list.component.ts
index fc148ad..67615e5 100644
--- a/src/app/modules/admin/report/payment-log/components/list.component.ts
+++ b/src/app/modules/admin/report/payment-log/components/list.component.ts
@@ -42,18 +42,22 @@ import { Router } from '@angular/router';
/* language=SCSS */
`
.inventory-grid {
- grid-template-columns: 60px auto 40px;
+ /* 번호 비고 정보 아이디 이전 변동 */
+ grid-template-columns: 100px 200px auto 100px 100px 100px;
@screen sm {
- grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px;
+ /* 번호 비고 정보 아이디 이전 변동 이후 등록시간 */
+ grid-template-columns: 100px 200px auto 100px 100px 100px 100px 100px;
}
@screen md {
- grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px 60px;
+ /* 번호 비고 정보 아이디 이전 변동 이후 등록시간 */
+ grid-template-columns: 100px 200px auto 100px 100px 100px 100px 100px;
}
@screen lg {
- grid-template-columns: 60px 70px 70px 70px 70px 100px 60px 60px auto 60px 60px 60px 60px;
+ /* 번호 비고 정보 아이디 이전 변동 이후 등록시간 */
+ grid-template-columns: 100px 200px auto 100px 100px 100px 100px 100px;
}
}
`,
@@ -69,6 +73,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
paymentLogs$!: Observable
;
users$!: Observable;
+ __isSearchOpened = false;
isLoading = false;
searchInputControl = new FormControl();
selectedPaymentLog?: PaymentLog;
@@ -186,6 +191,14 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
*/
__toggleDetails(productId: string): void {}
+ /**
+ * toggle the search
+ * Used in 'bar'
+ */
+ __onClickSearch(): void {
+ this.__isSearchOpened = !this.__isSearchOpened;
+ }
+
/**
* Track by function for ngFor loops
*
diff --git a/src/app/modules/admin/report/payment-log/models/payment-log.ts b/src/app/modules/admin/report/payment-log/models/payment-log.ts
index dd5bef9..ee003fc 100644
--- a/src/app/modules/admin/report/payment-log/models/payment-log.ts
+++ b/src/app/modules/admin/report/payment-log/models/payment-log.ts
@@ -1,29 +1,16 @@
export interface PaymentLog {
- id?: string;
- totalPartnerCount?: number;
- totalHoldingMoney?: number;
- totalComp?: number;
- total?: number;
- branchCount?: number;
- divisionCount?: number;
- officeCount?: number;
- storeCount?: number;
- memberCount?: number;
- nickname?: string;
- accountHolder?: string;
- phoneNumber?: string;
- calculateType?: string;
- ownCash?: number;
- ownComp?: number;
- ownCoupon?: number;
- gameMoney?: number;
- todayComp?: number;
- totalDeposit?: number;
- totalWithdraw?: number;
- balance?: number;
- registDate?: string;
- finalSigninDate?: string;
- ip?: string;
- state?: string;
- note?: string;
+ id: string;
+ idx?: number;
+ giveRank?: string; // 지급자 등급
+ giveId?: string; // 지급자 아이디
+ giveBeforeMoney?: number; // 지급자 이전금액
+ giveChangeMoney?: number; // 지급자 변동금액
+ giveAfterMoney?: number; // 지급자 이후금액
+ takeRank?: string; // 회수자 등급
+ takeId?: string; // 회수자 아이디
+ takeBeforeMoney?: number; // 회수자 이전금액
+ takeChangeMoney?: number; // 회수자 변동금액
+ takeAfterMoney?: number; // 회수자 이후금액
+ giveRegistrationDate?: Date; // 지급자 등록시간
+ takeRegistrationDate?: Date; // 회수자 등록시간
}