From 60364392f6ea6b260d620a5f778aa9ecf28cb89e Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 23 九月 2025 10:38:32 +0800
Subject: [PATCH] Merge branch 'dev-v1.1'
---
packages/services/apiV2/typings.d.ts | 136 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 123 insertions(+), 13 deletions(-)
diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts
index 64d7946..46326ce 100644
--- a/packages/services/apiV2/typings.d.ts
+++ b/packages/services/apiV2/typings.d.ts
@@ -900,6 +900,10 @@
InProcess = 20,
/**宸茬粨绠� */
Completed = 30,
+ /**閮ㄥ垎缁撶畻 */
+ Part = 40,
+ /**缁撶畻澶辫触 */
+ Fail = 50,
}
enum EnumTaskStatus {
@@ -1732,6 +1736,24 @@
timestamp?: number;
}
+ interface FriendlyResultGetPersonalUserWalletBalancesQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetPersonalUserWalletBalancesQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultGetResourceLogsQueryResult {
/** 璺熻釜Id */
traceId?: string;
@@ -3268,6 +3290,7 @@
enterpriseSignContractTime?: string;
/** 鐢靛瓙鍚堝悓 */
contractUrl?: string;
+ createdTime?: string;
}
type GetEnterpriseLoginInfoQuery = Record<string, any>;
@@ -3928,6 +3951,8 @@
interface GetPersonalUserInfoSignContractsQuery {
/** 鐢ㄦ埛Id */
id?: string;
+ /** 鐏靛伐Id */
+ enterpriseEmployeeId?: string;
pageModel?: PagedListQueryPageModel;
}
@@ -4062,10 +4087,26 @@
settlementAmount?: number;
/** 瀹炲彂閲戦/鎻愮幇閲戦 */
amount?: number;
- /** 鏀舵浜哄鍚� */
- receiveName?: string;
+ /** 浠樻浜鸿处鎴� */
+ payerAccount?: string;
+ /** 浠樻浜哄悕绉� */
+ payerName?: string;
+ /** 浠樻浜哄紑鎴疯 */
+ payerBank?: string;
+ /** 浠樻浜烘敮琛� */
+ payerBankBranch?: string;
/** 鏀舵璐︽埛 */
receiveAccount?: string;
+ /** 鏀舵浜哄悕绉� */
+ receiveName?: string;
+ /** 鏀舵浜哄紑鎴疯 */
+ receiveBank?: string;
+ /** 鏀舵浜烘敮琛� */
+ receiveBankBranch?: string;
+ /** 甯佺 */
+ currency?: string;
+ /** 鐢ㄩ�� */
+ purpose?: string;
/** 鏈嶅姟璐� */
serviceFee?: number;
/** 瀹為檯鍒拌处 */
@@ -4076,6 +4117,7 @@
transDate?: string;
/** 鍒涘缓鏃堕棿 */
createdTime?: string;
+ transactionStatus?: EnumWalletTransactionStatus;
/** 澶辫触鍘熷洜 */
failReason?: string;
}
@@ -4086,6 +4128,8 @@
/** 鍒涘缓鏃堕棿-鎴 */
createdTimeEnd?: string;
type?: EnumUserWalletTransactionType;
+ /** 鐢ㄦ埛Id */
+ userId?: string;
pageModel?: PagedListQueryPageModel;
}
@@ -4099,14 +4143,42 @@
interface GetPersonalUserTransactionsQueryResultItem {
/** 鏀舵敮Id */
id?: string;
+ type?: EnumUserWalletTransactionType;
/** 鏍囬 */
title?: string;
- /** 鍒涘缓鏃堕棿 */
- createdTime?: string;
/** 閲戦 */
amount?: number;
/** 浣欓 */
balance?: number;
+ /** 浼佷笟鍚嶇О */
+ enterpriseName?: string;
+ /** 浠诲姟鍚嶇О */
+ taskName?: string;
+ /** 缁撶畻鍗曞悕绉� */
+ settlementOrderName?: string;
+ settlementStatus?: EnumTaskSettlementStatus;
+ /** 缁撶畻鏃堕棿 */
+ settlementTime?: string;
+ /** 浠樻浜鸿处鎴� */
+ payerAccount?: string;
+ /** 浠樻浜哄悕绉� */
+ payerName?: string;
+ /** 浠樻浜鸿处鍙� */
+ payerUserName?: string;
+ /** 浠樻浜鸿仈绯讳汉 */
+ payerContacts?: string;
+ /** 浠樻浜鸿仈绯荤數璇� */
+ payerContactPhoneNumber?: string;
+ /** 鏀舵璐︽埛 */
+ receiveAccount?: string;
+ /** 鏀舵浜哄悕绉� */
+ receiveName?: string;
+ /** 鐢ㄩ�� */
+ purpose?: string;
+ /** 鍒涘缓鏃堕棿 */
+ createdTime?: string;
+ /** 浜ゆ槗鏃堕棿 */
+ transDate?: string;
}
interface GetPersonalUserTransactionsQueryResultObjectData {
@@ -4116,6 +4188,35 @@
sumWithdraw?: number;
}
+ interface GetPersonalUserWalletBalancesQuery {
+ /** 鏈�灏忎綑棰� */
+ balanceMin?: number;
+ /** 鏈�澶т綑棰� */
+ balanceMax?: number;
+ /** 鍏抽敭瀛� */
+ keywords?: string;
+ pageModel?: PagedListQueryPageModel;
+ }
+
+ interface GetPersonalUserWalletBalancesQueryResult {
+ pageModel?: PagedListQueryResultPageModel;
+ /** 鏁版嵁 */
+ data?: GetPersonalUserWalletBalancesQueryResultItem[];
+ }
+
+ interface GetPersonalUserWalletBalancesQueryResultItem {
+ /** 鐢ㄦ埛Id */
+ id?: string;
+ /** 濮撳悕 */
+ name?: string;
+ /** 鎵嬫満鍙� */
+ contactPhoneNumber?: string;
+ /** 韬唤璇佸彿 */
+ identity?: string;
+ /** 浣欓 */
+ balance?: number;
+ }
+
interface GetResourceFieldsQueryResultItem {
/** 缂栧彿 */
code?: string;
@@ -4302,6 +4403,7 @@
keywords?: string;
settlementOrderStatus?: EnumTaskSettlementOrderStatus;
settlementStatus?: EnumTaskSettlementStatus;
+ checkReceiveStatus?: EnumTaskCheckReceiveStatus;
/** 缁撶畻鏃堕棿-璧峰 */
settlementTimeBegin?: string;
/** 缁撶畻鏃堕棿-鎴 */
@@ -4381,7 +4483,6 @@
identity?: string;
/** 鎵嬫満鍙� */
contactPhoneNumber?: string;
- settlementStatus?: EnumTaskSettlementStatus;
/** 鎵�灞為摱琛� */
bank?: string;
/** 寮�鎴锋敮琛屽悕绉� */
@@ -4392,6 +4493,8 @@
settlementAmount?: number;
/** 瀹炲彂閲戦 */
actualSettlementAmount?: number;
+ settlementReceiveStatus?: SettlementReceiveStatus;
+ settlementStatus?: EnumTaskSettlementStatus;
/** 缁撶畻鏃堕棿 */
settlementTime?: string;
}
@@ -5022,18 +5125,18 @@
name?: string;
/** 韬唤璇佸彿 */
identity?: string;
+ /** 鎵嬫満鍙� */
+ contactPhoneNumber?: string;
+ /** 鎵�灞為摱琛� */
+ bank?: string;
+ /** 鎵�灞炴敮琛� */
+ bankBranch?: string;
+ /** 鏀舵璐︽埛 */
+ receiveAccount?: string;
/** 缁撶畻閲戦 */
settlementAmount?: number;
/** 瀹炲彂閲戦 */
actualSettlementAmount?: number;
- /** 鏀舵璐︽埛 */
- receiveAccount?: string;
- /** 鎵�灞為摱琛� */
- bank?: string;
- /** 寮�鎴锋敮琛屽悕绉� */
- bankBranch?: string;
- /** 浠诲姟鍚嶇О */
- taskName?: string;
}
interface InviteElectronSignCommand {
@@ -5730,6 +5833,13 @@
hireStatus?: EnumTaskUserHireStatus;
}
+ enum SettlementReceiveStatus {
+ /**宸插埌璐� */
+ Completed = 10,
+ /**宸查��娆� */
+ Refunded = 20,
+ }
+
interface SetUserInfoRolesCommand {
/** 鐢ㄦ埛Id */
userInfoId?: string;
--
Gitblit v1.10.0