- 자금이체 페이지 List 초기화 문제 및 Cursor 유지 오류 수정

- KeyIn결제 page 수정

src/entities/additional-service/model/fund-account/constant.ts

@@ -1,6 +1,7 @@
 import {
   FundAccountReceiveAccountNameNo,
   FundAccountResultStatus,
+  FundAccountSearchCl,
   FundAccountSearchDateType,
   FundAccountStatus
 } from './types';
@@ -39,9 +40,9 @@ export const FundAccountResultSearchDateTypeBtnGroup = [
   { name: '이체일자', value: FundAccountSearchDateType.APPLICATION_DATE }
 ];
 
-export const FundAccountReceiveAccountNameNoOptionsGroup = [
-  { name: '수취인', value: FundAccountReceiveAccountNameNo.ReceiveAccountName },
-  { name: '계좌번호', value: FundAccountReceiveAccountNameNo.ReceiveAccountNo },
+export const FundAccountSearchClOptionsGroup = [
+  { name: '수취인', value: FundAccountSearchCl.ACCOUNT_NAME },
+  { name: '계좌번호', value: FundAccountSearchCl.ACCOUNT_NO },
 ];
 
 export const FundAccountReceiveBankCodeOptionsGroup = [

src/entities/additional-service/model/fund-account/types.ts

@@ -11,8 +11,6 @@ export enum FundAccountSearchDateType {
   APPLICATION_DATE = 'APPLICATION_DATE'
 };
 
-
-
 export interface FundAccountTabProps {
   activeTab: FundAccountTabKeys;
 };

src/entities/additional-service/model/key-in/constant.ts

@@ -0,0 +1,9 @@
+import { KeyInPaymentPaymentStatus } from "./types";
+
+// contant로 옮기기
+export const requestStatusBtnGroup = [
+  { name: '전체', value: KeyInPaymentPaymentStatus.ALL },
+  { name: '승인', value: KeyInPaymentPaymentStatus.APPROVAL },
+  { name: '전취소', value: KeyInPaymentPaymentStatus.PRE_CANCEL },
+  { name: '후취소', value: KeyInPaymentPaymentStatus.POST_CANCEL }
+];

src/entities/additional-service/model/key-in/types.ts

@@ -4,7 +4,7 @@ import { AdditionalServiceCategory, ExtensionRequestParams, FilterProps, ListIte
 // ========================================
 // 키인결제 관련 타입들
 // ========================================
-export enum KeyInPaymentTransactionStatus {
+export enum KeyInPaymentPaymentStatus {
   ALL = 'ALL',
   APPROVAL = 'APPROVAL',
   PRE_CANCEL = 'PRE_CANCEL',
@@ -20,21 +20,22 @@ export interface KeyInPaymentListItem {
 
 export interface KeyInPaymentListProps {
   additionalServiceCategory: AdditionalServiceCategory;
-  listItems: Record<string, Array<ListItemProps>>;
+  listItems: Array<KeyInPaymentListItem>;
   mid?: string;
+  setTarget: (element: HTMLElement | null) => void;
 }
 
 export interface KeyInPaymentFilterProps extends FilterProps {
   mid: string,
   startDate: string;
   endDate: string;
-  transactionStatus: KeyInPaymentTransactionStatus;
+  transactionStatus: KeyInPaymentPaymentStatus;
   minAmount?: number;
   maxAmount?: number;
   setMid: (mid: string) => void;
   setStartDate: (startDate: string) => void;
   setEndDate: (endDate: string) => void;
-  setTransactionStatus: (transactionStatus: KeyInPaymentTransactionStatus) => void;
+  setTransactionStatus: (transactionStatus: KeyInPaymentPaymentStatus) => void;
   setMinAmount: (minAmount?: number) => void;
   setMaxAmount: (maxAmount?: number) => void;
 }

src/entities/additional-service/model/link-pay/types.ts

@@ -14,12 +14,25 @@ export interface LinkPaymentTabProps {
   activeTab: LinkPaymentTabKeys;
 }
 
-export enum LinkPaymentSearchType {
-  ALL = "ALL",
-  PHONE = "PHONE",
+export enum LinkPaymentSearchCl {
+  ALL = "",
+  PHONE = "PHONE_NUMBER",
   EMAIL = "EMAIL"
 }
 
+export enum LinkPaymentPaymentMethod {
+  ALL = "ALL",
+  CARD = "CARD",
+  BANK = "BANK",
+  VIRTURE_BANK = "VIRTURE_BANK",
+  PHONE = "PHONE",
+  CULTURELAND = "CULTURELAND",
+  SSG_MONEY = "SSG_MONEY",
+  SSG_BANK = "SSG_BANK",
+  CMS_BANK = "CMS_BANK",
+  TMONEY_PAY = "TMONEY_PAY"
+}
+
 export enum LinkPaymentSendMethod {
   ALL = "ALL",
   SMS = "SMS",
@@ -27,19 +40,19 @@ export enum LinkPaymentSendMethod {
   KAKAO = "KAKAO"
 }
 
-export enum LinkPaymentTransactionStatus {
+export enum LinkPaymentPaymentStatus {
   ALL = "ALL",
   ACTIVATE = "ACTIVATE",
   DEPOSIT_REQUEST = "DEPOSIT_REQUEST",
-  TRANSACTION_COMPLETE = "TRANSACTION_COMPLETE",
-  TRANSACTION_FAIL = "TRANSACTION_FAIL",
+  PAYMENT_COMPLETE = "PAYMENT_COMPLETE",
+  PAYMENT_FAIL = "PAYMENT_FAIL",
   INACTIVE = "INACTIVE"
 }
 
-export enum LinkPaymentSendingStatus {
+export enum LinkPaymentSendStatus {
   ALL = "ALL",
-  SEND_REQUEST = "SEND_REQUEST",
-  SEND_CANCEL = "SEND_CANCEL"
+  SUCCESS = "SUCCESS",
+  FAIL = "FAIL"
 }
 
 export enum LinkContentType {
@@ -79,39 +92,39 @@ export interface LinkPaymentWaitListProps {
 
 export interface LinkPaymentHistoryFilterProps extends FilterProps {
   mid: string;
-  searchType: LinkPaymentSearchType;
-  searchKeyword: string;
-  startDate: string;
-  endDate: string;
-  transactionStatus: LinkPaymentTransactionStatus;
+  searchCl: LinkPaymentSearchCl;
+  searchValue: string;
+  fromDate: string;
+  toDate: string;
+  paymentStatus: LinkPaymentPaymentStatus;
   processResult: ProcessResult;
   sendMethod: LinkPaymentSendMethod;
   setMid: (mid: string) => void;
-  setSearchType: (searchType: LinkPaymentSearchType) => void;
+  setSearchType: (searchType: LinkPaymentSearchCl) => void;
   setSearchKeyword: (searchKeyWorld: string) => void;
   setStartDate: (startDate: string) => void;
   setEndDate: (endDate: string) => void;
-  setTransactionStatus: (transactionStatus: LinkPaymentTransactionStatus) => void;
+  setTransactionStatus: (transactionStatus: LinkPaymentPaymentStatus) => void;
   setProcessResult: (processResult: ProcessResult) => void;
   setSendMethod: (sendMethod: LinkPaymentSendMethod) => void;
 }
 
 export interface LinkPaymentWaitFilterProps extends FilterProps {
   mid: string;
-  searchType: LinkPaymentSearchType;
+  searchCl: LinkPaymentSearchCl;
   searchKeyword: string;
   startDate: string;
   endDate: string;
   sendMethod: LinkPaymentSendMethod;
-  sendingStatus: LinkPaymentSendingStatus;
+  sendingStatus: LinkPaymentSendStatus;
   setMid: (mid: string) => void;
-  setSearchType: (searchType: LinkPaymentSearchType) => void;
+  setSearchType: (searchType: LinkPaymentSearchCl) => void;
   setSearchKeyword: (searchKeyWorld: string) => void;
   setStartDate: (startDate: string) => void;
   setEndDate: (endDate: string) => void;
   setSendMethod: (sendMethod: LinkPaymentSendMethod) => void;
-  setSendingStatus: (sendingStatus: LinkPaymentSendingStatus) => void;
-}
+  setSendingStatus: (sendingStatus: LinkPaymentSendStatus) => void;
+  }
 
 // 링크 결제 - 발송,대기 조회 확장 서비스
 // ========================================