From ce7ff0effee22807c8d29a31d6f5f2713d3bf95c Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 11 九月 2025 17:39:51 +0800
Subject: [PATCH] Merge branch 'master' into dev-v1.1
---
src/services/api/typings.d.ts | 196 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 162 insertions(+), 34 deletions(-)
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index eab48c6..5ededb6 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -76,6 +76,8 @@
interface APIgetEnabledElectronSignSettingsParams {
/** 浼佷笟Id */
enterpriseId?: string;
+ /** 鏄惁鏌ヨ鍏ㄩ儴 */
+ all?: boolean;
}
interface APIgetEnterpriseContractTemplateSelectParams {
@@ -168,6 +170,11 @@
interface APIgetPersonalUserRealResultParams {
/** 鏌ヨ涓汉瀹炲悕缁撴灉 */
request?: GetPersonalUserRealResultQuery;
+ }
+
+ interface APIgetPersonalUserTransactionParams {
+ /** 鏀舵敮Id */
+ id?: string;
}
interface APIgetResourceFieldsParams {
@@ -641,21 +648,6 @@
Stop = 999,
}
- enum EnumEnterpriseWalletTransactionStatus {
- /**寰呮彁浜� */
- WaitSubmit = 1,
- /**寰呮敮浠� */
- WaitPay = 10,
- /**澶勭悊涓� */
- Dealing = 20,
- /**鎴愬姛 */
- Success = 30,
- /**閫�绁� */
- Refund = 40,
- /**澶辫触 */
- Fail = 50,
- }
-
enum EnumEnterpriseWalletTransactionType {
/**鍏呭�� */
Recharge = 10,
@@ -738,9 +730,9 @@
enum EnumPersonalUserRealStatus {
/**鏈疄鍚� */
UnReal = 0,
- /**鏍￠獙涓� */
+ /**璁よ瘉涓� */
Checking = 10,
- /**瀹炲悕澶辫触 */
+ /**璁よ瘉澶辫触 */
Fail = 99,
/**宸插疄鍚� */
Real = 100,
@@ -952,6 +944,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 +1648,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;
/** 閿欒淇℃伅 */
@@ -2641,6 +2691,7 @@
date?: string;
/** 鎻愪氦鏃堕棿 */
createdTime?: string;
+ checkReceiveStatus?: EnumTaskUserSubmitCheckReceiveStatus;
/** 楠屾敹鐓х墖 */
files?: string[];
}
@@ -2945,6 +2996,8 @@
interface GetEnabledElectronSignSettingsQueryResultItem {
access?: EnumElectronSignAccess;
+ /** 鏄惁绂佺敤 */
+ isDisabled?: boolean;
/** 瀹炲悕璐圭敤 */
realVerifyCost?: number;
/** 绛剧害璐圭敤 */
@@ -3288,10 +3341,6 @@
/** 閽卞寘Id */
id?: string;
access?: EnumEnterpriseWalletAccess;
- /** 璐﹀彿 */
- account?: string;
- /** 鍟嗘埛Id */
- merchantId?: string;
/** 鍗忚鍙� */
code?: string;
/** 閫氶亾鍗忚鍙� */
@@ -3303,6 +3352,21 @@
/** 鍗忚澶辨晥鏃堕棿 */
invalidTime?: string;
signStatus?: EnumEnterpriseWalletSignStatus;
+ /** 鏀粯瀹濆鍚� */
+ name?: string;
+ /** 鏀粯瀹濈櫥褰曡处鍙� */
+ identity?: string;
+ scene?: EnumEnterpriseWalletExpandindirectOrderScene;
+ /** 杞处鍦烘櫙璇存槑 */
+ sceneDirections?: string;
+ orderStatus?: EnumEnterpriseWalletExpandindirectOrderStatus;
+ /** 杩涗欢鍗曚换鍔″畬缁撴椂闂� */
+ taskFinishTime?: string;
+ /** 杩涗欢鍗曞鏍镐笉閫氳繃鍘熷洜 */
+ riskReviewRemark?: string;
+ sitesInfo?: GetEnterpriseWalletExpandindirectOrderQueryResultSites;
+ /** 闄勪欢 */
+ files?: GetEnterpriseWalletExpandindirectOrderQueryResultFile[];
expandindirectOrderStatus?: EnumEnterpriseWalletExpandindirectOrderStatus;
}
@@ -3318,7 +3382,7 @@
remark?: string;
/** 璁㈠崟鏀粯鏃堕棿 */
transDate?: string;
- transactionStatus?: EnumEnterpriseWalletTransactionStatus;
+ transactionStatus?: EnumWalletTransactionStatus;
}
interface GetExceptionLogsQuery {
@@ -3711,6 +3775,9 @@
contactPhoneNumber?: string;
/** 鏄惁瀹炲悕 */
isReal?: boolean;
+ realStatus?: EnumPersonalUserRealStatus;
+ /** 瀹炲悕澶辫触娑堟伅 */
+ realFailMessage?: string;
realMethod?: EnumUserRealMethod;
/** 鎴戠殑鎶ュ悕 */
taskCount?: number;
@@ -3718,6 +3785,8 @@
hirePassTaskCount?: number;
/** 宸插彇娑� */
hireRefuseTaskCount?: number;
+ /** 浣欓 */
+ balance?: number;
}
type GetPersonalUserBankCardQuery = Record<string, any>;
@@ -3901,6 +3970,74 @@
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;
+ /** 棰勮鍒拌处鏃堕棿 */
+ arrivalTimeEnd?: string;
+ /** 璁㈠崟鏀粯鏃堕棿 */
+ transDate?: string;
+ /** 鍒涘缓鏃堕棿 */
+ createdTime?: string;
+ /** 澶辫触鍘熷洜 */
+ failReason?: string;
+ }
+
+ 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 {
@@ -4124,6 +4261,7 @@
}
interface GetSettlementTaskUsersQueryResult {
+ detail?: GetSettlementTaskQueryResult;
/** 缁撶畻鍚嶅崟 */
data?: GetSettlementTaskUsersQueryResultItem[];
/** 閿欒淇℃伅 */
@@ -4787,10 +4925,6 @@
/** 浼佷笟Id */
enterpriseId?: string;
access?: EnumEnterpriseWalletAccess;
- /** 璐﹀彿 */
- account?: string;
- /** 鍟嗘埛Id */
- merchantId?: string;
}
interface OpenEnterpriseWalletCommandResult {
@@ -5367,6 +5501,8 @@
interface SendInviteElectronSignSmsCommand {
/** Id */
ids?: string[];
+ /** 鍚堝悓妯℃澘Id */
+ contractTemplateId?: string;
}
interface SendLoginOrRegisterVerifyCodeCommand {
@@ -5646,14 +5782,6 @@
industrialParkIds?: string[];
status?: EnumUserStatus;
/** 澶囨敞 */
- remark?: string;
- }
-
- interface TransferEnterpriseWalletCommand {
- access?: EnumEnterpriseWalletAccess;
- /** 閲戦 */
- amount?: number;
- /** 鍏呭�煎娉� */
remark?: string;
}
--
Gitblit v1.9.1