This commit is contained in:
Jay Sheen
2025-09-24 09:53:18 +09:00
56 changed files with 1147 additions and 705 deletions

View File

@@ -5,7 +5,7 @@ import { CBDCAxiosError } from '@/shared/@types/error';
import {
ExtensionArsApplyParams,
ExtensionArsApplyResponse
} from '../model/types';
} from '../../model/ars/types';
import {
useMutation,
UseMutationOptions

View File

@@ -5,7 +5,7 @@ import { CBDCAxiosError } from '@/shared/@types/error';
import {
ExtensionArsDetailParams,
ExtensionArsDetailResponse
} from '../model/types';
} from '../../model/ars/types';
import {
useMutation,
UseMutationOptions

View File

@@ -5,7 +5,7 @@ import { CBDCAxiosError } from '@/shared/@types/error';
import {
ExtensionArsDownloadExcelParams,
ExtensionArsDownloadExcelResponse
} from '../model/types';
} from '../../model/ars/types';
import {
useMutation,
UseMutationOptions

View File

@@ -5,7 +5,7 @@ import { CBDCAxiosError } from '@/shared/@types/error';
import {
ExtensionArsListParams,
ExtensionArsListResponse
} from '../model/types';
} from '../../model/ars/types';
import {
useMutation,
UseMutationOptions

View File

@@ -5,7 +5,7 @@ import { CBDCAxiosError } from '@/shared/@types/error';
import {
ExtensionArsResendParams,
ExtensionArsResendResponse
} from '../model/types';
} from '../../model/ars/types';
import {
useMutation,
UseMutationOptions

View File

@@ -5,7 +5,7 @@ import { CBDCAxiosError } from '@/shared/@types/error';
import {
ExtensionSmsDetailParams,
ExtensionSmsDetailResponse
} from '../model/types';
} from '../../model/types';
import {
useMutation,
UseMutationOptions

View File

@@ -5,7 +5,7 @@ import { CBDCAxiosError } from '@/shared/@types/error';
import {
ExtensionSmsDownloadExcelParams,
ExtensionSmsDownloadExcelResponse
} from '../model/types';
} from '../../model/types';
import {
useMutation,
UseMutationOptions

View File

@@ -5,7 +5,7 @@ import { CBDCAxiosError } from '@/shared/@types/error';
import {
ExtensionSmsListParams,
ExtensionSmsListResponse
} from '../model/types';
} from '../../model/types';
import {
useMutation,
UseMutationOptions

View File

@@ -5,7 +5,7 @@ import { CBDCAxiosError } from '@/shared/@types/error';
import {
ExtensionSmsResendParams,
ExtensionSmsResendResponse
} from '../model/types';
} from '../../model/types';
import {
useMutation,
UseMutationOptions

View File

@@ -0,0 +1,7 @@
import { PaymentStatus } from './types';
export const PaymentStatusBtnGroup = [
{name: '전체', value: PaymentStatus.ALL },
{name: '결제완료', value: PaymentStatus.COMPLETE },
{name: '미결제', value: PaymentStatus.UNPAID }
];

View File

@@ -0,0 +1,86 @@
import {
DefaulResponsePagination,
DefaultRequestPagination
} from '@/entities/common/model/types';
export enum PaymentStatus {
ALL = 'ALL',
COMPLETE = 'COMPLETE',
UNPAID = 'UNPAID'
};
export enum OrderStatus {
ALL = 'ALL',
PENDING = 'PENDING',
SUCCESS = 'SUCCESS',
EXPIRED = 'EXPIRED',
CANCELED = 'CANCELED',
};
export interface ExtensionArsResendParams {
mid: string;
tid: string;
};
export interface ExtensionArsResendResponse {};
export interface ExtensionArsListParams {
mid: string;
moid: string;
fromDate: string;
toDate: string;
paymentStatus: string;
orderStatus: string;
minAmount: number;
maxAmount: number;
page: DefaultRequestPagination;
};
export interface ArsListContent {
tid?: string;
paymentDate?: string;
paymentStatus?: string;
orderStatus?: string;
arsPaymentMethod?: string;
amount?: number;
};
export interface ExtensionArsListResponse extends DefaulResponsePagination {
content: Array<ArsListContent>;
};
export interface ExtensionArsDownloadExcelParams {
mid: string;
moid: string;
fromDate: string;
toDate: string;
paymentStatus: string;
orderStatus: string;
minAmount: number;
maxAmount: number;
};
export interface ExtensionArsDownloadExcelResponse {};
export interface ExtensionArsDetailParams {
mid: string;
tid: string;
};
export interface ExtensionArsDetailResponse {
corpName: string;
mid: string;
arsPaymentMethod: string;
paymentStatus: string;
orderStatus: string;
paymentDate: string;
goodsName: string;
tid: string;
buyerName: string;
phoneNumber: string;
maskPhoneNumber: string;
email: string;
smsVerificationCode: string;
};
export interface ExtensionArsApplyParams {
mid: string;
moid: string;
goodsName: string;
amount: number;
instmntMonth: string;
buyerName: string;
phoneNumber: string;
email: string;
arsPaymentMethod: string;
};
export interface ExtensionArsApplyResponse {};

View File

@@ -1,4 +1,8 @@
import { FundAccountReceiveAccountNameNo, FundAccountStatus } from './types';
import {
FundAccountReceiveAccountNameNo,
FundAccountResultType,
FundAccountStatus
} from './types';
export const FundAccountStatusBtnGroup = [
{name: '전체', value: FundAccountStatus.ALL},
@@ -7,6 +11,11 @@ export const FundAccountStatusBtnGroup = [
{name: '중지', value: FundAccountStatus.PENDING},
];
export const FundAccountResultTypeBtnGroup = [
{name: '요청일자', value: FundAccountResultType.RequestDate},
{name: '이체일자', value: FundAccountResultType.ProcessDate}
];
export const FundAccountReceiveAccountNameNoOptionsGroup = [
{name: '수취인', value: FundAccountReceiveAccountNameNo.ReceiveAccountName },
{name: '계좌번호', value: FundAccountReceiveAccountNameNo.ReceiveAccountNo },
@@ -14,4 +23,4 @@ export const FundAccountReceiveAccountNameNoOptionsGroup = [
export const FundAccountReceiveBankCodeOptionsGroup = [
{name: 'KB', value: 'KB'}
]
];

View File

@@ -3,11 +3,14 @@ import { DefaulResponsePagination, DefaultRequestPagination } from '@/entities/c
export enum FundAccountTabKeys {
TransferList = 'TransferList',
ResultList = 'ResultList'
}
};
export enum FundAccountResultType {
RequestDate = 'RequestDate',
ProcessDate = 'ProcessDate',
};
export interface FundAccountTabProps {
activeTab: FundAccountTabKeys;
}
};
export enum FundAccountReceiveAccountNameNo {
ReceiveAccountNo = 'ReceiveAccountNo',
@@ -98,11 +101,11 @@ export interface ExtensionFundAccountResultSummaryResponse {
pendingAmount: number;
};
export interface ExtensionFundAccountResultListParams {
mid: string;
fromDate: string;
toDate: string;
status: FundAccountStatus;
pagination: FundAccountStatus;
mid?: string;
fromDate?: string;
toDate?: string;
status?: FundAccountStatus;
pagination?: DefaultRequestPagination;
};
export interface ExtensionFundAccountResultListResponse extends DefaulResponsePagination {
content: Array<FundAccountResultContent>;

View File

@@ -23,8 +23,8 @@ export interface ExtensionPayoutListParams {
fromDate: string;
toDate: string;
disbursementStatus: PayoutDisbursementStatus;
minAmount?: number | string;
maxAmount?: number | string;
minAmount?: number;
maxAmount?: number;
page?: DefaultRequestPagination;
};
export interface ExtensionPayoutListResponse extends DefaulResponsePagination{

View File

@@ -2,6 +2,7 @@ import { DefaulResponsePagination, DefaultRequestPagination } from '@/entities/c
import { PayoutContent } from './payout/types';
import { P } from 'node_modules/framer-motion/dist/types.d-Cjd591yU';
import { FundAccountResultContentItem, FundAccountTransferContentItem } from './fund-account/types';
import { ArsListContent } from './ars/types';
// ========================================
// 공통 Enums 및 타입들
@@ -29,10 +30,13 @@ export enum AdditionalServiceCategory {
AccountHolderAuth = 'AccountHolderAuth',
AccountHolderSearch = 'AccountHolderSearch',
LinkPaymentHistory = 'LinkPaymentHistory',
LinkPaymentPending = 'LinkPaymentPending',
FundAccount = 'FundAccount',
LinkPaymentWait = 'LinkPaymentWait',
FundAccountTransfer = 'FundAccountTransfer',
FundAccountResult = 'FundAccountResult',
SettlementAgency = 'SettlementAgency',
SMSPayment = 'SMSPayment',
Payout = 'Payout',
Ars = 'Ars',
}
// ========================================
@@ -104,6 +108,11 @@ export interface FilterProps {
setFilterOn: (filterOn: boolean) => void;
}
// ========================================
// SMS 결제 통보 관련 타입들
// ========================================
// ========================================
// 키인결제 관련 타입들
// ========================================
@@ -132,14 +141,14 @@ export interface KeyInPaymentFilterProps extends FilterProps {
startDate: string;
endDate: string;
transactionStatus: KeyInPaymentTransactionStatus;
minAmount?: number | string;
maxAmount?: number | string;
minAmount?: number;
maxAmount?: number;
setMid: (mid: string) => void;
setStartDate: (startDate: string) => void;
setEndDate: (endDate: string) => void;
setTransactionStatus: (transactionStatus: KeyInPaymentTransactionStatus) => void;
setMinAmount: (minAmount: string | number) => void;
setMaxAmount: (maxAmount: string | number) => void;
setMinAmount: (minAmount?: number) => void;
setMaxAmount: (maxAmount?: number) => void;
}
// ========================================
@@ -319,7 +328,7 @@ export interface LinkPaymentHistoryFilterProps extends FilterProps {
setSendMethod: (sendMethod: LinkPaymentSendMethod) => void;
}
export interface LinkPaymentPendingSendFilterProps extends FilterProps {
export interface LinkPaymentWaitFilterProps extends FilterProps {
mid: string;
searchType: LinkPaymentSearchType;
searchKeyword: string;
@@ -382,7 +391,8 @@ export interface ListItemProps extends
KeyInPaymentListItem, AccountHolderSearchListItem,
AccountHolderAuthListItem, LinkPaymentHistoryListItem,
LinkPaymentWaitListItem,
PayoutContent, FundAccountTransferContentItem {
PayoutContent, FundAccountTransferContentItem,
ArsListContent {
additionalServiceCategory?: AdditionalServiceCategory;
mid?: string
}
@@ -666,8 +676,8 @@ export interface ExtensionKeyinListParams extends ExtensionRequestParams {
fromDate: string;
toDate: string;
paymentStatus: string;
minAmount?: number | string;
maxAmount?: number | string;
minAmount?: number;
maxAmount?: number;
page?: DefaultRequestPagination;
}
@@ -686,8 +696,8 @@ export interface ExtensionKeyinDownloadExcelParams extends ExtensionRequestParam
fromDate?: string;
toDate?: string;
paymentStatus?: string;
minAmount?: number | string;
maxAmount?: number | string;
minAmount?: number;
maxAmount?: number;
}
export interface ExtensionKeyinDownloadExcelResponse {
@@ -712,6 +722,7 @@ export interface ExtensionKeyinApplyResponse {
// ========================================
// SMS 결제알림 확장 서비스
// ========================================
export interface ExtensionSmsResendParams extends ExtensionRequestParams {
tid: string;
}
@@ -721,12 +732,12 @@ export interface ExtensionSmsResendResponse {
}
export interface ExtensionSmsListParams extends ExtensionRequestParams {
tid: string;
searchCl: string;
searchValue: string;
fromDate: string;
toDate: string;
smsCl: string;
page?: DefaultRequestPagination;
}
export interface ExtensionSmsListItemProps {
@@ -764,89 +775,10 @@ export interface ExtensionSmsDetailResponse {
receiverName: string;
sendMessage: string;
}
// ARS 카드결제 확장 서비스
export interface ExtensionArsResendParams extends ExtensionRequestParams {
tid: string;
}
export interface ExtensionArsResendResponse {
}
export interface ExtensionArsListParams extends ExtensionRequestParams {
moid: string;
fromDate: string;
toDate: string;
paymentStatus: string;
orderStatus: string;
minAmount: number;
maxAmount: number;
}
export interface ExtensionArsListItemProps {
tid: string;
paymentDate: string;
paymentStatus: string;
orderStatus: string;
arsPaymentMethod: string;
amount: number;
}
export interface ExtensionArsListResponse extends DefaulResponsePagination {
content: Array<ExtensionArsListItemProps>
}
export interface ExtensionArsDownloadExcelParams extends ExtensionRequestParams {
moid: string;
fromDate: string;
toDate: string;
paymentStatus: string;
orderStatus: string;
minAmount: number;
maxAmount: number;
}
export interface ExtensionArsDownloadExcelResponse {
}
export interface ExtensionArsDetailParams extends ExtensionRequestParams {
tid: string;
}
export interface ExtensionArsDetailResponse {
corpName: string;
mid: string;
arsPaymentMethod: string;
paymentStatus: string;
orderStatus: string;
paymentDate: string;
goodsName: string;
tid: string;
buyerName: string;
phoneNumber: string;
maskPhoneNumber: string;
email: string;
smsVerificationCode: string;
}
export interface ExtensionArsApplyParams extends ExtensionRequestParams {
moid: string;
goodsName: string;
amount: number;
instmntMonth: string;
buyerName: string;
phoneNumber: string;
email: string;
arsPaymentMethod: string;
}
export interface ExtensionArsApplyResponse {
}
// ========================================
// 알림톡 확장 서비스
// ========================================
export interface SendMerchantInfoItem {
cardApprovalFlag: boolean;
cardCancelFlag: boolean;

View File

@@ -0,0 +1,179 @@
import { useEffect, useState } from 'react';
import { FundAccountReceiveAccountNameNo, FundAccountResultType, FundAccountStatus } from '../../model/fund-account/types';
import moment from 'moment';
import { motion } from 'framer-motion';
import { FilterMotionDuration, FilterMotionStyle, FilterMotionVariants } from '@/entities/common/model/constant';
import { IMAGE_ROOT } from '@/shared/constants/common';
import { FilterSelect } from '@/shared/ui/filter/select';
import { FilterCalendar } from '@/shared/ui/filter/calendar';
import { FundAccountReceiveAccountNameNoOptionsGroup, FundAccountReceiveBankCodeOptionsGroup, FundAccountResultTypeBtnGroup, FundAccountStatusBtnGroup } from '../../model/fund-account/constant';
import { FilterButtonGroups } from '@/shared/ui/filter/button-groups';
import { FilterSelectInput } from '@/shared/ui/filter/select-input';
export interface FundAccountResultFilterProps {
filterOn: boolean;
setFilterOn: (filterOn: boolean) => void;
mid: string;
receiveAccountName: string;
receiveAccountNo: string;
resultType: FundAccountResultType;
fromDate: string;
toDate: string;
receiveBankCode: string;
status: FundAccountStatus;
setMid: (mid: string) => void;
setReceiveAccountName: (receiveAccountName: string) => void;
setReceiveAccountNo: (receiveAccountNo: string) => void;
setResultType: (resultType: FundAccountResultType) => void;
setFromDate: (fromDate: string) => void;
setToDate: (toDate: string) => void;
setReceiveBankCode: (receiveBankCode: string) => void;
setStatus: (status: FundAccountStatus) => void;
};
export const FundAccountResultFilter = ({
filterOn,
setFilterOn,
mid,
receiveAccountName,
receiveAccountNo,
resultType,
fromDate,
toDate,
receiveBankCode,
status,
setMid,
setReceiveAccountName,
setReceiveAccountNo,
setResultType,
setFromDate,
setToDate,
setReceiveBankCode,
setStatus
}: FundAccountResultFilterProps) => {
const [filterMid, setFilterMid] = useState<string>(mid);
const [filterReceiveAccountName, setFilterReceiveAccountName] = useState<string>(receiveAccountName);
const [filterReceiveAccountNo, setFilterReceiveAccountNo] = useState<string>(receiveAccountNo);
const [filterFromDate, setFilterFromDate] = useState<string>(moment(fromDate).format('YYYY.MM.DD'));
const [filterToDate, setFilterToDate] = useState<string>(moment(toDate).format('YYYY.MM.DD'));
const [filterReceiveBankCode, setFilterReceiveBankCode] = useState<string>(receiveBankCode);
const [filterStatus, setFilterStatus] = useState<FundAccountStatus>(status);
const [filterResultType, setFilterResultType] = useState<FundAccountResultType>(resultType);
const [
filterReceiveAccountNameNoSelectValue,
setFilterReceiveAccountNameNoSelectValue
] = useState<FundAccountReceiveAccountNameNo>(FundAccountReceiveAccountNameNo.ReceiveAccountName);
const [
filterReceiveAccountNameNoInputValue,
setFilterReceiveAccountNameNoInputValue
] = useState<string>('');
const onClickToClose = () => {
setFilterOn(false);
};
const onClickToSetFilter = () => {
setMid(filterMid);
if(filterReceiveAccountNameNoSelectValue === FundAccountReceiveAccountNameNo.ReceiveAccountName){
setReceiveAccountName(filterReceiveAccountNameNoInputValue);
setReceiveAccountNo('');
}
else if(filterReceiveAccountNameNoSelectValue === FundAccountReceiveAccountNameNo.ReceiveAccountNo){
setReceiveAccountName('');
setReceiveAccountNo(filterReceiveAccountNameNoInputValue);
}
setResultType(filterResultType);
setFromDate(filterFromDate);
setToDate(filterToDate);
setReceiveBankCode(filterReceiveBankCode);
setStatus(filterStatus);
onClickToClose();
};
let MidOptions = [
{name: 'nictest001m', value: 'nictest001m'}
];
useEffect(() => {
setFilterStatus(status);
}, [status]);
return (
<>
<motion.div
id="fullMenuModal"
className="full-menu-modal"
initial="hidden"
animate={ (filterOn)? 'visible': 'hidden' }
variants={ FilterMotionVariants }
transition={ FilterMotionDuration }
style={ FilterMotionStyle }
>
<div className="full-menu-container">
<div className="full-menu-header">
<div className="full-menu-title center"></div>
<div className="full-menu-actions">
<button
id="closeFullMenu"
className="full-menu-close"
>
<img
src={ IMAGE_ROOT + '/ico_close.svg' }
alt="닫기"
onClick={ () => onClickToClose() }
/>
</button>
</div>
</div>
<div className="option-list pt-16">
<FilterSelect
title='가맹점'
selectValue={ filterMid }
selectSetter={ setFilterMid }
selectOptions={ MidOptions }
></FilterSelect>
<FilterSelectInput
title='수취인/계좌번호'
selectValue={ filterReceiveAccountNameNoSelectValue }
selectSetter={ setFilterReceiveAccountNameNoSelectValue }
selectOptions={ FundAccountReceiveAccountNameNoOptionsGroup }
inputValue={ filterReceiveAccountNameNoInputValue }
inputSetter={ setFilterReceiveAccountNameNoInputValue }
></FilterSelectInput>
<FilterButtonGroups
title='조회 기준'
activeValue={ filterResultType }
btnGroups={ FundAccountResultTypeBtnGroup }
setter={ setFilterResultType }
></FilterButtonGroups>
<FilterCalendar
title='조회기간'
startDate={ filterFromDate }
endDate={ filterToDate }
setStartDate={ setFilterFromDate }
setEndDate={ setFilterToDate }
></FilterCalendar>
<FilterSelect
title='은행'
selectValue={ filterReceiveBankCode }
selectSetter={ setFilterReceiveBankCode }
selectOptions={ FundAccountReceiveBankCodeOptionsGroup }
></FilterSelect>
<FilterButtonGroups
title='처리 결과'
activeValue={ filterStatus }
btnGroups={ FundAccountStatusBtnGroup }
setter={ setFilterStatus }
></FilterButtonGroups>
</div>
<div className="apply-row">
<button
className="btn-50 btn-blue flex-1"
onClick={ () => onClickToSetFilter() }
></button>
</div>
</div>
</motion.div>
</>
);
};

View File

@@ -28,15 +28,15 @@ export interface PayoutFilterProps {
fromDate: string;
toDate: string;
disbursementStatus: PayoutDisbursementStatus;
minAmount?: number | string;
maxAmount?: number | string;
minAmount?: number;
maxAmount?: number;
setMid: (mid: string) => void;
setSearchCl: (searchCl: PayoutSearchCl) => void;
setFromDate: (fromDate: string) => void;
setToDate: (toDate: string) => void;
setDisbursementStatus: (disbursementStatus: PayoutDisbursementStatus) => void;
setMinAmount: (minAmount: string | number) => void;
setMaxAmount: (maxAmount: string | number) => void;
setMinAmount: (minAmount?: number) => void;
setMaxAmount: (maxAmount?: number) => void;
};
export const PayoutFilter = ({
@@ -63,8 +63,8 @@ export const PayoutFilter = ({
const [filterFromDate, setFilterFromDate] = useState<string>(moment(fromDate).format('YYYY.MM.DD'));
const [filterToDate, setFilterToDate] = useState<string>(moment(toDate).format('YYYY.MM.DD'));
const [filterDisbursementStatus, setFilterDisbursementStatus] = useState<PayoutDisbursementStatus>(disbursementStatus);
const [filterMinAmount, setFilterMinAmount] = useState<number | string>(minAmount || '');
const [filterMaxAmount, setFilterMaxAmount] = useState<number | string>(maxAmount || '');
const [filterMinAmount, setFilterMinAmount] = useState<number | undefined>(minAmount);
const [filterMaxAmount, setFilterMaxAmount] = useState<number | undefined>(maxAmount);
const onClickToClose = () => {
setFilterOn(false);

View File

@@ -1,6 +1,163 @@
import { IMAGE_ROOT } from "@/shared/constants/common";
import moment from 'moment';
import { SortByKeys } from '@/entities/common/model/types';
import { IMAGE_ROOT } from '@/shared/constants/common';
import { useNavigate } from '@/shared/lib/hooks/use-navigate';
import { useEffect, useState } from 'react';
import { DEFAULT_PAGE_PARAM } from '@/entities/common/model/constant';
import { ListDateGroup } from '../list-date-group';
import { AdditionalServiceCategory } from '../../model/types';
import { ExtensionFundAccountResultExcelParams, ExtensionFundAccountResultExcelResponse, ExtensionFundAccountResultListParams, ExtensionFundAccountResultListResponse, ExtensionFundAccountResultSummaryParams, ExtensionFundAccountResultSummaryResponse, FundAccountResultContent, FundAccountResultContentItem, FundAccountResultType, FundAccountStatus } from '../../model/fund-account/types';
import { useExtensionFundAccountResultSummaryMutation } from '../../api/fund-account/use-extension-fund-account-result-summary-mutation';
import { useExtensionFundAccountResultExcelMutation } from '../../api/fund-account/use-extension-fund-account-result-excel-mutation';
import { useExtensionFundAccountResultListMutation } from '../../api/fund-account/use-extension-fund-account-result-list-mutation';
import { PATHS } from '@/shared/constants/paths';
import { NumericFormat } from 'react-number-format';
import { SortOptionsBox } from '@/entities/common/ui/sort-options-box';
import { FundAccountStatusBtnGroup } from '../../model/fund-account/constant';
import { FundAccountResultFilter } from '../filter/fund-account-result-filter';
export const FundAccountResultListWrap = () => {
const { navigate } = useNavigate();
const [sortBy, setSortBy] = useState<SortByKeys>(SortByKeys.New);
const [listItems, setListItems] = useState<Record<string, Array<FundAccountResultContentItem>>>({});
const [filterOn, setFilterOn] = useState<boolean>(false);
const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM);
const [mid, setMid] = useState<string>('nictest001m');
const [receiveAccountName, setReceiveAccountName] = useState<string>('');
const [receiveAccountNo, setReceiveAccountNo] = useState<string>('');
const [resultType, setResultType] = useState<FundAccountResultType>(FundAccountResultType.RequestDate);
const [fromDate, setFromDate] = useState(moment().format('YYYYMMDD'));
const [toDate, setToDate] = useState(moment().format('YYYYMMDD'));
const [status, setStatus] = useState<FundAccountStatus>(FundAccountStatus.ALL);
const [receiveBankCode, setReceiveBankCode] = useState<string>('');
const [totalCount, setTotalCount] = useState<number>(0);
const [totalAmount, setTotalAmount] = useState<number>(0);
const [successCount, setSuccessCount] = useState<number>(0);
const [successAmount, setSuccessAmount] = useState<number>(0);
const [failCount, setFailCount] = useState<number>(0);
const [failAmount, setFailAmount] = useState<number>(0);
const [pendingCount, setPendingCount] = useState<number>(0);
const [pendingAmount, setPendingAmount] = useState<number>(0);
const { mutateAsync: extensionFundAccountResultList } = useExtensionFundAccountResultListMutation();
const { mutateAsync: extensionFundAccountResultExcel } = useExtensionFundAccountResultExcelMutation();
const { mutateAsync: extensionFundAccountResultSummary } = useExtensionFundAccountResultSummaryMutation();
const callList = (option?: {
sortBy?: string,
val?: string
}) => {
pageParam.sortBy = (option?.sortBy)? option.sortBy: sortBy;
setPageParam(pageParam);
let params: ExtensionFundAccountResultListParams = {
mid: mid,
fromDate: fromDate,
toDate: toDate,
status: status,
pagination: pageParam
};
extensionFundAccountResultList(params).then((rs: ExtensionFundAccountResultListResponse) => {
console.log(rs);
setListItems(assembleData(rs.content));
});
};
const callDownloadExcel = () => {
let params: ExtensionFundAccountResultExcelParams = {
mid: mid,
fromDate: fromDate,
toDate: toDate,
status: status,
};
extensionFundAccountResultExcel(params).then((rs: ExtensionFundAccountResultExcelResponse) => {
});
};
const callSummary = () => {
let params: ExtensionFundAccountResultSummaryParams = {
mid: mid,
fromDate: fromDate,
toDate: toDate
};
extensionFundAccountResultSummary(params).then((rs: ExtensionFundAccountResultSummaryResponse) => {
console.log(rs);
setTotalCount(rs.totalCount);
setTotalAmount(rs.totalAmount);
setSuccessCount(rs.successCount);
setSuccessAmount(rs.successAmount);
setFailCount(rs.failCount);
setFailAmount(rs.failAmount);
setPendingCount(rs.pendingCount);
setPendingAmount(rs.pendingAmount);
});
};
const assembleData = (content: Array<FundAccountResultContent>) => {
let data: any = {};
if(content && !!content[0] && content.length > 0){
let items: Array<FundAccountResultContentItem> = content[0].items;
for(let i=0;i<items.length;i++){
let groupDate = moment(items[i]?.requestDate).format('YYYYMMDD');
if(!!groupDate && !data.hasOwnProperty(groupDate)){
data[groupDate] = [];
}
if(!!groupDate && data.hasOwnProperty(groupDate)){
data[groupDate].push(items[i]);
}
}
}
return data;
};
const onClickToDownloadExcel = () => {
callDownloadExcel();
};
const onClickToOpenFilter = () => {
setFilterOn(!filterOn);
};
const onClickToSort = (sort: SortByKeys) => {
setSortBy(sort);
callList({sortBy: sort});
};
const onClickToStatus = (val: FundAccountStatus) => {
setStatus(val);
callList({val: val});
};
const getListDateGroup = () => {
let rs = [];
if(Object.keys(listItems).length > 0){
for (const [key, value] of Object.entries(listItems)) {
rs.push(
<ListDateGroup
additionalServiceCategory={ AdditionalServiceCategory.FundAccountResult }
mid={ mid }
key={ key }
date={ key }
items={ value }
></ListDateGroup>
);
}
}
return rs;
};
useEffect(() => {
callList();
callSummary();
}, []);
const onClickToNavigate = () => {
navigate(PATHS.additionalService.fundAccount.transferRequest);
};
return (
<>
@@ -8,14 +165,15 @@ export const FundAccountResultListWrap = () => {
<div className="credit-controls">
<div>
<input
type="text"
className="credit-period"
value="2025.06.01 ~ 2025.06.30"
className="credit-period"
type="text"
value={ moment(fromDate).format('YYYY.MM.DD') + '-' + moment(toDate).format('YYYY.MM.DD') }
readOnly={ true }
/>
<button
className="filter-btn"
aria-label="필터"
onClick={ () => onClickToOpenFilter() }
>
<img
src={ IMAGE_ROOT + '/ico_setting.svg' }
@@ -26,6 +184,7 @@ export const FundAccountResultListWrap = () => {
<button
className="download-btn"
aria-label="다운로드"
onClick={ () => onClickToDownloadExcel() }
>
<img
src={ IMAGE_ROOT + '/ico_download.svg' }
@@ -33,112 +192,124 @@ export const FundAccountResultListWrap = () => {
/>
</button>
</div>
<div className="account-frame">
<div className="credit-summary">
<div className="row">
<span className="label"></span>
<span className="amount22">2,000,000,000<span className="unit"></span></span>
</div>
</div>
</div>
<div className="summary-extend">
<ul className="summary-amount-list">
<li className="summary-amount-item">
<span className="label">· </span>
<span className="value">0<span className="unit"> (0)</span></span>
<span className="label"></span>
<span className="value">
<span>
<NumericFormat
value={ pendingAmount }
thousandSeparator
displayType="text"
></NumericFormat>
</span>
<span className="unit"> (</span>
<span>
<NumericFormat
value={ pendingCount }
thousandSeparator
displayType="text"
></NumericFormat>
</span>
<span>)</span>
</span>
</li>
<li className="summary-amount-item">
<span className="label">· </span>
<span className="value">50,000,000<span className="unit"> (2,587)</span></span>
<span className="label"></span>
<span className="value">
<span>
<NumericFormat
value={ successAmount }
thousandSeparator
displayType="text"
></NumericFormat>
</span>
<span className="unit"> (</span>
<span>
<NumericFormat
value={ successCount }
thousandSeparator
displayType="text"
></NumericFormat>
</span>
<span>)</span>
</span>
</li>
<li className="summary-amount-item">
<span className="label">· </span>
<span className="value">534,407<span className="unit"> (21)</span></span>
<span className="label"></span>
<span className="value">
<span>
<NumericFormat
value={ failAmount }
thousandSeparator
displayType="text"
></NumericFormat>
</span>
<span className="unit"> (</span>
<span>
<NumericFormat
value={ failCount }
thousandSeparator
displayType="text"
></NumericFormat>
</span>
<span>)</span>
</span>
</li>
</ul>
</div>
</section>
</section>
<section className="filter-section">
<div className="sort-options">
<button className="sort-btn active"></button>
<span className="sort-divider">|</span>
<button className="sort-btn"></button>
</div>
<div className="excrow mr-0">
<div className="full-menu-keywords no-padding">
<span className="keyword-tag active"></span>
<span className="keyword-tag"></span>
<span className="keyword-tag"></span>
<section className="filter-section">
<SortOptionsBox
sortBy={ sortBy }
onClickToSort={ onClickToSort }
></SortOptionsBox>
<div className="excrow mr-0">
<div className="full-menu-keywords no-padding">
{
FundAccountStatusBtnGroup.map((value, index) => (
<span
key={ `key-service-code=${ index }` }
className={ `keyword-tag ${(status === value.value)? 'active': ''}` }
onClick={ () => onClickToStatus(value.value) }
>{ value.name }</span>
))
}
</div>
</div>
</div>
</section>
<section className="transaction-list">
<div className="date-header">25.06.08()</div>
<div className="transaction-item approved">
<div className="transaction-status">
<div className="status-dot blue"></div>
</div>
<div className="transaction-content">
<div className="transaction-title">*(7000)</div>
<div className="transaction-details">
<span>20:00</span>
<span className="separator"></span>
<span></span>
</div>
</div>
<div className="transaction-amount">5,254,000</div>
</div>
<div className="transaction-item approved">
<div className="transaction-status">
<div className="status-dot blue"></div>
</div>
<div className="transaction-content">
<div className="transaction-title">*(7000)</div>
<div className="transaction-details">
<span>20:00</span>
<span className="separator"></span>
<span></span>
</div>
</div>
<div className="transaction-amount">5,254,000</div>
</div>
</section>
<div className="date-header">25.06.08()</div>
<div className="transaction-item approved">
<div className="transaction-status">
<div className="status-dot blue"></div>
</div>
<div className="transaction-content">
<div className="transaction-title">*(7000)</div>
<div className="transaction-details">
<span>20:00</span>
<span className="separator"></span>
<span></span>
</div>
</div>
<div className="transaction-amount">5,254,000</div>
<section className="transaction-list">
{ getListDateGroup() }
</section>
<div className="apply-row">
<button
className="btn-50 btn-blue flex-1"
onClick={ onClickToNavigate }
> </button>
</div>
<div className="transaction-item approved">
<div className="transaction-status">
<div className="status-dot blue"></div>
</div>
<div className="transaction-content">
<div className="transaction-title">*(7000)</div>
<div className="transaction-details">
<span>20:00</span>
<span className="separator"></span>
<span></span>
</div>
</div>
<div className="transaction-amount">5,254,000</div>
</div>
</section>
<div className="apply-row">
<button className="btn-50 btn-blue flex-1"> </button>
</div>
<FundAccountResultFilter
filterOn={ filterOn }
setFilterOn={ setFilterOn }
mid={ mid }
receiveAccountName={ receiveAccountName }
receiveAccountNo={ receiveAccountNo }
resultType={ resultType }
fromDate={ fromDate }
toDate={ toDate }
receiveBankCode= { receiveBankCode }
status={ status }
setMid={ setMid }
setReceiveAccountName={ setReceiveAccountName }
setReceiveAccountNo={ setReceiveAccountNo }
setResultType={ setResultType }
setFromDate={ setFromDate }
setToDate={ setToDate }
setReceiveBankCode={ setReceiveBankCode }
setStatus={ setStatus }
></FundAccountResultFilter>
</>
);
};

View File

@@ -1,6 +1,6 @@
import { SortByKeys } from '@/entities/common/model/types';
import { IMAGE_ROOT } from '@/shared/constants/common';
import { useNavigate } from '@/shared/lib/hooks';
import { useNavigate } from '@/shared/lib/hooks/use-navigate';
import { useEffect, useState } from 'react';
import {
ExtensionFundAccountBalanceParams,
@@ -132,7 +132,7 @@ export const FundAccountTransferListWrap = () => {
for (const [key, value] of Object.entries(listItems)) {
rs.push(
<ListDateGroup
additionalServiceCategory={ AdditionalServiceCategory.FundAccount }
additionalServiceCategory={ AdditionalServiceCategory.FundAccountTransfer }
mid={ mid }
key={ key }
date={ key }
@@ -210,7 +210,7 @@ export const FundAccountTransferListWrap = () => {
sortBy={ sortBy }
onClickToSort={ onClickToSort }
></SortOptionsBox>
<div className="excrow">
<div className="excrow mr-0">
<div className="full-menu-keywords no-padding">
{
FundAccountStatusBtnGroup.map((value, index) => (
@@ -252,6 +252,6 @@ export const FundAccountTransferListWrap = () => {
setReceiveBankCode={ setReceiveBankCode }
setStatus={ setStatus }
></FundAccountTransactionFilter>
</>
</>
);
};

View File

@@ -52,7 +52,7 @@ export const PaymentInfoWrap = ({
</span>
</li>
</>
}{(additionalServiceCategory === AdditionalServiceCategory.LinkPaymentPending) &&
}{(additionalServiceCategory === AdditionalServiceCategory.LinkPaymentWait) &&
<>
<li className="kv-row">
<span className="k"></span>

View File

@@ -58,7 +58,7 @@ export const TitleInfoWrap = ({
</>
)}
{/*링크결제_발송대기*/}
{additionalServiceCategory === AdditionalServiceCategory.LinkPaymentPending && (
{additionalServiceCategory === AdditionalServiceCategory.LinkPaymentWait && (
<>
<>
<div className="num-amount">

View File

@@ -34,8 +34,8 @@ export const KeyInPaymentFilter = ({
const [filterStartDate, setFilterStartDate] = useState<string>(startDate);
const [filterEndDate, setFilterEndDate] = useState<string>(endDate);
const [filterTransactionStatus, setFilterTransactionStatus] = useState<KeyInPaymentTransactionStatus>(transactionStatus);
const [filterMinAmount, setFilterMinAmount] = useState<number | string>(minAmount || '');
const [filterMaxAmount, setFilterMaxAmount] = useState<number | string>(maxAmount || '');
const [filterMinAmount, setFilterMinAmount] = useState<number | undefined>(minAmount);
const [filterMaxAmount, setFilterMaxAmount] = useState<number | undefined>(maxAmount);
const variants = {
hidden: { x: '100%' },

View File

@@ -1,38 +0,0 @@
interface DetailDeetsInfoSectionProps {
deetsInfo?: any;
show?: boolean;
onClickToShowInfo?: () => void;
}
export const DetailDeetsInfoSection = ({
deetsInfo,
show,
onClickToShowInfo
}: DetailDeetsInfoSectionProps) => {
return (
<>
<div className="txn-section">
<div className="section-title"> </div>
<ul className="kv-list">
<li className="kv-row">
<span className="k"></span>
<span className="v"></span>
</li>
<li className="kv-row">
<span className="k"></span>
<span className="v">01073937470</span>
</li>
<li className="kv-row">
<span className="k"></span>
<span className="v"></span>
</li>
<li className="kv-row">
<span className="k"></span>
<span className="v">mod201705545050</span>
</li>
</ul>
</div>
</>
)
}

View File

@@ -1,50 +0,0 @@
interface DetailPaymentInfoSectionProps {
paymentInfo?: any;
show?: boolean;
onClickToShowInfo?: () => void;
}
export const DetailPaymentInfoSection = ({
paymentInfo,
show,
onClickToShowInfo
}: DetailPaymentInfoSectionProps) => {
return (
<>
<div className="txn-section">
<div className="section-title"> </div>
<ul className="kv-list">
<li className="kv-row">
<span className="k"></span>
<span className="v">*</span>
</li>
<li className="kv-row">
<span className="k"></span>
<span className="v">SMS</span>
</li>
<li className="kv-row">
<span className="k"></span>
<span className="v">2025.06.08</span>
</li>
<li className="kv-row">
<span className="k">()</span>
<span className="v">(2)</span>
</li>
<li className="kv-row">
<span className="k"></span>
<span className="v"></span>
</li>
<li className="kv-row">
<span className="k"></span>
<span className="v"></span>
</li>
<li className="kv-row">
<span className="k"></span>
<span className="v">2025.06.08</span>
</li>
</ul>
</div>
</>
)
}

View File

@@ -1,58 +0,0 @@
interface DetailPendingPaymentInfoSectionProps {
paymentInfo?: any;
show?: boolean;
onClickToShowInfo?: () => void;
}
export const DetailPaymentInfoSection = ({
paymentInfo,
show,
onClickToShowInfo
}: DetailPendingPaymentInfoSectionProps) => {
return (
<>
<div className="txn-section">
<div className="section-title"> </div>
<ul className="kv-list">
<li className="kv-row">
<span className="k"></span>
<span className="v"></span>
</li>
<li className="kv-row">
<span className="k"></span>
<span className="v">2025.06.05</span>
</li>
<li className="kv-row">
<span className="k"></span>
<span className="v">2025.06.08</span>
</li>
<li className="kv-row">
<span className="k"></span>
<span className="v">SMS</span>
</li>
<li className="kv-row">
<span className="k"></span>
<span className="v">*</span>
</li>
<li className="kv-row">
<span className="k"></span>
<span className="v"></span>
</li>
<li className="kv-row">
<span className="k"></span>
<span className="v">01073937470</span>
</li>
<li className="kv-row">
<span className="k"></span>
<span className="v"></span>
</li>
<li className="kv-row">
<span className="k"></span>
<span className="v">moid201705545050</span>
</li>
</ul>
</div>
</>
)
}

View File

@@ -4,7 +4,7 @@ import { IMAGE_ROOT } from '@/shared/constants/common';
import { motion } from 'framer-motion';
import { ChangeEvent, useState } from 'react';
import {
LinkPaymentPendingSendFilterProps,
LinkPaymentWaitFilterProps,
LinkPaymentSearchType,
LinkPaymentSendMethod,
LinkPaymentSendingStatus,
@@ -15,7 +15,7 @@ import { FilterDateOptions } from '@/entities/common/model/types';
import { FilterCalendar } from '@/shared/ui/filter/calendar';
import { FilterButtonGroups } from '@/shared/ui/filter/button-groups';
export const LinkPaymentPendingSendFilter = ({
export const LinkPaymentWaitSendFilter = ({
filterOn,
setFilterOn,
mid,
@@ -32,7 +32,7 @@ export const LinkPaymentPendingSendFilter = ({
setEndDate,
setSendMethod,
setSendingStatus
}: LinkPaymentPendingSendFilterProps) => {
}: LinkPaymentWaitFilterProps) => {
const [filterMid, setFilterMid] = useState<string>(mid);

View File

@@ -1,7 +1,7 @@
import moment from 'moment';
import { IMAGE_ROOT } from "@/shared/constants/common";
import { useState, useEffect } from "react";
import { LinkPaymentPendingSendFilter } from "./filter/link-payment-pending-send-filter";
import { LinkPaymentWaitSendFilter } from "./filter/link-payment-pending-send-filter";
import { useNavigate } from '@/shared/lib/hooks/use-navigate';
import { PATHS } from "@/shared/constants/paths";
import { LinkPaymentWaitList } from "./link-payment-wait-list";
@@ -164,7 +164,7 @@ export const LinkPaymentWaitSendWrap = () => {
<LinkPaymentWaitList
listItems={listItems}
additionalServiceCategory={AdditionalServiceCategory.LinkPaymentPending}
additionalServiceCategory={AdditionalServiceCategory.LinkPaymentWait}
></LinkPaymentWaitList>
<div className="apply-row">
<button
@@ -172,7 +172,7 @@ export const LinkPaymentWaitSendWrap = () => {
onClick={() => onClickToNavigate()}
> </button>
</div>
<LinkPaymentPendingSendFilter
<LinkPaymentWaitSendFilter
filterOn={filterOn}
setFilterOn={setFilterOn}
mid={mid}
@@ -189,7 +189,7 @@ export const LinkPaymentWaitSendWrap = () => {
setEndDate={setEndDate}
setSendMethod={setSendMethod}
setSendingStatus={setSendingStatus}
></LinkPaymentPendingSendFilter>
></LinkPaymentWaitSendFilter>
</>
)
}

View File

@@ -53,7 +53,10 @@ export const ListDateGroup = ({
receiveAccountNo={ items[i]?.receiveAccountNo }
receiveAccountName={ items[i]?.receiveAccountName }
status={ items[i]?.status }
processDate={items[i]?.processDate }
processDate={ items[i]?.processDate }
orderStatus={ items[i]?.orderStatus }
arsPaymentMethod={ items[i]?.arsPaymentMethod }
></ListItem>
)
}

View File

@@ -20,7 +20,9 @@ export const ListItem = ({
transferAmount, receiveBankName,
receiveAccountNo, receiveAccountName,
status, processDate
status, processDate,
orderStatus, arsPaymentMethod
}: ListItemProps) => {
const { navigate } = useNavigate();
const getItemClass = () => {
@@ -89,7 +91,7 @@ export const ListItem = ({
else if (paymentStatus === "INACTIVE") {
rs = 'gray';
}
} else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentPending) {
} else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentWait) {
if (processStatus === "SEND_REQUEST") {
rs = 'blue'
} else {
@@ -132,7 +134,7 @@ export const ListItem = ({
}
});
}
else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentPending) {
else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentWait) {
navigate(PATHS.additionalService.linkPayment.pendingDetail, {
state: {
additionalServiceCategory: additionalServiceCategory,
@@ -141,7 +143,7 @@ export const ListItem = ({
}
});
}
else if (additionalServiceCategory === AdditionalServiceCategory.FundAccount) {
else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountTransfer) {
navigate(PATHS.additionalService.fundAccount.transferDetail, {
state: {
additionalServiceCategory: additionalServiceCategory,
@@ -150,6 +152,15 @@ export const ListItem = ({
}
});
}
else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountResult) {
navigate(PATHS.additionalService.fundAccount.resultDetail, {
state: {
additionalServiceCategory: additionalServiceCategory,
mid: mid,
tid: tid
}
});
}
else if (additionalServiceCategory === AdditionalServiceCategory.SettlementAgency) {
}
@@ -162,6 +173,15 @@ export const ListItem = ({
}
});
}
else if (additionalServiceCategory === AdditionalServiceCategory.Ars){
navigate(PATHS.additionalService.payout.detail, {
state: {
additionalServiceCategory: additionalServiceCategory,
mid: mid,
tid: tid
}
});
}
else {
alert('additionalServiceCategory가 존재하지 않습니다.');
}
@@ -181,9 +201,16 @@ export const ListItem = ({
let time = requestDate?.substring(8, 14);
timeStr = time?.substring(0, 2) + ':' + time?.substring(2, 4) + ':' + time?.substring(4, 6);
}
else if (additionalServiceCategory === AdditionalServiceCategory.FundAccount) {
else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountTransfer) {
timeStr = moment(requestDate).format('mm:ss');
}
else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountResult) {
timeStr = moment(requestDate).format('mm:ss');
}
else if (additionalServiceCategory === AdditionalServiceCategory.Ars){
let time = paymentDate?.substring(8, 12);
timeStr = time?.substring(0, 2) + ':' + time?.substring(2, 4);
}
else {
return
}
@@ -196,25 +223,31 @@ export const ListItem = ({
str = `${tid}(${amount})`;
}
else if (additionalServiceCategory === AdditionalServiceCategory.AccountHolderAuth) {
str = `${accountName}(${accountNo})`
str = `${accountName}(${accountNo})`;
}
else if (additionalServiceCategory === AdditionalServiceCategory.AccountHolderSearch) {
str = `${accountNo}`
str = `${accountNo}`;
}
else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentHistory ||
additionalServiceCategory === AdditionalServiceCategory.LinkPaymentPending
additionalServiceCategory === AdditionalServiceCategory.LinkPaymentWait
) {
if (sendMethod === "SMS") {
str = `${"buyerName"}(${"휴대폰 번호"})`
str = `${"buyerName"}(${"휴대폰 번호"})`;
} else {
str = `${"buyerName"}(${"이메일"})`
str = `${"buyerName"}(${"이메일"})`;
}
}
else if (additionalServiceCategory === AdditionalServiceCategory.Payout) {
str = companyName;
}
else if(additionalServiceCategory === AdditionalServiceCategory.FundAccount){
str = `${receiveAccountName}(${receiveAccountNo})`
else if(additionalServiceCategory === AdditionalServiceCategory.FundAccountTransfer){
str = `${receiveAccountName}(${receiveAccountNo})`;
}
else if(additionalServiceCategory === AdditionalServiceCategory.FundAccountResult){
str = `${receiveAccountName}(${receiveAccountNo})`;
}
else if(additionalServiceCategory === AdditionalServiceCategory.Ars){
str = '이름(' + tid + ')';
}
return str;
@@ -270,7 +303,7 @@ export const ListItem = ({
);
}
}
else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentPending) {
else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentWait) {
rs.push(
<div className="transaction-details">
<span>{getProcessStatusText(processStatus)}</span>
@@ -288,7 +321,7 @@ export const ListItem = ({
</div>
);
}
else if(additionalServiceCategory === AdditionalServiceCategory.FundAccount){
else if(additionalServiceCategory === AdditionalServiceCategory.FundAccountTransfer){
rs.push(
<div className="transaction-details">
<span>{ getTime() }</span>
@@ -297,6 +330,28 @@ export const ListItem = ({
</div>
);
}
else if(additionalServiceCategory === AdditionalServiceCategory.FundAccountResult){
rs.push(
<div className="transaction-details">
<span>{ getTime() }</span>
<span className="separator">|</span>
<span>{ status }</span>
</div>
);
}
else if(additionalServiceCategory === AdditionalServiceCategory.Ars){
rs.push(
<div className="transaction-details">
<span>{ getTime() }</span>
<span className="separator">|</span>
<span>{ paymentStatus }</span>
<span className="separator">|</span>
<span>{ orderStatus }</span>
<span className="separator">|</span>
<span>{ arsPaymentMethod }</span>
</div>
);
}
return rs;
};
@@ -329,7 +384,7 @@ export const ListItem = ({
);
}
else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentHistory ||
additionalServiceCategory === AdditionalServiceCategory.LinkPaymentPending
additionalServiceCategory === AdditionalServiceCategory.LinkPaymentWait
) {
rs.push(
<div className="transaction-amount">
@@ -357,7 +412,22 @@ export const ListItem = ({
</div>
);
}
else if (additionalServiceCategory === AdditionalServiceCategory.FundAccount) {
else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountTransfer) {
rs.push(
<div
key="payout-item-amount"
className="transaction-amount"
>
<NumericFormat
value={transferAmount}
thousandSeparator
displayType="text"
suffix='원'
></NumericFormat>
</div>
);
}
else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountResult) {
rs.push(
<div
key="payout-item-amount"

View File

@@ -44,10 +44,10 @@ export enum AltMsgKeys {
};
export interface FilterRangeAmountProps {
title?: string;
minAmount?: number | string;
maxAmount?: number | string;
setMinAmount: (minAmount: number | string) => void;
setMaxAmount: (maxAmount: number | string) => void;
minAmount?: number;
maxAmount?: number;
setMinAmount: (minAmount: number) => void;
setMaxAmount: (maxAmount: number) => void;
};
export interface FilterButtonGroupsProps {
title: string;

View File

@@ -231,8 +231,8 @@ export interface AllTransactionListParams {
toDate: string;
stateCode: string;
serviceCode: string;
minAmount?: number | string;
maxAmount?: number | string;
minAmount?: number;
maxAmount?: number;
dateCl: string;
goodsName: string;
cardCode?: string;
@@ -260,8 +260,8 @@ export interface EscrowListParams {
endDate?: string;
deliveryStatus?: string;
settlementStatus?: string;
minAmount?: number | string;
maxAmount?: number | string;
minAmount?: number;
maxAmount?: number;
pagination?: DefaultRequestPagination;
};
@@ -274,8 +274,8 @@ export interface BillingListParams {
requestStatus?: string;
processResult?: string;
paymentMethod?: string;
minAmount?: number | string;
maxAmount?: number | string;
minAmount?: number;
maxAmount?: number;
pagination?: DefaultRequestPagination
};
@@ -510,8 +510,8 @@ export interface AllTransactionFilterProps extends FilterProps {
toDate: string;
stateCode: AllTransactionStateCode;
serviceCode: AllTransactionServiceCode;
minAmount?: number | string;
maxAmount?: number | string;
minAmount?: number;
maxAmount?: number;
cardCode?: string;
bankCode?: string;
searchCl?: AllTransactionSearchCl;
@@ -523,8 +523,8 @@ export interface AllTransactionFilterProps extends FilterProps {
setToDate: (endDate: string) => void;
setStateCode: (stateCode: AllTransactionStateCode) => void;
setServiceCode: (serviceCode: AllTransactionServiceCode) => void;
setMinAmount: (minAmount: string | number) => void;
setMaxAmount: (maxAmount: string | number) => void;
setMinAmount: (minAmount?: number) => void;
setMaxAmount: (maxAmount?: number) => void;
setCardCode: (cardCode: string | undefined) => void;
setBankCode: (bankCode: string | undefined) => void;
setSearchCl: (searchCl: AllTransactionSearchCl | undefined) => void;
@@ -553,8 +553,8 @@ export interface EscrowFilterProps extends FilterProps {
endDate: string;
deliveryStatus: EscrowDeliveryStatus;
settlementStatus: EscrowSettlementStatus;
minAmount?: number | string;
maxAmount?: number | string;
minAmount?: number;
maxAmount?: number;
setMid: (mid: string) => void;
setSearchType: (searchType: EscrowSearchType) => void;
setSearchKeyword: (searchKeyword: string) => void;
@@ -562,8 +562,8 @@ export interface EscrowFilterProps extends FilterProps {
setEndDate: (endDate: string) => void;
setDeliveryStatus: (deliveryStatus: EscrowDeliveryStatus) => void;
setSettlementStatus: (settlementStatus: EscrowSettlementStatus) => void;
setMinAmount: (minAmount: string | number) => void;
setMaxAmount: (maxAmount: string | number) => void;
setMinAmount: (minAmount?: number) => void;
setMaxAmount: (maxAmount?: number) => void;
};
export interface BillingFilterProps extends FilterProps {
mid: string;
@@ -574,8 +574,8 @@ export interface BillingFilterProps extends FilterProps {
requestStatus: BillingRequestStatus;
processResult: BillingProcessResult;
paymentMethod: BillingPaymentMethod;
minAmount?: number | string;
maxAmount?: number | string;
minAmount?: number;
maxAmount?: number;
setMid: (mid: string) => void;
setSearchType: (searchType: BillingSearchType) => void;
setSearchKeyword: (searchKeyword: string) => void;
@@ -584,8 +584,8 @@ export interface BillingFilterProps extends FilterProps {
setRequestStatus: (requestStatus: BillingRequestStatus) => void;
setProcessResult: (processResult: BillingProcessResult) => void;
setPaymentMethod: (paymentMethod: BillingPaymentMethod) => void;
setMinAmount: (minAmount: string | number) => void;
setMaxAmount: (maxAmount: string | number) => void;
setMinAmount: (minAmount?: number) => void;
setMaxAmount: (maxAmount?: number) => void;
};
export interface CashReceiptPurposeUpdateParams {
@@ -620,7 +620,7 @@ export interface CashReceiptManualIssueResponse {
export interface BillingChargeParams {
billKey: string;
productName: string;
productAmount: number | string;
productAmount: number;
orderNumber: string;
buyerName: string;
paymentRequestDate: string;

View File

@@ -4,14 +4,14 @@ import { ProcessStep } from '../model/types';
export interface CashReceiptHandWrittenIssuanceStep2Props {
setProcessStep: (processStep: ProcessStep) => void;
supplyAmount: number | string;
vatAmount: number | string;
taxFreeAmount: number | string;
serviceCharge: number | string;
setSupplyAmount: (supplyAmount: number | string) => void;
setVatAmount: (vatAmount: number | string) => void;
setTaxFreeAmount: (taxFreeAmount: number | string) => void;
setServiceCharge: (serviceCharge: number | string) => void;
supplyAmount: number;
vatAmount: number;
taxFreeAmount: number;
serviceCharge: number;
setSupplyAmount: (supplyAmount: number) => void;
setVatAmount: (vatAmount: number) => void;
setTaxFreeAmount: (taxFreeAmount: number) => void;
setServiceCharge: (serviceCharge: number) => void;
};
export const CashReceiptHandWrittenIssuanceStep2 = ({
setProcessStep,
@@ -63,7 +63,7 @@ export const CashReceiptHandWrittenIssuanceStep2 = ({
type="text"
placeholder=""
value={ supplyAmount }
onChange={ (e: ChangeEvent<HTMLInputElement>) => setSupplyAmount(e.target.value) }
onChange={ (e: ChangeEvent<HTMLInputElement>) => setSupplyAmount(parseInt(e.target.value)) }
/>
</div>
</div>
@@ -75,7 +75,7 @@ export const CashReceiptHandWrittenIssuanceStep2 = ({
type="text"
placeholder=""
value={ vatAmount }
onChange={ (e: ChangeEvent<HTMLInputElement>) => setVatAmount(e.target.value) }
onChange={ (e: ChangeEvent<HTMLInputElement>) => setVatAmount(parseInt(e.target.value)) }
/>
</div>
</div>
@@ -87,7 +87,7 @@ export const CashReceiptHandWrittenIssuanceStep2 = ({
type="text"
placeholder=""
value={ taxFreeAmount }
onChange={ (e: ChangeEvent<HTMLInputElement>) => setTaxFreeAmount(e.target.value) }
onChange={ (e: ChangeEvent<HTMLInputElement>) => setTaxFreeAmount(parseInt(e.target.value)) }
/>
</div>
</div>
@@ -99,7 +99,7 @@ export const CashReceiptHandWrittenIssuanceStep2 = ({
type="text"
placeholder=""
value={ serviceCharge }
onChange={ (e: ChangeEvent<HTMLInputElement>) => setServiceCharge(e.target.value) }
onChange={ (e: ChangeEvent<HTMLInputElement>) => setServiceCharge(parseInt(e.target.value)) }
/>
</div>
</div>

View File

@@ -62,8 +62,8 @@ export const AllTransactionFilter = ({
const [filterToDate, setFilterToDate] = useState<string>(toDate);
const [filterStateCode, setFilterStateCode] = useState<AllTransactionStateCode>(stateCode);
const [filterServiceCode, setFilterServiceCode] = useState<AllTransactionServiceCode>(serviceCode);
const [filterMinAmount, setFilterMinAmount] = useState<number | string>(minAmount || '');
const [filterMaxAmount, setFilterMaxAmount] = useState<number | string>(maxAmount || '');
const [filterMinAmount, setFilterMinAmount] = useState<number | undefined>(minAmount);
const [filterMaxAmount, setFilterMaxAmount] = useState<number | undefined>(maxAmount);
const [filterCardCode, setFilterCardCode] = useState<string | undefined>(cardCode);
const [filterBankCode, setFilterBankCode] = useState<string | undefined>(bankCode);

View File

@@ -59,8 +59,8 @@ export const BillingFilter = ({
const [filterRequestStatus, setFilterRequestStatus] = useState<BillingRequestStatus>(requestStatus);
const [filterProcessResult, setFilterProcessResult] = useState<BillingProcessResult>(processResult);
const [filterPaymentMethod, setFilterPaymentMethod] = useState<BillingPaymentMethod>(paymentMethod);
const [filterMinAmount, setFilterMinAmount] = useState<number | string>(minAmount || '');
const [filterMaxAmount, setFilterMaxAmount] = useState<number | string>(maxAmount || '');
const [filterMinAmount, setFilterMinAmount] = useState<number | undefined>(minAmount);
const [filterMaxAmount, setFilterMaxAmount] = useState<number | undefined>(maxAmount);
const onClickToClose = () => {
setFilterOn(false);

View File

@@ -54,8 +54,8 @@ export const EscrowFilter = ({
const [filterEndDate, setFilterEndDate] = useState<string>(endDate);
const [filterDeliveryStatus, setFilterDeliveryStatus] = useState<EscrowDeliveryStatus>(deliveryStatus);
const [filterSettlementStatus, setFilterSettlementStatus] = useState<EscrowSettlementStatus>(settlementStatus);
const [filterMinAmount, setFilterMinAmount] = useState<number | string>(minAmount || '');
const [filterMaxAmount, setFilterMaxAmount] = useState<number | string>(maxAmount || '');
const [filterMinAmount, setFilterMinAmount] = useState<number | undefined>(minAmount);
const [filterMaxAmount, setFilterMaxAmount] = useState<number | undefined>(maxAmount);
const onClickToClose = () => {
setFilterOn(false);