버그 픽스 및 정산 조회

src/entities/settlement/model/types.ts

@@ -93,6 +93,11 @@ export interface AmountInfo {
   holdAmount?: number;
   releaseAmount?: number;
   offsetAmount?: number;
+
+  transactionAmount?: number;
+  settlementAmount?: number;
+  preSettlementCancelOffset?: number;
+  finalSettlementAmount?: number;
 };
 export interface TransactionInfo {
   orderNumber: string;

src/entities/settlement/ui/info-wrap/amount-info-wrap.tsx

@@ -19,15 +19,12 @@ export const AmountInfoWrap = ({
             <li className="kv-row">
               <span className="k">거래금액 합계</span>
               <span className="v">
-                <span>
                 <NumericFormat
                   value={ amountInfo?.totalTransactionAmount } 
                   thousandSeparator
                   displayType="text"
                   suffix='원'
                 ></NumericFormat>
-                </span>
-                <span>
                 <NumericFormat
                   value={ amountInfo?.totalTransactionCount } 
                   thousandSeparator
@@ -36,20 +33,16 @@ export const AmountInfoWrap = ({
                   suffix='건)'
                 ></NumericFormat>
               </span>
-              </span>
               <ul className="txn-amount-detail">
                 <li>
                   <span>·&nbsp;&nbsp;신용카드</span>
-                  <span>
+                  <span className="unset-child-span">
-                    <span>
                     <NumericFormat
                       value={ amountInfo?.creditCardAmount } 
                       thousandSeparator
                       displayType="text"
                       suffix='원'
                     ></NumericFormat>
-                    </span>
-                    <span>
                     <NumericFormat
                       value={ amountInfo?.creditCardCount } 
                       thousandSeparator
@@ -58,20 +51,16 @@ export const AmountInfoWrap = ({
                       suffix='건)'
                     ></NumericFormat>
                   </span>
-                  </span>
                 </li>
                 <li>
                   <span>·&nbsp;&nbsp;계좌이체</span>
-                  <span>
+                  <span className="unset-child-span">
-                    <span>
                     <NumericFormat
                       value={ amountInfo?.accountTransferAmount } 
                       thousandSeparator
                       displayType="text"
                       suffix='원'
                     ></NumericFormat>
-                    </span>
-                    <span>
                     <NumericFormat
                       value={ amountInfo?.accountTransferCount } 
                       thousandSeparator
@@ -80,7 +69,6 @@ export const AmountInfoWrap = ({
                       suffix='건)'
                     ></NumericFormat>
                   </span>
-                  </span>
                 </li>
               </ul>
             </li>
@@ -178,7 +166,7 @@ export const AmountInfoWrap = ({
               <span className="k">거래금액</span>
               <span className="v">
                 <NumericFormat
-                  value={ amountInfo?.totalTransactionAmount } 
+                  value={ amountInfo?.transactionAmount } 
                   thousandSeparator
                   displayType="text"
                   suffix='원'
@@ -233,7 +221,7 @@ export const AmountInfoWrap = ({
               <span className="k">정산예정금액</span>
               <span className="v">
                 <NumericFormat
-                  value={ amountInfo?.offsetAmount } 
+                  value={ amountInfo?.settlementAmount } 
                   thousandSeparator
                   displayType="text"
                   suffix='원'
@@ -244,7 +232,7 @@ export const AmountInfoWrap = ({
               <span className="k">정산전 취소상계</span>
               <span className="v">
                 <NumericFormat
-                  value={ amountInfo?.offsetAmount } 
+                  value={ amountInfo?.preSettlementCancelOffset } 
                   thousandSeparator
                   displayType="text"
                   suffix='원'
@@ -255,7 +243,7 @@ export const AmountInfoWrap = ({
               <span className="k">정산금액</span>
               <span className="v">
                 <NumericFormat
-                  value={ amountInfo?.offsetAmount } 
+                  value={ amountInfo?.finalSettlementAmount } 
                   thousandSeparator
                   displayType="text"
                   suffix='원'

src/entities/settlement/ui/list-wrap.tsx

@@ -182,16 +182,6 @@ export const ListWrap = ({
       }
     }
   };
-  useEffect(() => {
-    setTransactionIds([
-      'TXN_20250608_001',
-      'TXN_20250608_002'
-    ]);
-  }, []);
-
-  useEffect(() => {
-    callList();
-  }, [periodType]);
   
   const getSettlementDateListDateGroup = () => {
     let rs = [];
@@ -209,7 +199,6 @@ export const ListWrap = ({
             date = settlementDate;
           }
           if(date !== settlementDate){
-            date = settlementDate;
             if(list.length > 0){
               rs.push(
                 <ListDateGroup
@@ -220,6 +209,7 @@ export const ListWrap = ({
                 ></ListDateGroup>
               );
             }
+            date = settlementDate;
             list = [];
           }
           list.push(listItem);
@@ -255,7 +245,6 @@ export const ListWrap = ({
             date = settlementDate;
           }
           if(date !== settlementDate){
-            date = settlementDate;
             if(list.length > 0){
               rs.push(
                 <ListDateGroup
@@ -266,6 +255,7 @@ export const ListWrap = ({
                 ></ListDateGroup>
               );
             }
+            date = settlementDate;
             list = [];
           }
           list.push(listItem);
@@ -304,6 +294,22 @@ export const ListWrap = ({
     */
   };
 
+  useEffect(() => {
+    setTransactionIds([
+      'TXN_20250608_001',
+      'TXN_20250608_002'
+    ]);
+  }, []);
+
+  useEffect(() => {
+    callList();
+  }, [
+    mid, periodType, 
+    startDate, endDate,
+    paymentMethod
+  ]);
+  
+
   return (
     <>
       <div className="summary-section pt-30">

src/entities/transaction/ui/all-transaction-list.tsx

@@ -19,7 +19,6 @@ export const AllTransactionList = ({
             date = transactionDate;
           }
           if(date !== transactionDate){
-            date = transactionDate;
             if(list.length > 0){
               rs.push(
                 <ListDateGroup
@@ -30,6 +29,7 @@ export const AllTransactionList = ({
                 ></ListDateGroup>
               );
             }
+            date = transactionDate;
             list = [];
           }
           list.push(item);

src/entities/transaction/ui/billing-list.tsx

@@ -22,7 +22,6 @@ export const BillingList = ({
             date = transactionDate;
           }
           if(date !== transactionDate){
-            date = transactionDate;
             if(list.length > 0){
               rs.push(
                 <ListDateGroup
@@ -33,6 +32,7 @@ export const BillingList = ({
                 ></ListDateGroup>
               );
             }
+            date = transactionDate;
             list = [];
           }
           list.push(item);

src/entities/transaction/ui/cash-receipt-list.tsx

@@ -22,7 +22,6 @@ export const CashReceiptList = ({
             date = transactionDate;
           }
           if(date !== transactionDate){
-            date = transactionDate;
             if(list.length > 0){
               rs.push(
                 <ListDateGroup
@@ -33,6 +32,7 @@ export const CashReceiptList = ({
                 ></ListDateGroup>
               );
             }
+            date = transactionDate;
             list = [];
           }
           list.push(item);

src/entities/transaction/ui/escrow-list.tsx

@@ -19,7 +19,6 @@ export const EscrowList = ({
             date = transactionDate;
           }
           if(date !== transactionDate){
-            date = transactionDate;
             if(list.length > 0){
               rs.push(
                 <ListDateGroup
@@ -30,6 +29,7 @@ export const EscrowList = ({
                 ></ListDateGroup>
               );
             }
+            date = transactionDate;
             list = [];
           }
           list.push(item);

src/entities/vat-return/ui/list-date-group.tsx

@@ -9,7 +9,7 @@ export const ListDateGroup = ({
 }: ListDateGroupProps) => {
   moment.locale('ko');
   const getStateDate = () => {
-    let stateDate = moment(date).format('YY.MM');
+    let stateDate = moment(date).format('YYYY.MM');
     return stateDate;
   };
 

src/entities/vat-return/ui/list-wrap.tsx

@@ -1,5 +1,4 @@
 import moment from 'moment';
-
 import { useEffect, useState } from 'react';
 import { IMAGE_ROOT } from '@/shared/constants/common';
 import { ListFilter } from './filter/list-filter';
@@ -91,7 +90,6 @@ export const ListWrap = () => {
             date = issueDate;
           }
           if(date !== issueDate){
-            date = issueDate;
             if(list.length > 0){
               rs.push(
                 <ListDateGroup
@@ -101,6 +99,7 @@ export const ListWrap = () => {
                 ></ListDateGroup>
               );
             }
+            date = issueDate;
             list = [];
           }
           list.push(item);

src/entities/vat-return/ui/section/amount-section.tsx

@@ -27,7 +27,7 @@ export const AmountSection = ({
   };
 
   const onClickToOpenDownloadBottomSheet = () => {
-
+    setDownloadBottomSheetOn(true);
   };
 
   return (

src/pages/vat-return/detail-page.tsx

@@ -89,7 +89,7 @@ export const DetailPage = () => {
               <button 
                 className="btn-50 btn-blue flex-1"
                 onClick={ onClickToOpenBottomSheet }
-              >거래 취소</button>
+              >세부내역 조회</button>
             </div>
           </div>
         </div>

src/shared/ui/assets/css/style-fix.css

@@ -379,3 +379,10 @@ main.home-main{
 .scrollbar-hide::-webkit-scrollbar {
     display: none; /* Chrome, Safari, Opera */
 }
+.unset-child-span > span {
+  color: unset !important;
+  font-size: unset !important;
+  font-weight: unset !important;
+  width: unset !important;
+  text-align: unset !important;
+}

src/shared/ui/filter/calendar-month.tsx

@@ -28,20 +28,20 @@ export const FilterCalendarMonth = ({
   
   const setFilterMonth = (monthOptions: FilterMonthOptions) => {
     if(monthOptions === FilterMonthOptions.Month1){
-      setStartMonth(moment().format('YYYY.MM'));
+      setStartMonth(moment().format('YYYYMM'));
-      setEndMonth(moment().format('YYYY.MM'));
+      setEndMonth(moment().format('YYYYMM'));
       setMonthReadyOnly(true);
       setFilterMonthOptionsBtn(FilterMonthOptions.Month1);
     } 
     else if(monthOptions === FilterMonthOptions.Month2){
-      setStartMonth(moment().subtract(1, 'month').format('YYYY.MM'));
+      setStartMonth(moment().subtract(1, 'month').format('YYYYMM'));
-      setEndMonth(moment().format('YYYY.MM'));
+      setEndMonth(moment().format('YYYYMM'));
       setMonthReadyOnly(true);
       setFilterMonthOptionsBtn(FilterMonthOptions.Month2);
     }
     else if(monthOptions === FilterMonthOptions.Month3){
-      setStartMonth(moment().subtract(2, 'month').format('YYYY.MM'));
+      setStartMonth(moment().subtract(2, 'month').format('YYYYMM'));
-      setEndMonth(moment().format('YYYY.MM'));
+      setEndMonth(moment().format('YYYYMM'));
       setMonthReadyOnly(true);
       setFilterMonthOptionsBtn(FilterMonthOptions.Month3);
     }