- 자금이체_처리결과: 리스트,필터,상세정보 수정

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

@@ -3,27 +3,22 @@ import { PATHS } from '@/shared/constants/paths';
 import { useNavigate } from '@/shared/lib/hooks/use-navigate';
 import { ListItemProps, AdditionalServiceCategory } from '../model/types';
 import { getPaymentStatusText, getProcessStatusText, getSendMethodText } from '../lib/payment-status-utils';
-import { getFundAccountStatusName } from '../model/fund-account/constant';
+import { getFundAccountResultStatusName, getFundAccountStatusName } from '../model/fund-account/constant';
 import moment from 'moment';
+import { FundAccountResultStatus } from '../model/fund-account/types';
 
 export const ListItem = ({
   additionalServiceCategory,
   mid, tid, paymentDate, paymentStatus,
 
-  requestDate, bankName, accountNo, resultStatus,resultMessage,
-  amount, sendDate, sendStatus, sendMethod,
-  scheduledSendDate, processStatus,
-  registDate,
+  applicationDate, requestDate, bankName, accountNo, resultStatus, resultMessage,
+  amount, sendMethod, processStatus,registDate,
 
   accountName, transferStatus,
 
   submallId, settlementDate, companyName,
   disbursementStatus, disbursementAmount,
 
-  transferAmount, receiveBankName,
-  receiveAccountNo, receiveAccountName,
-  status, processDate,
-
   orderStatus, arsPaymentMethod,
 
   alimCl, sendType, sendCl,
@@ -127,9 +122,9 @@ export const ListItem = ({
         rs = 'gray';
       }
     } else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountResult) {
-      if (status === "REQUEST_SUCCESS" || status === "REGIST_COMPLETE") {
+      if (resultStatus === "REQUEST" || resultStatus === "SUCCESS") {
         rs = 'blue';
-      } else if (status === "REQUEST_FAIL") {
+      } else if (resultStatus === "FAIL") {
         rs = 'gray';
       }
     }
@@ -261,7 +256,9 @@ export const ListItem = ({
       }
     }
     else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountResult) {
-      timeStr = moment(requestDate).format('mm:ss');
+      if (applicationDate && applicationDate.length >= 12) {
+        timeStr = applicationDate.substring(8, 10) + ':' + applicationDate.substring(10, 12);
+      }
     }
     else if (additionalServiceCategory === AdditionalServiceCategory.Ars) {
       let time = paymentDate?.substring(8, 12);
@@ -283,7 +280,7 @@ export const ListItem = ({
       statusText = getFundAccountStatusName(resultStatus);
     }
     else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountResult) {
-      statusText = getFundAccountStatusName(status);
+      statusText = getFundAccountResultStatusName(resultStatus);
     }
     else if (additionalServiceCategory === AdditionalServiceCategory.AccountHolderSearch) {
       statusText = resultStatus || '';
@@ -326,12 +323,11 @@ export const ListItem = ({
     else if (additionalServiceCategory === AdditionalServiceCategory.Payout) {
       str = companyName;
     }
-    else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountTransfer) {
+    else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountTransfer ||
+      additionalServiceCategory === AdditionalServiceCategory.FundAccountResult
+    ) {
       str = `${accountName}(${accountNo})`;
     }
-    else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountResult) {
-      str = `${receiveAccountName}(${receiveAccountNo})`;
-    }
     else if (additionalServiceCategory === AdditionalServiceCategory.SMSPayment) {
       str = `${paymentDate}(${paymentStatus})[추후 수정 필요]`
     }
@@ -444,7 +440,9 @@ export const ListItem = ({
         <div className="transaction-details">
           <span>{getTime()}</span>
           <span className="separator">|</span>
-          <span>{status}</span>
+          <span>{getStatus()}</span>
+          <span className="separator">|</span>
+          <span>{mid}</span>
         </div>
       );
     }
@@ -548,7 +546,9 @@ export const ListItem = ({
         </div>
       );
     }
-    else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountTransfer) {
+    else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountTransfer ||
+      additionalServiceCategory === AdditionalServiceCategory.FundAccountResult
+    ) {
       rs.push(
         <div
           key="fund-account-transfer-amount"
@@ -563,21 +563,6 @@ export const ListItem = ({
         </div>
       );
     }
-    else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountResult) {
-      rs.push(
-        <div
-          key="payout-item-amount"
-          className="transaction-amount"
-        >
-          <NumericFormat
-            value={transferAmount}
-            thousandSeparator
-            displayType="text"
-            suffix='원'
-          ></NumericFormat>
-        </div>
-      );
-    }
     else if (additionalServiceCategory === AdditionalServiceCategory.Ars) {
       rs.push(
         <div
@@ -604,9 +589,9 @@ export const ListItem = ({
     else if (additionalServiceCategory === AdditionalServiceCategory.SMSPayment && onResendClick && tid) {
       rs.push(
         <div
-        key="sms-payment-amount"
-        className={`status-label success`}
-        onClick={() => mid && tid && onResendClick(mid, tid)}
+          key="sms-payment-amount"
+          className={`status-label success`}
+          onClick={() => mid && tid && onResendClick(mid, tid)}
         >{'재발송'}</div>
       )
     }