- 안드로이드 알림 설정 AppBridge 추가

- KeyIn Request 필드 수정

src/entities/additional-service/model/ars/types.ts

@@ -23,7 +23,9 @@ export interface ExtensionArsResendParams {
   mid: string;
   tid: string;
 };
-export interface ExtensionArsResendResponse {};
+export interface ExtensionArsResendResponse {
+  status: boolean;
+};
 export interface ExtensionArsListParams {
   mid?: string;
   moid?: string;

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

@@ -1,11 +1,11 @@
-import { KeyInPaymentPaymentStatus } from "./types";
+import { KeyInPaymentTansactionType } from "./types";
 
 // contant로 옮기기
 export const keyInPaymentPaymentStatusBtnGroup = [
-  { name: '전체', value: KeyInPaymentPaymentStatus.ALL },
-  { name: '승인', value: KeyInPaymentPaymentStatus.APPROVAL },
-  { name: '전취소', value: KeyInPaymentPaymentStatus.PRE_CANCEL },
-  { name: '후취소', value: KeyInPaymentPaymentStatus.POST_CANCEL }
+  { name: '전체', value: KeyInPaymentTansactionType.ALL },
+  { name: '승인', value: KeyInPaymentTansactionType.APPROVAL },
+  { name: '전취소', value: KeyInPaymentTansactionType.FULL_CANCEL },
+  { name: '후취소', value: KeyInPaymentTansactionType.PARTIAL_CANCEL }
 ];
 
 export const getKeyInPaymentPaymentStatusName = (status?: string): string => {

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

@@ -4,18 +4,30 @@ import { AdditionalServiceCategory, ExtensionRequestParams, FilterProps } from "
 // ========================================
 // 키인결제 관련 타입들
 // ========================================
-export enum KeyInPaymentPaymentStatus {
+export enum KeyInPaymentTansactionType {
   ALL = 'ALL',
   APPROVAL = 'APPROVAL',
-  PRE_CANCEL = 'PRE_CANCEL',
-  POST_CANCEL = 'POST_CANCEL'
+  FULL_CANCEL = 'FULL_CANCEL',
+  PARTIAL_CANCEL = 'PARTIAL_CANCEL'
+}
+
+export enum KeyInPaymentStatus {
+  ALL = 'ALL',
+  REGISTRED = 'REGISTRED',
+  WAITING = 'WAITING',
+  PROCESSING = 'PROCESSING',
+  COMPLETED = 'COMPLETED'
 }
 
 export interface KeyInPaymentListItem {
+  transactionDate?: string;
+  transactionTime?: string;
+  customerName?: string;
+  transactionCode?: string;
   tid?: string;
-  paymentDate?: string;
-  paymentStatus?: string;
   amount?: number;
+  statusLabel?: string;
+  transactionType?: string;
 }
 
 export interface KeyInPaymentListProps {
@@ -28,13 +40,13 @@ export interface KeyInPaymentFilterProps extends FilterProps {
   mid: string,
   startDate: string;
   endDate: string;
-  transactionStatus: KeyInPaymentPaymentStatus;
+  transactionStatus: KeyInPaymentTansactionType;
   minAmount?: number;
   maxAmount?: number;
   setMid: (mid: string) => void;
   setStartDate: (startDate: string) => void;
   setEndDate: (endDate: string) => void;
-  setTransactionStatus: (transactionStatus: KeyInPaymentPaymentStatus) => void;
+  setTransactionStatus: (transactionStatus: KeyInPaymentTansactionType) => void;
   setMinAmount: (minAmount?: number) => void;
   setMaxAmount: (maxAmount?: number) => void;
 }
@@ -42,19 +54,25 @@ export interface KeyInPaymentFilterProps extends FilterProps {
 // KEY-IN 결제 확장 서비스
 // ========================================
 export interface ExtensionKeyinListParams extends ExtensionRequestParams {
-  fromDate: string;
-  toDate: string;
-  paymentStatus: string;
+  startDate: string;
+  endDate: string;
+  transactionType: string;
+  status: string;
   minAmount?: number;
   maxAmount?: number;
   page?: DefaultRequestPagination;
 }
 
 export interface ExtensionKeyinListItemProps {
+  transactionDate: string;
+  transactionTime: string;
+  customerName: string;
+  transactionCode: string;
   tid: string;
-  paymentDate: string;
-  paymentStatus: string;
   amount: number;
+  statusLabel: string;
+  transactionType: string;
+  status: string;
 }
 
 export interface ExtensionKeyinListResponse extends DefaulResponsePagination {
@@ -74,15 +92,16 @@ export interface ExtensionKeyinDownloadExcelResponse {
 }
 
 export interface ExtensionKeyinApplyParams extends ExtensionRequestParams {
-  goodsName: string;
-  amount: number;
-  buyerName: string;
-  email: string;
-  phoneNumber: string;
   cardNo: string;
-  cardExpirationDate: string;
-  instmntMonth: string;
-  moid: string;
+  expYear: string;
+  expMon: string;
+  instmnt: string;
+  amount: number;
+  productName: string;
+  orderNumber: string;
+  customerName: string;
+  phoneNumber: string;
+  email: string;
 }
 
 export interface ExtensionKeyinApplyResponse {

src/entities/additional-service/ui/key-in-payment/filter/key-in-payment-filter.tsx

@@ -8,7 +8,7 @@ import { FilterButtonGroups } from '@/shared/ui/filter/button-groups';
 import { FilterRangeAmount } from '@/shared/ui/filter/range-amount';
 import { FilterMotionDuration, FilterMotionStyle, FilterMotionVariants } from '@/entities/common/model/constant';
 import { useStore } from '@/shared/model/store';
-import { KeyInPaymentFilterProps, KeyInPaymentPaymentStatus } from '@/entities/additional-service/model/key-in/types';
+import { KeyInPaymentFilterProps, KeyInPaymentTansactionType } from '@/entities/additional-service/model/key-in/types';
 import { keyInPaymentPaymentStatusBtnGroup } from '@/entities/additional-service/model/key-in/constant';
 
 export const KeyInPaymentFilter = ({
@@ -31,7 +31,7 @@ export const KeyInPaymentFilter = ({
 	const [filterMid, setFilterMid] = useState<string>(mid);
 	const [filterStartDate, setFilterStartDate] = useState<string>(startDate);
 	const [filterEndDate, setFilterEndDate] = useState<string>(endDate);
-	const [filterTransactionStatus, setFilterTransactionStatus] = useState<KeyInPaymentPaymentStatus>(transactionStatus);
+	const [filterTransactionStatus, setFilterTransactionStatus] = useState<KeyInPaymentTansactionType>(transactionStatus);
 	const [filterMinAmount, setFilterMinAmount] = useState<number | undefined>(minAmount);
 	const [filterMaxAmount, setFilterMaxAmount] = useState<number | undefined>(maxAmount);
 

src/entities/additional-service/ui/key-in-payment/key-in-payment-list.tsx

@@ -18,13 +18,13 @@ export const KeyInPaymentList = ({
     for (let i = 0; i < listItems.length; i++) {
       let items = listItems[i];
       if (!!items) {
-        let paymentDate = items?.paymentDate;
-        paymentDate = paymentDate?.substring(0, 8)
-        if (!!paymentDate) {
+        let transactionDate = items?.transactionDate;
+        transactionDate = transactionDate?.substring(0, 8)
+        if (!!transactionDate) {
           if (i === 0) {
-            date = paymentDate;
+            date = transactionDate;
           }
-          if (date !== paymentDate) {
+          if (date !== transactionDate) {
             if (list.length > 0) {
               rs.push(
                 <ListDateGroup
@@ -35,7 +35,7 @@ export const KeyInPaymentList = ({
                 ></ListDateGroup>
               );
             }
-            date = paymentDate;
+            date = transactionDate;
             list = [];
           }
           list.push(items);

src/entities/additional-service/ui/list-date-group.tsx

@@ -38,6 +38,12 @@ export const ListDateGroup = ({
             resultStatus={ items[i]?.resultStatus }
             resultMessage={ items[i]?.resultMessage }
             applicationDate={ items[i]?.applicationDate }
+            transactionTime={ items[i]?.transactionTime }
+            transactionDate={ items[i]?.transactionDate }
+            transactionCode={ items[i]?.transactionCode }
+            transactionType={ items[i]?.transactionType }
+            customerName={ items[i]?.customerName }
+            statusLabel={ items[i]?.statusLabel }
 
             amount={ items[i]?.amount }
             sendDate={ items[i]?.sendDate }

src/entities/additional-service/ui/list-item.tsx

@@ -24,7 +24,6 @@ export const ListItem = ({
   accountName,
 
   submallId, settlementDate, companyName,
-  status: disbursementStatus, amount: disbursementAmount,
 
   orderStatus, arsPaymentMethod,
 
@@ -452,7 +451,7 @@ export const ListItem = ({
     else if (additionalServiceCategory === AdditionalServiceCategory.Payout) {
       rs.push(
         <div className="transaction-details">
-          <span>{getPayoutStatusText(disbursementStatus)}</span>
+          <span>{getPayoutStatusText(status)}</span>
           <span className="separator">|</span>
           <span>{submallId}</span>
         </div>
@@ -580,7 +579,7 @@ export const ListItem = ({
           className="transaction-amount"
         >
           <NumericFormat
-            value={disbursementAmount}
+            value={amount}
             thousandSeparator
             displayType="text"
             suffix='원'