fix: 修改平台结算以及积分结算实际付款时间，预计付款时间

src/locales/en-US/balance.ts

@@ -880,5 +880,7 @@ export default {
   'balance.memberSettle.settleMethod.payDayValidate': 'Payment date must be numeric and must be between 1-31',
   'balance.memberSettle.settleMethod.payDay': 'payDay / Mon',
   'balance.memberSettle.settleMethod.payDay.info': 'Payment date: monthly {data}',
-
+  'balance.platformSettlement.columns.estimatedPaymentDate': 'estimatedPaymentDate',
+  'balance.platformSettlement.columns.payTime': 'payTime',
+  'balance.platformSettlement.columns.settlementName': 'settlementName'
 }

src/locales/ko-KR/balance.ts

@@ -880,4 +880,7 @@ export default {
   'balance.memberSettle.settleMethod.payDayValidate': '결제일은 숫자여야 하며 1-31 사이여야 합니다.',
   'balance.memberSettle.settleMethod.payDay': '매월 지불일',
   'balance.memberSettle.settleMethod.payDay.info': '지불일: 매월 {data}번',
+  'balance.platformSettlement.columns.estimatedPaymentDate': '예상 지불 시간',
+  'balance.platformSettlement.columns.payTime': '실제 지불 시간',
+  'balance.platformSettlement.columns.settlementName': '결제자'
 }

src/locales/zh-CN/balance.ts

@@ -881,5 +881,8 @@ export default {
   'balance.memberSettle.view': '查看会员策略',
   'balance.memberSettle.settleMethod.payDayValidate': '付款日必须为数字且必须在1-31之间',
   'balance.memberSettle.settleMethod.payDay': '每月付款日',
-  'balance.memberSettle.settleMethod.payDay.info': '付款日：每月{data}号'
+  'balance.memberSettle.settleMethod.payDay.info': '付款日：每月{data}号',
+  'balance.platformSettlement.columns.estimatedPaymentDate': '预计付款时间',
+  'balance.platformSettlement.columns.payTime': '实际付款时间',
+  'balance.platformSettlement.columns.settlementName': '结算方'
 }

src/pages/balance/platformSettlement/accountReceivable/index.tsx

@@ -60,15 +60,16 @@ const AccountReceivable = () => {
         )
       }
     },
-    {title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.settlementDate'}), dataIndex: 'settlementDate'},
-    {title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.settlementWayName'}), dataIndex: 'settlementWayName'},
-    {title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.totalCount'}), dataIndex: 'totalCount', render: (text) => numFormat(text)},
-    {title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.collectAmount'}), dataIndex: 'collectAmount', render: (text) => `${intl.formatMessage({ id: 'common.money' })}${fomatNumber(text)}`},
-    {title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.brokerage'}), dataIndex: 'brokerage'},
-    {title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.amount'}), dataIndex: 'amount', render: (text) => `${intl.formatMessage({ id: 'common.money' })}${fomatNumber(text)}`},
-    // {title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.settlementTime'}), dataIndex: 'settlementDate'},
-    {title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.settlementTime'}), dataIndex: 'settlementTime'},
-    {title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.payWayName'}), dataIndex: 'payWayName'},
+    { title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.settlementDate'}), dataIndex: 'settlementDate'},
+    { title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.settlementWayName'}), dataIndex: 'settlementWayName'},
+    { title: intl.formatMessage({ id: 'balance.platformSettlement.columns.settlementName', defaultMessage: '结算方'}), dataIndex: 'settlementName'},
+    { title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.totalCount'}), dataIndex: 'totalCount', render: (text) => numFormat(text)},
+    { title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.collectAmount'}), dataIndex: 'collectAmount', render: (text) => `${intl.formatMessage({ id: 'common.money' })}${fomatNumber(text)}`},
+    { title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.brokerage'}), dataIndex: 'brokerage'},
+    { title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.amount'}), dataIndex: 'amount', render: (text) => `${intl.formatMessage({ id: 'common.money' })}${fomatNumber(text)}`},
+    { title: intl.formatMessage({id: 'balance.platformSettlement.columns.estimatedPaymentDate', defaultMessage: '实际付款时间'}), dataIndex: 'estimatedPaymentDate'},
+    { title: intl.formatMessage({id: 'balance.platformSettlement.columns.payTime', defaultMessage: '预计付款时间'}), dataIndex: 'payTime'},
+    { title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.payWayName'}), dataIndex: 'payWayName'},
     {
       title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.status'}), dataIndex: 'status',
       filters: payStatus,

src/pages/balance/platformSettlement/couponSettlement/hooks/useHandleSettlementList.tsx

@@ -72,8 +72,7 @@ function useHandleSettlementList() {
       }
     },
     { title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.settlementWayName' }), dataIndex: 'settlementWayName' },
-    { title: intl.formatMessage({ id: '结算方' }), dataIndex: 'settlementName' },
-
+    { title: intl.formatMessage({ id: 'balance.platformSettlement.columns.settlementName', defaultMessage: '结算方'}), dataIndex: 'settlementName'},
     { title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.settlementDate' }), dataIndex: 'settlementDate' },
     { title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.totalCount' }), dataIndex: 'totalCount' },
     {
@@ -81,10 +80,9 @@ function useHandleSettlementList() {
       dataIndex: 'amount',
       render: (text) => `${intl.formatMessage({ id: 'common.money' })}${priceFormat(text)}`
     },
-    { title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.settlementTime' }), dataIndex: 'settlementTime' },
+    { title: intl.formatMessage({ id: 'balance.platformSettlement.columns.estimatedPaymentDate', defaultMessage: '预计付款时间' }), dataIndex: 'estimatedPaymentDate' },
+    { title: intl.formatMessage({ id: 'balance.platformSettlement.columns.payTime', defaultMessage: '实际付款时间' }), dataIndex: 'actualPaymentTime' },
     { title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.payWayName' }), dataIndex: 'payWayName' },
-    { title: '预计付款时间', dataIndex: 'payTime' },
-    { title: '实际付款时间', dataIndex: 'actualPayTime' },
     {
       title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.status' }), dataIndex: 'status',
       render: (text, record) => {

src/pages/balance/platformSettlement/integral/hooks/useHandleSettlementList.tsx

@@ -84,7 +84,8 @@ function useHandleSettlementList() {
       }
     },
     { title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.amount' }), dataIndex: 'amount' },
-    { title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.settlementTime' }), dataIndex: 'settlementTime' },
+    { title: intl.formatMessage({ id: 'balance.platformSettlement.columns.estimatedPaymentDate', defaultMessage: '预计付款时间' }), dataIndex: 'estimatedPaymentDate' },
+    { title: intl.formatMessage({id: 'balance.platformSettlement.columns.payTime', defaultMessage: '实际付款时间'}), dataIndex: 'payTime'},
     { title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.payWayName' }), dataIndex: 'payWayName' },
     {
       title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.status' }), dataIndex: 'status',