ars 상세 페이지 추가 및 경로 설ㄹ정 추가 ars 필터 리스트 및 필터 완료

2025-09-24 10:48:44 +09:00
parent 03cfc21821
commit 989147ab4b
10 changed files with 254 additions and 29 deletions
--- a/src/entities/additional-service/model/ars/constant.ts
+++ b/src/entities/additional-service/model/ars/constant.ts
@@ -1,7 +1,14 @@
-import { PaymentStatus } from './types';
+import { OrderStatus, PaymentStatus } from './types';

-export const PaymentStatusBtnGroup = [
+export const ArsPaymentStatusBtnGroup = [
  {name: '전체', value: PaymentStatus.ALL },
  {name: '결제완료', value: PaymentStatus.COMPLETE },
  {name: '미결제', value: PaymentStatus.UNPAID }
+];
+export const ArsOrderStatusBtnGroup = [
+  {name: '전체', value: OrderStatus.ALL },
+  {name: '결제대기', value: OrderStatus.PENDING },
+  {name: '결제성공', value: OrderStatus.SUCCESS },
+  {name: '기간만료', value: OrderStatus.EXPIRED },
+  {name: '취소완료', value: OrderStatus.CANCELED },
 ];
--- a/src/entities/additional-service/model/ars/types.ts
+++ b/src/entities/additional-service/model/ars/types.ts
@@ -21,15 +21,15 @@ export interface ExtensionArsResendParams {
 };
 export interface ExtensionArsResendResponse {};
 export interface ExtensionArsListParams {
-  mid: string;
-  moid: string;
-  fromDate: string;
-  toDate: string;
-  paymentStatus: string;
-  orderStatus: string;
-  minAmount: number;
-  maxAmount: number;
-  page: DefaultRequestPagination;
+  mid?: string;
+  moid?: string;
+  fromDate?: string;
+  toDate?: string;
+  paymentStatus?: PaymentStatus
+  orderStatus?: OrderStatus;
+  minAmount?: number;
+  maxAmount?: number;
+  page?: DefaultRequestPagination;
 };
 export interface ArsListContent {
  tid?: string;
@@ -43,14 +43,14 @@ 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;
+  mid?: string;
+  moid?: string;
+  fromDate?: string;
+  toDate?: string;
+  paymentStatus?: string;
+  orderStatus?: string;
+  minAmount?: number;
+  maxAmount?: number;
 };
 export interface ExtensionArsDownloadExcelResponse {};
 export interface ExtensionArsDetailParams {
--- a/src/entities/additional-service/ui/filter/ars-filter.tsx
+++ b/src/entities/additional-service/ui/filter/ars-filter.tsx
@@ -0,0 +1,169 @@
+import { useEffect, useState } from 'react';
+import { motion } from 'framer-motion';
+import { IMAGE_ROOT } from '@/shared/constants/common';
+import { FilterSelect } from '@/shared/ui/filter/select';
+import { FilterCalendar } from '@/shared/ui/filter/calendar';
+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 moment from 'moment';
+import { FilterInput } from '@/shared/ui/filter/input';
+import { OrderStatus, PaymentStatus } from '../../model/ars/types';
+import { ArsOrderStatusBtnGroup, ArsPaymentStatusBtnGroup } from '../../model/ars/constant';
+
+export interface ArsFilterProps {
+  filterOn: boolean;
+  setFilterOn: (filterOn: boolean) => void;
+  mid: string;
+  moid: string;
+  fromDate: string;
+  toDate: string;
+  paymentStatus: PaymentStatus;
+  orderStatus: OrderStatus;
+  minAmount?: number;
+  maxAmount?: number;
+  setMid: (mid: string) => void;
+  setMoid: (moid: string) => void;
+  setFromDate: (fromDate: string) => void;
+  setToDate: (toDate: string) => void;
+  setPaymentStatus: (paymentStatus: PaymentStatus) => void;
+  setOrderStatus: (orderStatus: OrderStatus) => void;
+  setMinAmount: (minAmount?: number) => void;
+  setMaxAmount: (maxAmount?: number) => void;
+};
+
+export const ArsFilter = ({
+  filterOn,
+  setFilterOn,
+  mid,
+  moid,
+  fromDate,
+  toDate,
+  paymentStatus,
+  orderStatus,
+  minAmount,
+  maxAmount,
+  setMid,
+  setMoid,
+  setFromDate,
+  setToDate,
+  setPaymentStatus,
+  setOrderStatus,
+  setMinAmount,
+  setMaxAmount
+}: ArsFilterProps) => {
+
+  const [filterMid, setFilterMid] = useState<string>(mid);
+  const [filterMoid, setFilterMoid] = useState<string>(moid);
+  const [filterFromDate, setFilterFromDate] = useState<string>(moment(fromDate).format('YYYY.MM.DD'));
+  const [filterToDate, setFilterToDate] = useState<string>(moment(toDate).format('YYYY.MM.DD'));
+  const [filterPaymentStatus, setFilterPaymentStatus] = useState<PaymentStatus>(paymentStatus);
+  const [filterOrderStatus, setFilterOrderStatus] = useState<OrderStatus>(orderStatus);
+  const [filterMinAmount, setFilterMinAmount] = useState<number | undefined>(minAmount);
+  const [filterMaxAmount, setFilterMaxAmount] = useState<number | undefined>(maxAmount);
+  
+  const onClickToClose = () => {
+    setFilterOn(false);
+  };
+
+  const onClickToSetFilter = () => {
+    setMid(filterMid);
+    setFilterMoid(filterMoid);
+    setFromDate(filterFromDate);
+    setToDate(filterToDate);
+    setPaymentStatus(filterPaymentStatus);
+    setOrderStatus(filterOrderStatus);
+    setMinAmount(filterMinAmount);
+    setMaxAmount(filterMaxAmount);
+    onClickToClose();
+  };
+
+  let MidOptions = [
+    {name: 'nictest001m', value: 'nictest001m'}
+  ];
+
+  useEffect(() => {
+    setFilterPaymentStatus(paymentStatus);
+  }, [paymentStatus]);
+
+  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>
+            <FilterInput
+              title='주문번호'
+              inputValue={ filterMoid }
+              inputSetter={ setFilterMoid }
+            ></FilterInput>
+            <FilterCalendar
+              title='조회기간'
+              startDate={ filterFromDate }
+              endDate={ filterToDate }
+              setStartDate={ setFilterFromDate }
+              setEndDate={ setFilterToDate }
+            ></FilterCalendar>
+            <FilterButtonGroups
+              title='결제상태'
+              activeValue={ filterPaymentStatus }
+              btnGroups={ ArsPaymentStatusBtnGroup }
+              setter={ setFilterPaymentStatus }
+            ></FilterButtonGroups>
+            <FilterButtonGroups
+              title='주문상태'
+              activeValue={ filterOrderStatus }
+              btnGroups={ ArsOrderStatusBtnGroup }
+              setter={ setFilterOrderStatus }
+            ></FilterButtonGroups>
+            <FilterRangeAmount
+              title='거래금액'
+              minAmount={ filterMinAmount }
+              maxAmount={ filterMaxAmount }
+              setMinAmount={ setFilterMinAmount }
+              setMaxAmount={ setFilterMaxAmount }
+            ></FilterRangeAmount>
+          </div>
+          <div className="apply-row">
+            <button 
+              className="btn-50 btn-blue flex-1"
+              onClick={ () => onClickToSetFilter() }
+            >적용</button>
+          </div>
+        </div>
+      </motion.div>
+    </>
+  );
+};
--- a/src/entities/additional-service/ui/list-item.tsx
+++ b/src/entities/additional-service/ui/list-item.tsx
@@ -442,6 +442,21 @@ export const ListItem = ({
        </div>
      );
    }
+    else if (additionalServiceCategory === AdditionalServiceCategory.Ars) {
+      rs.push(
+        <div
+          key="payout-item-amount"
+          className="transaction-amount"
+        >
+          <NumericFormat
+            value={amount}
+            thousandSeparator
+            displayType="text"
+            suffix='원'
+          ></NumericFormat>
+        </div>
+      );
+    }
    return rs;
  }

--- a/src/pages/additional-service/additional-service-pages.tsx
+++ b/src/pages/additional-service/additional-service-pages.tsx
@@ -3,6 +3,7 @@ import { SentryRoutes } from '@/shared/configs/sentry';
 import { ROUTE_NAMES } from '@/shared/constants/route-names';
 import { IntroPage } from './intro/intro-page';
 import { ArsListPage } from './ars/list-page';
+import { ArsDetailPage } from './ars/detail-page';
 import { ArsRequestPage } from './ars/request-page';
 import { ArsRequestSuccessPage } from './ars/request-success-page';
 import { KeyInPaymentPage } from './key-in-payment/key-in-payment-page';
@@ -45,6 +46,7 @@ export const AdditionalServicePages = () => {

        <Route path={ROUTE_NAMES.additionalService.ars.base}>
          <Route path={ROUTE_NAMES.additionalService.ars.list} element={<ArsListPage />} />
+          <Route path={ROUTE_NAMES.additionalService.ars.detail} element={<ArsDetailPage />} />
          <Route path={ROUTE_NAMES.additionalService.ars.request} element={<ArsRequestPage />} />
          <Route path={ROUTE_NAMES.additionalService.ars.requestSuccess} element={<ArsRequestSuccessPage />} />
        </Route>
--- a/src/pages/additional-service/ars/detail-page.tsx
+++ b/src/pages/additional-service/ars/detail-page.tsx
@@ -0,0 +1,6 @@
+export const ArsDetailPage = () => {
+
+  return (
+    <></>
+  );
+};
--- a/src/pages/additional-service/ars/list-page.tsx
+++ b/src/pages/additional-service/ars/list-page.tsx
@@ -17,7 +17,8 @@ import { useExtensionArsDownloadExcelMutation } from '@/entities/additional-serv
 import { ListDateGroup } from '@/entities/additional-service/ui/list-date-group';
 import { AdditionalServiceCategory } from '@/entities/additional-service/model/types';
 import { SortOptionsBox } from '@/entities/common/ui/sort-options-box';
-import { PaymentStatusBtnGroup } from '@/entities/additional-service/model/ars/constant';
+import { ArsPaymentStatusBtnGroup } from '@/entities/additional-service/model/ars/constant';
+import { ArsFilter } from '@/entities/additional-service/ui/filter/ars-filter';

 export const ArsListPage = () => {
  const { navigate } = useNavigate();
@@ -32,8 +33,8 @@ export const ArsListPage = () => {
  const [toDate, setToDate] = useState<string>(moment().format('YYYYMMDD'));
  const [paymentStatus, setPaymentStatus] = useState<PaymentStatus>(PaymentStatus.ALL);
  const [orderStatus, setOrderStatus] = useState<OrderStatus>(OrderStatus.ALL);
-  const [minAmount, setMinAmount] = useState<number>(0);
-  const [maxAmount, setMaxAmount] = useState<number>(0);
+  const [minAmount, setMinAmount] = useState<number>();
+  const [maxAmount, setMaxAmount] = useState<number>();

  const { mutateAsync: extensionArsList } = useExtensionArsListMutation();
  const { mutateAsync: extensionArsDownloadExcel } = useExtensionArsDownloadExcelMutation();
@@ -188,7 +189,7 @@ export const ArsListPage = () => {
              <div className="excrow mr-0">
                <div className="full-menu-keywords no-padding">
                  {
-                    PaymentStatusBtnGroup.map((value, index) => (
+                    ArsPaymentStatusBtnGroup.map((value, index) => (
                      <span 
                        key={ `key-service-code=${ index }` }
                        className={ `keyword-tag ${(paymentStatus === value.value)? 'active': ''}` }
@@ -212,6 +213,26 @@ export const ArsListPage = () => {
          </div>
        </div>
      </main>
+      <ArsFilter
+        filterOn={ filterOn }
+        setFilterOn={ setFilterOn }
+        mid={ mid }
+        moid={ moid }
+        fromDate={ fromDate }
+        toDate={ toDate }
+        paymentStatus={ paymentStatus }
+        orderStatus={ orderStatus }
+        minAmount={ minAmount }
+        maxAmount={ maxAmount }
+        setMid={ setMid }
+        setMoid={ setMoid }
+        setFromDate={ setFromDate }
+        setToDate={ setToDate }
+        setPaymentStatus={ setPaymentStatus }
+        setOrderStatus={ setOrderStatus }
+        setMinAmount={ setMinAmount }
+        setMaxAmount={ setMaxAmount }
+      ></ArsFilter>
    </>
  );
 };
--- a/src/shared/constants/paths.ts
+++ b/src/shared/constants/paths.ts
@@ -148,6 +148,10 @@ export const PATHS: RouteNamesType = {
        `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.ars.base}`,
        ROUTE_NAMES.additionalService.ars.list,
      ),
+      detail: generatePath(
+        `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.ars.base}`,
+        ROUTE_NAMES.additionalService.ars.detail,
+      ),
      request: generatePath(
        `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.ars.base}`,
        ROUTE_NAMES.additionalService.ars.request,
--- a/src/shared/constants/route-names.ts
+++ b/src/shared/constants/route-names.ts
@@ -73,6 +73,7 @@ export const ROUTE_NAMES = {
    ars: {
      base: '/ars/*',
      list: 'list',
+      detail: 'detail',
      request: 'request',
      requestSuccess: 'request-success',
    },
--- a/src/shared/ui/filter/calendar.tsx
+++ b/src/shared/ui/filter/calendar.tsx
@@ -28,20 +28,20 @@ export const FilterCalendar = ({
  
  const setFilterDate = (dateOptions: FilterDateOptions) => {
    if(dateOptions === FilterDateOptions.Today){
-      setStartDate(moment().format('YYYY-MM-DD'));
-      setEndDate(moment().format('YYYY-MM-DD'));
+      setStartDate(moment().format('YYYY.MM.DD'));
+      setEndDate(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('YYYY.MM.DD'));
+      setEndDate(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('YYYY.MM.DD'));
+      setEndDate(moment().format('YYYY.MM.DD'));
      setDateReadyOnly(true);
      setFilterDateOptionsBtn(FilterDateOptions.Month);
    }