diff --git a/src/entities/transaction/model/types.ts b/src/entities/transaction/model/types.ts index 33b47ea..161c2b0 100644 --- a/src/entities/transaction/model/types.ts +++ b/src/entities/transaction/model/types.ts @@ -153,12 +153,10 @@ export interface BillingListProps { export interface AllTransactionListItem { tid?: string; mid?: string; - stateDate?: string; - stateCode?: string; - stateName?: string; + transactionDateTime?: string; + statusCode?: string; installmentMonth?: string; serviceCode?: string; - serviceName?: string; serviceDetailName?: string; goodsAmount?: number; }; @@ -221,8 +219,8 @@ export interface AllTransactionListSummaryParams extends AllTransactionListParam } export interface AllTransactionListSummaryResponse { - totalTransactionCount: number; - totalTransactionAmount: number; + totalCount: number; + totalAmount: number; }; export interface AllTransactionListParams { moid?: string; diff --git a/src/entities/transaction/ui/list-date-group.tsx b/src/entities/transaction/ui/list-date-group.tsx index 48af300..6c75dc6 100644 --- a/src/entities/transaction/ui/list-date-group.tsx +++ b/src/entities/transaction/ui/list-date-group.tsx @@ -25,12 +25,9 @@ export const ListDateGroup = ({ key={ key } tid={ items[i]?.tid } mid={ items[i]?.mid } - stateDate={ items[i]?.stateDate } - stateCode={ items[i]?.stateCode } - stateName={ items[i]?.stateName } + statusCode={ items[i]?.statusCode } installmentMonth={ items[i]?.installmentMonth } serviceCode={ items[i]?.serviceCode } - serviceName={ items[i]?.serviceName } serviceDetailName={ items[i]?.serviceDetailName } goodsAmount={ items[i]?.goodsAmount } diff --git a/src/entities/transaction/ui/list-item.tsx b/src/entities/transaction/ui/list-item.tsx index b1ae2cd..39d94b3 100644 --- a/src/entities/transaction/ui/list-item.tsx +++ b/src/entities/transaction/ui/list-item.tsx @@ -6,8 +6,8 @@ import moment from 'moment'; export const ListItem = ({ transactionCategory, - tid, mid, stateDate, stateCode, stateName, - installmentMonth, serviceCode, serviceName, + tid, mid, statusCode, + installmentMonth, serviceCode, serviceDetailName, goodsAmount, id, amount, customerName, issueNumber, issueStatus, paymentMethod, processResult, @@ -18,13 +18,13 @@ export const ListItem = ({ const { navigate } = useNavigate(); const getItemClass = () => { let rs = ''; - if(stateCode === '0'){ + if(statusCode === '0'){ rs = ''; } - else if(stateCode === '1'){ + else if(statusCode === '1'){ rs = 'approved'; } - else if(stateCode === '2'){ + else if(statusCode === '2'){ rs = 'refund'; } return rs; @@ -32,13 +32,13 @@ export const ListItem = ({ const getDotClass = (str?: string) => { let rs = ''; - if(stateCode === '0'){ + if(statusCode === '0'){ rs = ''; } - else if(stateCode === '1'){ + else if(statusCode === '1'){ rs = 'blue'; } - else if(stateCode === '2'){ + else if(statusCode === '2'){ rs = 'gray'; } return rs; @@ -82,7 +82,7 @@ export const ListItem = ({ const getTime = () => { let timeStr = ''; if(transactionCategory === TransactionCategory.AllTransaction){ - let time = stateDate?.substring(8, 12); + let time = transactionDateTime?.substring(8, 12); timeStr = time?.substring(0, 2) + ':' + time?.substring(2, 4); } else{ @@ -94,7 +94,15 @@ export const ListItem = ({ const getTitle = () => { let str = ''; if(transactionCategory === TransactionCategory.AllTransaction){ - str = `${serviceName}(${serviceDetailName})`; + let strDetailName = serviceDetailName?.split('|').join(','); + if(strDetailName){ + let last = strDetailName.slice(-1); + if(last === ','){ + strDetailName = strDetailName.substring(0, strDetailName.length - 1); + } + str = `(${strDetailName})`; + } + } else if(transactionCategory === TransactionCategory.CashReceipt){ str = `${customerName}(${issueNumber})` @@ -115,7 +123,7 @@ export const ListItem = ({
{ getTime() } | - { stateName } + { statusCode } | { mid } { diff --git a/src/pages/transaction/all-transaction/list-page.tsx b/src/pages/transaction/all-transaction/list-page.tsx index 7a18f29..96c6934 100644 --- a/src/pages/transaction/all-transaction/list-page.tsx +++ b/src/pages/transaction/all-transaction/list-page.tsx @@ -49,8 +49,8 @@ export const AllTransactionListPage = () => { const [searchCl, setSearchCl] = useState(); const [searchValue, setSearchValue] = useState(); - const [totalTransactionCount, setTotalTransactionCount] = useState(0); - const [totalTransactionAmount, setTotalTransactionAmount] = useState(0); + const [totalCount, setTotalCount] = useState(0); + const [totalAmount, setTotalAmount] = useState(0); useSetHeaderTitle('거래내역 조회'); @@ -96,8 +96,8 @@ export const AllTransactionListPage = () => { setListItems(assembleData(rs.content)); }); allTransactionListSummary(listSummaryParams).then((rs) => { - setTotalTransactionAmount(rs.totalTransactionAmount); - setTotalTransactionCount(rs.totalTransactionCount); + setTotalAmount(rs.totalAmount); + setTotalCount(rs.totalCount); }); }; @@ -105,8 +105,8 @@ export const AllTransactionListPage = () => { let data: any = {}; if(content && content.length > 0){ for(let i=0;i { useEffect(() => { callServiceCodeOptions(); - callList(); }, []); + useEffect(() => { + callList(); + }, [ + mid, moid, + tid, fromDate, + toDate, stateCode, + serviceCode, minAmount, + maxAmount, bankCode, + cardCode, searchCl, + searchValue + ]); + + return ( <>
@@ -184,10 +196,10 @@ export const AllTransactionListPage = () => {
@@ -216,11 +228,11 @@ export const AllTransactionListPage = () => { 거래건수
diff --git a/src/shared/ui/filter/calendar.tsx b/src/shared/ui/filter/calendar.tsx index 01b167d..df9062d 100644 --- a/src/shared/ui/filter/calendar.tsx +++ b/src/shared/ui/filter/calendar.tsx @@ -26,22 +26,31 @@ export const FilterCalendar = ({ const [calendarOpen, setCalendarOpen] = useState(false); const [calendarType, setCalendarType] = useState(CalendarType.Start); + const [newStartDate, setNewStartDate] = useState(''); + const [newEndDate, setNewEndDate] = useState(''); + const setFilterDate = (dateOptions: FilterDateOptions) => { if(dateOptions === FilterDateOptions.Today){ - setStartDate(moment().format('YYYY.MM.DD')); - setEndDate(moment().format('YYYY.MM.DD')); + setStartDate(moment().format('YYYYMMDD')); + setNewStartDate(moment().format('YYYY.MM.DD')); + setEndDate(moment().format('YYYYMMDD')); + setNewEndDate(moment().format('YYYY.MM.DD')); setDateReadyOnly(true); setFilterDateOptionsBtn(FilterDateOptions.Today); } else if(dateOptions === FilterDateOptions.Week){ - setStartDate(moment().subtract(1, 'week').format('YYYY.MM.DD')); - setEndDate(moment().format('YYYY.MM.DD')); + setStartDate(moment().subtract(1, 'week').format('YYYYMMDD')); + setNewStartDate(moment().subtract(1, 'week').format('YYYY.MM.DD')); + setEndDate(moment().format('YYYYMMDD')); + setNewEndDate(moment().format('YYYY.MM.DD')); setDateReadyOnly(true); setFilterDateOptionsBtn(FilterDateOptions.Week); } else if(dateOptions === FilterDateOptions.Month){ - setStartDate(moment().subtract(1, 'month').format('YYYY.MM.DD')); - setEndDate(moment().format('YYYY.MM.DD')); + setStartDate(moment().subtract(1, 'month').format('YYYYMMDD')); + setNewStartDate(moment().subtract(1, 'month').format('YYYY.MM.DD')); + setEndDate(moment().format('YYYYMMDD')); + setNewEndDate(moment().format('YYYY.MM.DD')); setDateReadyOnly(true); setFilterDateOptionsBtn(FilterDateOptions.Month); } @@ -65,16 +74,31 @@ export const FilterCalendar = ({ const setNewDate = (date: string) => { if(calendarType === CalendarType.Start){ - setStartDate(date); + setStartDate(moment(date).format('YYYYMMDD')); + setNewStartDate(moment(date).format('YYYY.MM.DD')); } else if(calendarType === CalendarType.End){ - setEndDate(date); + setEndDate(moment(date).format('YYYYMMDD')); + setNewEndDate(moment(date).format('YYYY.MM.DD')); } setCalendarOpen(false); } useEffect(() => { - + if(startDate && startDate.length === 8){ + let str = startDate.substring(0, 4)+'.'+startDate.substring(4, 6)+'.'+startDate.substring(6, 8); + setNewStartDate(str); + } + else{ + setNewStartDate(startDate); + } + if(endDate && endDate.length === 8){ + let str = endDate.substring(0, 4)+'.'+endDate.substring(4, 6)+'.'+endDate.substring(6, 8); + setNewEndDate(str); + } + else{ + setNewEndDate(endDate); + } }, []); return ( <> @@ -106,7 +130,7 @@ export const FilterCalendar = ({ className="date-input" type="text" placeholder="날짜 선택" - value={ startDate } + value={ newStartDate } onChange={ (e: ChangeEvent) => {} } readOnly={ dateReadOnly } /> @@ -128,7 +152,7 @@ export const FilterCalendar = ({ className="date-input" type="text" placeholder="날짜 선택" - value={ endDate } + value={ newEndDate } onChange={ (e: ChangeEvent) => {} } readOnly={ dateReadOnly } /> @@ -149,8 +173,8 @@ export const FilterCalendar = ({