From b8a5b98d811c00a780a9206ef18004241a27f8cb Mon Sep 17 00:00:00 2001
From: JUNG YI DAM <breeze@loafle.com>
Date: Tue, 2 Aug 2022 09:32:31 +0000
Subject: [PATCH] =?UTF-8?q?=EC=BF=A0=ED=8F=B0=EB=B0=9C=ED=96=89=EB=A8=B8?=
 =?UTF-8?q?=EB=8B=88=EB=A1=9C=EA=B7=B8=20=EB=B3=80=EC=88=98=EB=AA=85?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apps/member/coupon-money-log/data.ts      | 38 ++++++++++++++++++-
 .../components/list.component.html            | 14 +++----
 .../components/list.component.ts              | 16 ++++----
 .../models/coupon-money-log.ts                | 32 ++--------------
 4 files changed, 55 insertions(+), 45 deletions(-)

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/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 @@
                   <div>
                     {{ couponMoneyLog.giveCouponRank
                     }}<mat-icon svgIcon="play-outline"></mat-icon
-                    >{{ couponMoneyLog.takeCouponRank }}지급
+                    >{{ couponMoneyLog.takeCouponRank }}지급or회수
                   </div>
                   <div>
                     {{ couponMoneyLog.giveCouponRank
@@ -114,19 +114,19 @@
                     }}{{ couponMoneyLog.giveCouponId }}
                   </div>
                   <div class="hidden md:block">
-                    {{ couponMoneyLog.takeCouponBeforeMoney }}
+                    {{ couponMoneyLog.takeCouponBeforeMoney }}원
                     <hr style="margin: 7px 0px" />
-                    {{ couponMoneyLog.giveCouponBeforeMoney }}
+                    {{ couponMoneyLog.giveCouponBeforeMoney }}원
                   </div>
                   <div class="hidden md:block">
-                    {{ couponMoneyLog.takeCouponVarianceMoney }}
+                    {{ couponMoneyLog.takeCouponChangeMoney }}원
                     <hr style="margin: 7px 0px" />
-                    {{ couponMoneyLog.giveCouponVarianceMoney }}
+                    {{ couponMoneyLog.giveCouponChangeMoney }}원
                   </div>
                   <div class="hidden md:block">
-                    {{ couponMoneyLog.takeCouponAfterMoney }}
+                    {{ couponMoneyLog.takeCouponAfterMoney }}원
                     <hr style="margin: 7px 0px" />
-                    {{ couponMoneyLog.giveCouponAfterMoney }}
+                    {{ couponMoneyLog.giveCouponAfterMoney }}원
                   </div>
                   <div class="hidden lg:block">
                     {{ 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
-// 쿠폰사용 - 쿠폰회수