diff --git a/src/app/mock-api/apps/member/partner/api.ts b/src/app/mock-api/apps/member/partner/api.ts
index aec6a86..f957c34 100644
--- a/src/app/mock-api/apps/member/partner/api.ts
+++ b/src/app/mock-api/apps/member/partner/api.ts
@@ -33,7 +33,7 @@ export class MemberPartnerMockApi {
.reply(({ request }) => {
// Get available queries
const search = request.params.get('search');
- const sort = request.params.get('sort') || 'name';
+ const sort = request.params.get('sort') || 'signinId';
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 MemberPartnerMockApi {
let partners: any[] | null = cloneDeep(this._partners);
// Sort the partners
- if (sort === 'sku' || sort === 'name' || sort === 'active') {
+ if (sort === 'signinId' || sort === 'nickname' || sort === 'state') {
partners.sort((a, b) => {
const fieldA = a[sort].toString().toUpperCase();
const fieldB = b[sort].toString().toUpperCase();
diff --git a/src/app/mock-api/apps/member/partner/data.ts b/src/app/mock-api/apps/member/partner/data.ts
index 66280ff..6ee949b 100644
--- a/src/app/mock-api/apps/member/partner/data.ts
+++ b/src/app/mock-api/apps/member/partner/data.ts
@@ -2,7 +2,8 @@
export const partners = [
{
- id: 'kgon1',
+ id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
+ signinId: 'kgon1',
nickname: '본사',
rank: '본사',
branchCount: 2,
@@ -15,16 +16,43 @@ export const partners = [
holdingMoney: 253675,
accountHolder: '본사',
phoneNumber: '010-0000-0000',
- comp: 100737,
- coupon: 1900000,
+ ownCash: 253675,
+ ownComp: 100737,
+ ownCoupon: 1900000,
ownCharge: 460000,
bottomCharge: 54020000,
ownExchange: 100000,
bottomExchange: 19970000,
ownRevenue: 360000,
bottomRevenue: 34050000,
- accession: '2021-10-14 10:53',
+ registDate: '2021-10-14 10:53',
+ state: '정상',
+ },
+ {
+ id: '00b0292f-3d50-4669-a0c4-7a9d85efc98d',
+ signinId: 'test11',
+ nickname: '본사',
+ rank: '본사',
+ branchCount: 2,
+ divisionCount: 2,
+ officeCount: 1,
+ storeCount: 1,
+ memberCount: 5,
+ level: '1',
+ calculateType: '롤링',
+ holdingMoney: 253675,
+ accountHolder: '테스트',
+ phoneNumber: '010-1234-5678',
+ ownCash: 0,
+ ownComp: 6485,
+ ownCoupon: 0,
+ ownCharge: 0,
+ bottomCharge: 1000000,
+ ownExchange: 0,
+ bottomExchange: 0,
+ ownRevenue: 0,
+ bottomRevenue: 1000000,
+ registDate: '2022-04-22 18:55',
state: '정상',
- note: '대본등록',
},
];
diff --git a/src/app/modules/admin/member/partner/components/all-list.component.html b/src/app/modules/admin/member/partner/components/all-list.component.html
index 258fa76..65c5198 100644
--- a/src/app/modules/admin/member/partner/components/all-list.component.html
+++ b/src/app/modules/admin/member/partner/components/all-list.component.html
@@ -13,56 +13,18 @@
-
-
-
-
-
-
-
-
-
+
+ 총회원수:38명
+ 총 보유머니:21,437,873원
+ 총 콤프:394,860원
+ 총 합계:21,832,733원
+
-
-
-
아이디
-
매장수
-
관리
-
요율
-
예금주
-
연락처
-
등급
-
정산
-
보유금
-
로그
-
콤프
-
쿠폰
-
충전금
-
환전금
-
수익금
-
가입날짜
-
상태
-
비고
-
+
정산종류
+
보유금
+
충전금
+
환전금
+
수익금
+
가입날짜
+
비고
@@ -117,238 +73,68 @@
-
-
-
-
- {{ partner.rank }}
-
- {{ partner.id }}
-
-
- {{ partner.nickname }}
-
-
-
-
-
- {{ partner.branchCount }}
- {{ partner.divisionCount }}
- {{ partner.officeCount }}
- {{ partner.storeCount }}
- {{ partner.memberCount }}
+
관리
+
요율
+
+ {{ partner.branchCount }}{{ partner.divisionCount
+ }}{{ partner.officeCount }}{{ partner.storeCount
+ }}{{ partner.memberCount }}
-
-
-
-
-
-
-
-
-
-
- {{ partner.accountHolder }}
-
-
-
-
- {{ partner.phoneNumber }}
-
-
-
-
- LV.{{ partner.level }}
-
-
-
-
-
- {{ partner.calculateType }}
-
-
-
-
- 콤프{{ partner.comp }} 쿠폰{{ partner.coupon }}
-
-
-
-
- {{ partner.holdingMoney }}
-
-
-
-
- {{ partner.comp }}P
-
-
-
-
- {{ partner.coupon }}
-
-
-
-
- 본인 {{ partner.ownCharge }} 하부
- {{ partner.bottomCharge }}
-
-
-
-
- 본인 {{ partner.ownExchange }} 하부
- {{ partner.bottomExchange }}
-
-
-
-
- 본인 {{ partner.ownRevenue }} 하부
- {{ partner.bottomRevenue }}
-
-
-
-
- 가입날짜{{ partner.accession }}
-
-
-
-
+
+ {{ partner.signinId }}
+
+ {{ partner.nickname }}
+
{{ partner.state }}
-
-
-
+
+ {{ partner.rank }}
+
+ LV{{ partner.level }}
+
+
+ {{ partner.accountHolder }}
+
+ {{ partner.phoneNumber }}
+
+
+ {{ partner.calculateType }}
+
+
+ 캐쉬{{ partner.ownCash }}
+
+ 콤프{{ partner.ownComp }}P
+
+ 쿠폰{{ partner.ownCoupon }}
+
+
+ 본인{{ partner.ownCharge }}
+
+ 하부{{ partner.bottomCharge }}
+
+
+ 본인{{ partner.ownExchange }}
+
+ 하부{{ partner.bottomExchange }}
+
+
+ 본인{{ partner.ownRevenue }}
+
+ 하부{{ partner.bottomRevenue }}
+
+
+ {{ partner.registDate }}
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -370,7 +156,7 @@
- There are no partners!
+ There are no partner!
diff --git a/src/app/modules/admin/member/partner/components/all-list.component.ts b/src/app/modules/admin/member/partner/components/all-list.component.ts
index a7eff03..5dc9b39 100644
--- a/src/app/modules/admin/member/partner/components/all-list.component.ts
+++ b/src/app/modules/admin/member/partner/components/all-list.component.ts
@@ -44,18 +44,22 @@ import { MatDialog } from '@angular/material/dialog';
/* language=SCSS */
`
.inventory-grid {
- grid-template-columns: 60px auto 40px;
+ /* 관리 요율 매장 아이디 등급 */
+ grid-template-columns: 40px 40px 100px auto 40px;
@screen sm {
- grid-template-columns: 60px auto 60px 72px;
+ /* 관리 요율 매장 아이디 등급 예금주 */
+ grid-template-columns: 40px 40px 100px auto 40px 140px;
}
@screen md {
- grid-template-columns: 60px 60px auto 112px 72px;
+ /* 관리 요율 매장 아이디 등급 예금주 정산 보유금 */
+ grid-template-columns: 40px 40px 100px auto 40px 140px 20px 140px;
}
@screen lg {
- grid-template-columns: 60px 60px auto 112px 96px 96px 72px;
+ /* 관리 요율 매장 아이디 등급 예금주 정산 보유금 충전금 환전금 수익금 가입 비고 */
+ grid-template-columns: 40px 40px 100px auto 40px 140px 20px 140px 140px 140px 140px 140px 140px;
}
}
`,
diff --git a/src/app/modules/admin/member/partner/models/partner.ts b/src/app/modules/admin/member/partner/models/partner.ts
index 0b776d2..cec5b3f 100644
--- a/src/app/modules/admin/member/partner/models/partner.ts
+++ b/src/app/modules/admin/member/partner/models/partner.ts
@@ -1,10 +1,8 @@
import { NumberValueAccessor } from '@angular/forms';
export interface Partner {
- id?: string;
- totalMemberCount?: number;
- totalHoldingMoney?: number;
- totalComp?: number;
+ id: string;
+ signinId?: string;
nickname?: string;
rank?: string;
branchCount?: number;
@@ -17,8 +15,6 @@ export interface Partner {
holdingMoney?: number;
accountHolder?: string;
phoneNumber?: string;
- comp?: number;
- coupon?: number;
ownCharge?: number;
ownCash?: number;
ownComp?: number;
@@ -28,12 +24,8 @@ export interface Partner {
bottomExchange?: number;
ownRevenue?: number;
bottomRevenue?: number;
- accession?: string;
state?: string;
- note?: string;
ip?: string;
- totalPartnerCount?: number;
- total?: number;
gameMoney?: number;
todayComp?: number;
totalDeposit?: number;
@@ -41,4 +33,5 @@ export interface Partner {
balance?: number;
registDate?: string;
finalSigninDate?: string;
+ note?: string;
}