From 8e8b54a9a91fb174c368f51d8b0b2850faf58342 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 21 十一月 2025 16:44:29 +0800
Subject: [PATCH] fix: bug
---
src/services/api/typings.d.ts | 33 ++++++++++++++++
src/constants/customerConsume.ts | 20 ++++++++++
src/views/BalanceManage/components/WithdrawalRecordView.vue | 14 ++++--
src/services/api/ParkBountyApply.ts | 15 +++++++
4 files changed, 77 insertions(+), 5 deletions(-)
diff --git a/src/constants/customerConsume.ts b/src/constants/customerConsume.ts
index 4c10490..ed0d264 100644
--- a/src/constants/customerConsume.ts
+++ b/src/constants/customerConsume.ts
@@ -67,6 +67,26 @@
[EnterpriseRechargeStatusEnum.CheckReject]: '瀹℃牳鏈�氳繃',
};
+export enum GetEnterpriseDrawWithListOutputStatus {
+ /** 寰呭鏍�*/
+ WaitCheck = 10,
+ /** 瀹℃牳閫氳繃*/
+ CheckPassed = 20,
+ /** 宸叉嫧浠�*/
+ PaySuccess = 21,
+ /** 鎷ㄤ粯澶辫触*/
+ PayFail = 22,
+ /** 瀹℃牳鏈�氳繃*/
+ CheckReject = 30,
+}
+export const GetEnterpriseDrawWithListOutputStatusText = {
+ [GetEnterpriseDrawWithListOutputStatus.WaitCheck]: '寰呭鏍�',
+ [GetEnterpriseDrawWithListOutputStatus.CheckPassed]: '瀹℃牳閫氳繃',
+ [GetEnterpriseDrawWithListOutputStatus.PaySuccess]: '宸叉嫧浠�',
+ [GetEnterpriseDrawWithListOutputStatus.PayFail]: '鎷ㄤ粯澶辫触',
+ [GetEnterpriseDrawWithListOutputStatus.CheckReject]: '瀹℃牳鏈�氳繃',
+};
+
export enum EnterprisePrechargeInComeStatusEnum {
/** 鏈叆璐�*/
NotInCome = 10,
diff --git a/src/services/api/ParkBountyApply.ts b/src/services/api/ParkBountyApply.ts
index 4d95e5d..a90b307 100644
--- a/src/services/api/ParkBountyApply.ts
+++ b/src/services/api/ParkBountyApply.ts
@@ -189,3 +189,18 @@
...(options || {}),
});
}
+
+/** 濂栧姳閲�-鍑鸿处-鍚屾浜ゆ槗淇℃伅 POST /api/ParkBountyApply/SyncParkBountyApplyTradeTransaction */
+export async function syncParkBountyApplyTradeTransaction(
+ body: API.SyncParkBountyApplyTradeTransactionInput,
+ options?: API.RequestConfig
+) {
+ return request<any>('/api/ParkBountyApply/SyncParkBountyApplyTradeTransaction', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 7673e1b..ad5c4ad 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -769,6 +769,8 @@
type EnumParkBountyTradeDetailAuditType = 10 | 100;
+ type EnumWalletTransactionStatus = 1 | 10 | 20 | 30 | 40 | 50;
+
interface ExportInsuranceStaffListInput {
status?: InsuranceDetailStatusEnum;
insurancePolicyId?: string;
@@ -901,6 +903,7 @@
amount?: number;
remainAmount?: number;
checkStatus?: EnterpriseRechargeStatusEnum;
+ status?: GetEnterpriseDrawWithListOutputStatus;
checkTime?: string;
checkRemark?: string;
checkFileUrl?: string;
@@ -911,6 +914,8 @@
objectData?: any;
data?: GetEnterpriseDrawWithListOutput[];
}
+
+ type GetEnterpriseDrawWithListOutputStatus = 10 | 20 | 21 | 22 | 30;
interface GetEnterprisePrechargeListOutput {
id?: string;
@@ -1214,6 +1219,15 @@
/** 濂栧姳閲戜綑棰� */
remianAmount?: number;
financeType?: FinanceTypeEnum;
+ /** 浜ゆ槗Id */
+ transactionId?: string;
+ transactionStatus?: EnumWalletTransactionStatus;
+ /** 璁㈠崟鏀粯鏃堕棿 */
+ transactionDate?: string;
+ /** 鏌ヨ鍒扮殑璁㈠崟鐘舵�佷负FAIL澶辫触鎴朢EFUND閫�绁ㄦ椂锛岃繑鍥為敊璇唬鐮� */
+ transactionErrorCode?: string;
+ /** 鏌ヨ鍒扮殑璁㈠崟鐘舵�佷负FAIL澶辫触鎴朢EFUND閫�绁ㄦ椂锛岃繑鍥炲叿浣撶殑鍘熷洜銆� */
+ transactionFailReason?: string;
/** 瀹℃牳鏃堕棿 */
financeAuditTime?: string;
auditStatus?: EnumParkBountyTradeDetailAuditStatus;
@@ -1247,6 +1261,9 @@
financeAuditFileUrl?: string;
/** 姹熺淇濅笂浼犵殑淇濆崟鏂囦欢 */
insureBillUrl?: string;
+ /** 鎶曚繚浜烘暟 */
+ insurePeopleNum?: number;
+ auditType?: EnumParkBountyTradeDetailAuditType;
}
interface GetParkBountyTradeDetailOutputPageOutput {
@@ -2883,6 +2900,22 @@
financeAuditOperator?: string;
/** 璐㈠姟瀹℃牳鎿嶄綔浜篒d */
financeAuditOperatorId?: string;
+ /** 浜ゆ槗Id */
+ transactionId?: string;
+ }
+
+ interface SyncParkBountyApplyTradeTransactionInput {
+ /** 鍑鸿处璁板綍Id */
+ id?: string;
+ /** 浜ゆ槗Id */
+ transactionId?: string;
+ transactionStatus?: EnumWalletTransactionStatus;
+ /** 璁㈠崟鏀粯鏃堕棿 */
+ transactionDate?: string;
+ /** 鏌ヨ鍒扮殑璁㈠崟鐘舵�佷负FAIL澶辫触鎴朢EFUND閫�绁ㄦ椂锛岃繑鍥為敊璇唬鐮� */
+ transactionErrorCode?: string;
+ /** 鏌ヨ鍒扮殑璁㈠崟鐘舵�佷负FAIL澶辫触鎴朢EFUND閫�绁ㄦ椂锛岃繑鍥炲叿浣撶殑鍘熷洜銆� */
+ transactionFailReason?: string;
}
interface SyncUserAmountInput {
diff --git a/src/views/BalanceManage/components/WithdrawalRecordView.vue b/src/views/BalanceManage/components/WithdrawalRecordView.vue
index 269c24e..2a1bd6f 100644
--- a/src/views/BalanceManage/components/WithdrawalRecordView.vue
+++ b/src/views/BalanceManage/components/WithdrawalRecordView.vue
@@ -2,12 +2,14 @@
<LoadingLayout :loading="state.loading">
<AppContainer>
<ProTableV2 v-bind="proTableProps" :columns="column" :operationBtns="operationBtns">
- <template #checkStatus="{ data, row }">
+ <template #status="{ data, row }">
<div style="display: flex; justify-content: center; align-items: center">
- {{ EnterpriseRechargeStatusEnumTextWithdrawal[row.checkStatus] }}
+ {{ GetEnterpriseDrawWithListOutputStatusText[row.status] }}
<el-tooltip
placement="top"
- v-if="row.checkStatus === EnterpriseRechargeStatusEnum.CheckReject && row.checkRemark"
+ v-if="
+ row.status === GetEnterpriseDrawWithListOutputStatus.CheckReject && row.checkRemark
+ "
:content="row.checkRemark"
>
<el-icon color="#ff0000"><WarningFilled /></el-icon>
@@ -40,6 +42,8 @@
import {
EnterpriseRechargeStatusEnumTextWithdrawal,
EnterpriseRechargeStatusEnum,
+ GetEnterpriseDrawWithListOutputStatus,
+ GetEnterpriseDrawWithListOutputStatusText,
} from '@/constants';
import { convertApi2FormUrlBySeparator } from '@/utils';
@@ -60,7 +64,7 @@
},
{
id: '3',
- enCode: 'checkStatus',
+ enCode: 'status',
name: '瀹℃牳鐘舵��',
},
{
@@ -123,7 +127,7 @@
checkTime: { type: 'date', format: 'YYYY-MM-DD' },
amount: { type: 'money' },
remainAmount: { type: 'money' },
- checkStatus: { type: 'enum', valueEnum: EnterpriseRechargeStatusEnumTextWithdrawal },
+ status: { type: 'enum', valueEnum: GetEnterpriseDrawWithListOutputStatusText },
},
}
);
--
Gitblit v1.9.1