From 2efa169f1d54149c64b15cc8e2db937cb8390ee1 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 09 九月 2025 13:54:28 +0800
Subject: [PATCH] fix: bug

---
 .eslintrc-auto-import.json           |    3 
 src/services/api/typings.d.ts        |  148 ++++++++++++++++++++++++----
 auto-imports.d.ts                    |    7 +
 src/constants/apiEnum.ts             |   40 ++++---
 src/services/api/enterpriseWallet.ts |   15 ---
 src/services/api/user.ts             |   36 +++++++
 6 files changed, 191 insertions(+), 58 deletions(-)

diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 76dc90d..4d85d94 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -35,7 +35,6 @@
     "EnumEnterpriseWalletExpandindirectOrderScene": true,
     "EnumEnterpriseWalletExpandindirectOrderStatus": true,
     "EnumEnterpriseWalletSignStatus": true,
-    "EnumEnterpriseWalletTransactionStatus": true,
     "EnumEnterpriseWalletTransactionType": true,
     "EnumMenuType": true,
     "EnumMenuVisitLevel": true,
@@ -85,6 +84,8 @@
     "EnumUserStatus": true,
     "EnumUserType": true,
     "EnumUserTypeText": true,
+    "EnumUserWalletTransactionType": true,
+    "EnumWalletTransactionStatus": true,
     "ExtractDefaultPropTypes": true,
     "ExtractPropTypes": true,
     "ExtractPublicPropTypes": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 89831f3..4d9adb0 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -92,6 +92,8 @@
   const EnumUserStatus: typeof import('./src/constants/apiEnum')['EnumUserStatus']
   const EnumUserType: typeof import('./src/constants/apiEnum')['EnumUserType']
   const EnumUserTypeText: typeof import('./src/constants/apiEnumText')['EnumUserTypeText']
+  const EnumUserWalletTransactionType: typeof import('./src/constants/apiEnum')['EnumUserWalletTransactionType']
+  const EnumWalletTransactionStatus: typeof import('./src/constants/apiEnum')['EnumWalletTransactionStatus']
   const FastButtonMap: typeof import('./src/constants/module')['FastButtonMap']
   const FastColumnList: typeof import('./src/constants/module')['FastColumnList']
   const FastDataButtonList: typeof import('./src/constants/module')['FastDataButtonList']
@@ -238,7 +240,7 @@
   export type { Component, Slot, Slots, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
   import('vue')
   // @ts-ignore
-  export type { EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionStatus, EnumEnterpriseWalletTransactionType, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionStatus, EnumEnterpriseWalletTransactionType, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton } from './src/constants/apiEnum'
+  export type { EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton } from './src/constants/apiEnum'
   import('./src/constants/apiEnum')
   // @ts-ignore
   export type { CategoryCode, IdentityCodeEnum, EducationCodeEnum, CertificateTypeCodeEnum, WelfareCodeEnum } from './src/constants/dic'
@@ -302,7 +304,6 @@
     readonly EnumEnterpriseWalletExpandindirectOrderScene: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderScene']>
     readonly EnumEnterpriseWalletExpandindirectOrderStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderStatus']>
     readonly EnumEnterpriseWalletSignStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletSignStatus']>
-    readonly EnumEnterpriseWalletTransactionStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletTransactionStatus']>
     readonly EnumEnterpriseWalletTransactionType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletTransactionType']>
     readonly EnumMenuType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumMenuType']>
     readonly EnumMenuVisitLevel: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumMenuVisitLevel']>
@@ -352,6 +353,8 @@
     readonly EnumUserStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumUserStatus']>
     readonly EnumUserType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumUserType']>
     readonly EnumUserTypeText: UnwrapRef<typeof import('./src/constants/apiEnumText')['EnumUserTypeText']>
+    readonly EnumUserWalletTransactionType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumUserWalletTransactionType']>
+    readonly EnumWalletTransactionStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumWalletTransactionStatus']>
     readonly FastButtonMap: UnwrapRef<typeof import('./src/constants/module')['FastButtonMap']>
     readonly FastColumnList: UnwrapRef<typeof import('./src/constants/module')['FastColumnList']>
     readonly FastDataButtonList: UnwrapRef<typeof import('./src/constants/module')['FastDataButtonList']>
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index efed8bd..c852ec0 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -167,22 +167,6 @@
   Stop = 999,
 }
 
-/** 浼佷笟閽卞寘浜ゆ槗鐘舵�� */
-export enum EnumEnterpriseWalletTransactionStatus {
-  /**寰呮彁浜� */
-  WaitSubmit = 1,
-  /**寰呮敮浠� */
-  WaitPay = 10,
-  /**澶勭悊涓� */
-  Dealing = 20,
-  /**鎴愬姛 */
-  Success = 30,
-  /**閫�绁� */
-  Refund = 40,
-  /**澶辫触 */
-  Fail = 50,
-}
-
 /** 浼佷笟閽卞寘浜ゆ槗绫诲瀷 */
 export enum EnumEnterpriseWalletTransactionType {
   /**鍏呭�� */
@@ -511,6 +495,30 @@
   Operation = 100,
 }
 
+/** 鐢ㄦ埛閽卞寘鏀舵敮绫诲瀷 */
+export enum EnumUserWalletTransactionType {
+  /**鏀跺叆 */
+  Income = 10,
+  /**鎻愮幇 */
+  Withdraw = 20,
+}
+
+/** 閽卞寘浜ゆ槗鐘舵�� */
+export enum EnumWalletTransactionStatus {
+  /**寰呮彁浜� */
+  WaitSubmit = 1,
+  /**寰呮敮浠� */
+  WaitPay = 10,
+  /**澶勭悊涓� */
+  Dealing = 20,
+  /**鎴愬姛 */
+  Success = 30,
+  /**閫�绁� */
+  Refund = 40,
+  /**澶辫触 */
+  Fail = 50,
+}
+
 /** 鎴戠殑鎶ュ悕鍒嗛〉鍒楄〃-鐘舵�� */
 export enum GetPersonalApplyTaskInfosQueryStatus {
   /**寰呯‘璁� */
diff --git a/src/services/api/enterpriseWallet.ts b/src/services/api/enterpriseWallet.ts
index b03ba6d..f47a980 100644
--- a/src/services/api/enterpriseWallet.ts
+++ b/src/services/api/enterpriseWallet.ts
@@ -310,18 +310,3 @@
     }
   );
 }
-
-/** 浼佷笟閽卞寘杞处 POST /api/user/enterpriseWallet/transferEnterpriseWallet */
-export async function transferEnterpriseWallet(
-  body: API.TransferEnterpriseWalletCommand,
-  options?: API.RequestConfig
-) {
-  return request<string>('/api/user/enterpriseWallet/transferEnterpriseWallet', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json-patch+json',
-    },
-    data: body,
-    ...(options || {}),
-  });
-}
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index eab48c6..9923d34 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -170,6 +170,11 @@
     request?: GetPersonalUserRealResultQuery;
   }
 
+  interface APIgetPersonalUserTransactionParams {
+    /** 鏀舵敮Id */
+    id?: string;
+  }
+
   interface APIgetResourceFieldsParams {
     /** Id */
     id?: string;
@@ -641,21 +646,6 @@
     Stop = 999,
   }
 
-  enum EnumEnterpriseWalletTransactionStatus {
-    /**寰呮彁浜� */
-    WaitSubmit = 1,
-    /**寰呮敮浠� */
-    WaitPay = 10,
-    /**澶勭悊涓� */
-    Dealing = 20,
-    /**鎴愬姛 */
-    Success = 30,
-    /**閫�绁� */
-    Refund = 40,
-    /**澶辫触 */
-    Fail = 50,
-  }
-
   enum EnumEnterpriseWalletTransactionType {
     /**鍏呭�� */
     Recharge = 10,
@@ -952,6 +942,28 @@
     Enterprise = 20,
     /**杩愯惀 */
     Operation = 100,
+  }
+
+  enum EnumUserWalletTransactionType {
+    /**鏀跺叆 */
+    Income = 10,
+    /**鎻愮幇 */
+    Withdraw = 20,
+  }
+
+  enum EnumWalletTransactionStatus {
+    /**寰呮彁浜� */
+    WaitSubmit = 1,
+    /**寰呮敮浠� */
+    WaitPay = 10,
+    /**澶勭悊涓� */
+    Dealing = 20,
+    /**鎴愬姛 */
+    Success = 30,
+    /**閫�绁� */
+    Refund = 40,
+    /**澶辫触 */
+    Fail = 50,
   }
 
   interface ExportTaskCheckReceiveTaskUsersCommand {
@@ -1634,6 +1646,42 @@
     /** 閿欒鐮� */
     errorCode?: string;
     data?: GetPersonalUserRealResultQueryResult;
+    /** 鎵ц鎴愬姛 */
+    success?: boolean;
+    /** 閿欒淇℃伅 */
+    msg?: any;
+    /** 闄勫姞鏁版嵁 */
+    extras?: any;
+    /** 鏃堕棿鎴� */
+    timestamp?: number;
+  }
+
+  interface FriendlyResultGetPersonalUserTransactionQueryResult {
+    /** 璺熻釜Id */
+    traceId?: string;
+    /** 鐘舵�佺爜 */
+    code?: number;
+    /** 閿欒鐮� */
+    errorCode?: string;
+    data?: GetPersonalUserTransactionQueryResult;
+    /** 鎵ц鎴愬姛 */
+    success?: boolean;
+    /** 閿欒淇℃伅 */
+    msg?: any;
+    /** 闄勫姞鏁版嵁 */
+    extras?: any;
+    /** 鏃堕棿鎴� */
+    timestamp?: number;
+  }
+
+  interface FriendlyResultGetPersonalUserTransactionsQueryResult {
+    /** 璺熻釜Id */
+    traceId?: string;
+    /** 鐘舵�佺爜 */
+    code?: number;
+    /** 閿欒鐮� */
+    errorCode?: string;
+    data?: GetPersonalUserTransactionsQueryResult;
     /** 鎵ц鎴愬姛 */
     success?: boolean;
     /** 閿欒淇℃伅 */
@@ -3318,7 +3366,7 @@
     remark?: string;
     /** 璁㈠崟鏀粯鏃堕棿 */
     transDate?: string;
-    transactionStatus?: EnumEnterpriseWalletTransactionStatus;
+    transactionStatus?: EnumWalletTransactionStatus;
   }
 
   interface GetExceptionLogsQuery {
@@ -3901,6 +3949,66 @@
     realFailMessage?: string;
     /** 浜鸿劯瀹炲悕璁よ瘉鍦板潃 */
     faceRealUrl?: string;
+  }
+
+  interface GetPersonalUserTransactionQueryResult {
+    /** 鏀舵敮Id */
+    id?: string;
+    type?: EnumUserWalletTransactionType;
+    /** 璁㈠崟鍙� */
+    code?: string;
+    /** 浼佷笟鍚嶇О */
+    enterpriseName?: string;
+    /** 缁撶畻鏃ユ湡 */
+    settlementTime?: string;
+    /** 缁撶畻閲戦 */
+    settlementAmount?: number;
+    /** 瀹炲彂閲戦/鎻愮幇閲戦 */
+    amount?: number;
+    /** 鏀舵浜哄鍚� */
+    receiveName?: string;
+    /** 鏀舵璐︽埛 */
+    receiveAccount?: string;
+    /** 鏈嶅姟璐� */
+    serviceFee?: number;
+    /** 瀹為檯鍒拌处 */
+    actualAmount?: number;
+  }
+
+  interface GetPersonalUserTransactionsQuery {
+    /** 鍒涘缓鏃堕棿-璧峰 */
+    createdTimeStart?: string;
+    /** 鍒涘缓鏃堕棿-鎴 */
+    createdTimeEnd?: string;
+    type?: EnumUserWalletTransactionType;
+    pageModel?: PagedListQueryPageModel;
+  }
+
+  interface GetPersonalUserTransactionsQueryResult {
+    objectData?: GetPersonalUserTransactionsQueryResultObjectData;
+    pageModel?: PagedListQueryResultPageModel;
+    /** 鏁版嵁 */
+    data?: GetPersonalUserTransactionsQueryResultItem[];
+  }
+
+  interface GetPersonalUserTransactionsQueryResultItem {
+    /** 鏀舵敮Id */
+    id?: string;
+    /** 鏍囬 */
+    title?: string;
+    /** 鍒涘缓鏃堕棿 */
+    createdTime?: string;
+    /** 閲戦 */
+    amount?: number;
+    /** 浣欓 */
+    balance?: number;
+  }
+
+  interface GetPersonalUserTransactionsQueryResultObjectData {
+    /** 鎬绘敹鍏� */
+    sumIncome?: number;
+    /** 鎬绘彁鐜� */
+    sumWithdraw?: number;
   }
 
   interface GetResourceFieldsQueryResultItem {
@@ -5646,14 +5754,6 @@
     industrialParkIds?: string[];
     status?: EnumUserStatus;
     /** 澶囨敞 */
-    remark?: string;
-  }
-
-  interface TransferEnterpriseWalletCommand {
-    access?: EnumEnterpriseWalletAccess;
-    /** 閲戦 */
-    amount?: number;
-    /** 鍏呭�煎娉� */
     remark?: string;
   }
 
diff --git a/src/services/api/user.ts b/src/services/api/user.ts
index 99c7719..5ea222a 100644
--- a/src/services/api/user.ts
+++ b/src/services/api/user.ts
@@ -70,6 +70,42 @@
   );
 }
 
+/** 鏌ヨ涓汉鐢ㄦ埛鏀舵敮鏄庣粏璇︽儏 GET /api/user/user/getPersonalUserTransaction */
+export async function getPersonalUserTransaction(
+  // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+  params: API.APIgetPersonalUserTransactionParams,
+  options?: API.RequestConfig
+) {
+  return request<API.GetPersonalUserTransactionQueryResult>(
+    '/api/user/user/getPersonalUserTransaction',
+    {
+      method: 'GET',
+      params: {
+        ...params,
+      },
+      ...(options || {}),
+    }
+  );
+}
+
+/** 鏌ヨ涓汉鐢ㄦ埛鏀舵敮鏄庣粏鍒嗛〉鍒楄〃鏁版嵁 POST /api/user/user/getPersonalUserTransactions */
+export async function getPersonalUserTransactions(
+  body: API.GetPersonalUserTransactionsQuery,
+  options?: API.RequestConfig
+) {
+  return request<API.GetPersonalUserTransactionsQueryResult>(
+    '/api/user/user/getPersonalUserTransactions',
+    {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json-patch+json',
+      },
+      data: body,
+      ...(options || {}),
+    }
+  );
+}
+
 /** 鏌ヨ鐢ㄦ埛瑙掕壊鍒楄〃 GET /api/user/user/getUserInfoRoles */
 export async function getUserInfoRoles(
   // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)

--
Gitblit v1.9.1