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 | 349 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 280 insertions(+), 69 deletions(-)
diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts
index c3ea930..46326ce 100644
--- a/packages/services/apiV2/typings.d.ts
+++ b/packages/services/apiV2/typings.d.ts
@@ -207,10 +207,8 @@
}
interface APIgetSettlementTaskUsersParams {
- /** 浠诲姟Id */
- taskInfoId?: string;
- /** 缁撶畻鍗曞湴鍧� */
- settlementOrderUrl?: string;
+ /** 缁撶畻璁㈠崟Id */
+ id?: string;
}
interface APIgetTaskEnterpriseParams {
@@ -228,6 +226,17 @@
keywords?: string;
}
+ interface APIgetTaskSettlementDatesParams {
+ /** 浠诲姟寮�濮嬫椂闂� */
+ beginTime?: string;
+ /** 浠诲姟缁撴潫鏃堕棿 */
+ endTime?: string;
+ /** 缁撶畻鏂瑰紡 */
+ settlementCycle?: EnumSettlementCycle;
+ /** 缁撶畻鏃ユ湡 */
+ settlementDate?: number;
+ }
+
interface APIgetTaskUserHireStatusParams {
/** 浠诲姟Id */
taskInfoId?: string;
@@ -431,6 +440,21 @@
id?: string;
}
+ interface EditTaskSettlementOrderRosterCommand {
+ /** 鍚嶅崟Id */
+ id?: string;
+ /** 缁撶畻閲戦 */
+ settlementAmount: number;
+ /** 瀹炲彂閲戦 */
+ actualSettlementAmount: number;
+ /** 鏀舵璐︽埛 */
+ receiveAccount: string;
+ /** 鎵�灞為摱琛� */
+ bank: string;
+ /** 寮�鎴锋敮琛屽悕绉� */
+ bankBranch?: string;
+ }
+
interface ElectronSignCallbackCommand {
/** 瀹㈡埛Id */
customerId?: string;
@@ -876,6 +900,10 @@
InProcess = 20,
/**宸茬粨绠� */
Completed = 30,
+ /**閮ㄥ垎缁撶畻 */
+ Part = 40,
+ /**缁撶畻澶辫触 */
+ Fail = 50,
}
enum EnumTaskStatus {
@@ -982,6 +1010,11 @@
id?: string;
}
+ interface ExportTaskSettlementOrderRostersCommand {
+ /** 缁撶畻璁㈠崟Id */
+ id?: string;
+ }
+
interface FriendlyResultBoolean {
/** 璺熻釜Id */
traceId?: string;
@@ -1703,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;
@@ -2064,6 +2115,24 @@
timestamp?: number;
}
+ interface FriendlyResultImportTaskSettlementOrderRostersCommandResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: ImportTaskSettlementOrderRostersCommandResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultInt32 {
/** 璺熻釜Id */
traceId?: string;
@@ -2083,6 +2152,25 @@
timestamp?: number;
}
+ interface FriendlyResultListDateTime {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ /** 鏁版嵁 */
+ data?: string[];
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultListGetAreaSelectQueryResultOption {
/** 璺熻釜Id */
traceId?: string;
@@ -3202,6 +3290,7 @@
enterpriseSignContractTime?: string;
/** 鐢靛瓙鍚堝悓 */
contractUrl?: string;
+ createdTime?: string;
}
type GetEnterpriseLoginInfoQuery = Record<string, any>;
@@ -3862,6 +3951,8 @@
interface GetPersonalUserInfoSignContractsQuery {
/** 鐢ㄦ埛Id */
id?: string;
+ /** 鐏靛伐Id */
+ enterpriseEmployeeId?: string;
pageModel?: PagedListQueryPageModel;
}
@@ -3996,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;
/** 瀹為檯鍒拌处 */
@@ -4010,6 +4117,7 @@
transDate?: string;
/** 鍒涘缓鏃堕棿 */
createdTime?: string;
+ transactionStatus?: EnumWalletTransactionStatus;
/** 澶辫触鍘熷洜 */
failReason?: string;
}
@@ -4020,6 +4128,8 @@
/** 鍒涘缓鏃堕棿-鎴 */
createdTimeEnd?: string;
type?: EnumUserWalletTransactionType;
+ /** 鐢ㄦ埛Id */
+ userId?: string;
pageModel?: PagedListQueryPageModel;
}
@@ -4033,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 {
@@ -4050,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;
@@ -4236,6 +4403,11 @@
keywords?: string;
settlementOrderStatus?: EnumTaskSettlementOrderStatus;
settlementStatus?: EnumTaskSettlementStatus;
+ checkReceiveStatus?: EnumTaskCheckReceiveStatus;
+ /** 缁撶畻鏃堕棿-璧峰 */
+ settlementTimeBegin?: string;
+ /** 缁撶畻鏃堕棿-鎴 */
+ settlementTimeEnd?: string;
pageModel?: PagedListQueryPageModel;
}
@@ -4248,6 +4420,40 @@
interface GetSettlementTasksQueryResultItem {
/** 浠诲姟Id */
id?: string;
+ /** 鎵�灞炰换鍔� */
+ name?: string;
+ /** 浠诲姟鍗曞彿 */
+ code?: string;
+ checkReceiveStatus?: EnumTaskCheckReceiveStatus;
+ settlementOrderStatus?: EnumTaskSettlementOrderStatus;
+ /** 缁撶畻鍗曞悕绉� */
+ settlementOrderName?: string;
+ /** 涓婁紶鏃堕棿 */
+ settlementOrderTime?: string;
+ /** 瀹炲彂閲戦 */
+ actualSettlementAmount?: number;
+ /** 缁撶畻閲戦 */
+ settlementAmount?: number;
+ settlementStatus?: EnumTaskSettlementStatus;
+ /** 鍒涘缓鏃堕棿 */
+ createdTime?: string;
+ /** 缁撶畻鏃堕棿 */
+ settlementTime?: string;
+ /** 澶囨敞 */
+ settlementRemark?: string;
+ /** 缁撶畻浜烘暟 */
+ settlementUserCount?: number;
+ }
+
+ interface GetSettlementTaskUsersQueryResult {
+ detail?: GetSettlementTaskUsersQueryResultDetail;
+ /** 缁撶畻鍚嶅崟 */
+ data?: GetSettlementTaskUsersQueryResultItem[];
+ }
+
+ interface GetSettlementTaskUsersQueryResultDetail {
+ /** 缁撶畻璁㈠崟Id */
+ id?: string;
/** 浠诲姟鍚嶇О */
name?: string;
/** 浠诲姟鍗曞彿 */
@@ -4266,41 +4472,10 @@
settlementTime?: string;
/** 澶囨敞 */
settlementRemark?: string;
- /** 缁撶畻浜烘暟 */
- settlementUserCount?: number;
- }
-
- interface GetSettlementTaskUsersQueryResult {
- detail?: GetSettlementTaskQueryResult;
- /** 缁撶畻鍚嶅崟 */
- data?: GetSettlementTaskUsersQueryResultItem[];
- /** 閿欒淇℃伅 */
- errors?: GetSettlementTaskUsersQueryResultError[];
- }
-
- interface GetSettlementTaskUsersQueryResultError {
- /** 閿欒淇℃伅 */
- errorMessage?: string;
- /** 濮撳悕 */
- name?: string;
- /** 韬唤璇佸彿 */
- identity?: string;
- /** 缁撶畻閲戦 */
- settlementAmount?: number;
- /** 瀹炲彂閲戦 */
- actualSettlementAmount?: number;
- /** 鏀舵璐︽埛 */
- receiveAccount?: string;
- /** 鎵�灞為摱琛� */
- bank?: string;
- /** 寮�鎴锋敮琛屽悕绉� */
- bankBranch?: string;
- /** 浠诲姟鍚嶇О */
- taskName?: string;
}
interface GetSettlementTaskUsersQueryResultItem {
- /** 浠诲姟鐢ㄦ埛Id */
+ /** 缁撶畻鍚嶅崟Id */
id?: string;
/** 濮撳悕 */
name?: string;
@@ -4308,8 +4483,6 @@
identity?: string;
/** 鎵嬫満鍙� */
contactPhoneNumber?: string;
- checkReceiveStatus?: EnumTaskCheckReceiveStatus;
- settlementStatus?: EnumTaskSettlementStatus;
/** 鎵�灞為摱琛� */
bank?: string;
/** 寮�鎴锋敮琛屽悕绉� */
@@ -4320,6 +4493,8 @@
settlementAmount?: number;
/** 瀹炲彂閲戦 */
actualSettlementAmount?: number;
+ settlementReceiveStatus?: SettlementReceiveStatus;
+ settlementStatus?: EnumTaskSettlementStatus;
/** 缁撶畻鏃堕棿 */
settlementTime?: string;
}
@@ -4368,6 +4543,8 @@
/** 鏈嶅姟璐� */
serviceFee?: number;
settlementCycle?: EnumSettlementCycle;
+ /** 缁撶畻鏃ユ湡 */
+ settlementDate?: number;
/** 绂忓埄 */
benefits?: GetTaskInfoQueryResultBenefit[];
/** 骞撮緞鑼冨洿鏈�灏� */
@@ -4520,7 +4697,6 @@
endTime?: string;
releaseStatus?: EnumTaskReleaseStatus;
checkReceiveStatus?: EnumTaskCheckReceiveStatus;
- settlementStatus?: EnumTaskSettlementStatus;
recommendStatus?: EnumTaskRecommendStatus;
/** 鎺ㄨ崘鏃堕棿 */
recommendTime?: string;
@@ -4911,6 +5087,58 @@
identity?: string;
}
+ interface ImportTaskSettlementOrderRostersCommand {
+ /** 缁撶畻璁㈠崟Id */
+ id?: string;
+ /** 瀵煎叆鏂囦欢鍦板潃 */
+ url: string;
+ }
+
+ interface ImportTaskSettlementOrderRostersCommandResult {
+ /** Id */
+ id?: string;
+ /** 浠诲姟鍚嶇О */
+ name?: string;
+ /** 浠诲姟鍗曞彿 */
+ code?: string;
+ settlementOrderStatus?: EnumTaskSettlementOrderStatus;
+ /** 缁撶畻鍗曞悕绉� */
+ settlementOrderName?: string;
+ /** 涓婁紶鏃堕棿 */
+ settlementOrderTime?: string;
+ /** 瀹炲彂閲戦 */
+ actualSettlementAmount?: number;
+ /** 缁撶畻閲戦 */
+ settlementAmount?: number;
+ settlementStatus?: EnumTaskSettlementStatus;
+ /** 缁撶畻鏃堕棿 */
+ settlementTime?: string;
+ /** 澶囨敞 */
+ settlementRemark?: string;
+ errors?: ImportTaskSettlementOrderRostersCommandResultError[];
+ }
+
+ interface ImportTaskSettlementOrderRostersCommandResultError {
+ /** 閿欒淇℃伅 */
+ errorMessage?: string;
+ /** 濮撳悕 */
+ name?: string;
+ /** 韬唤璇佸彿 */
+ identity?: string;
+ /** 鎵嬫満鍙� */
+ contactPhoneNumber?: string;
+ /** 鎵�灞為摱琛� */
+ bank?: string;
+ /** 鎵�灞炴敮琛� */
+ bankBranch?: string;
+ /** 鏀舵璐︽埛 */
+ receiveAccount?: string;
+ /** 缁撶畻閲戦 */
+ settlementAmount?: number;
+ /** 瀹炲彂閲戦 */
+ actualSettlementAmount?: number;
+ }
+
interface InviteElectronSignCommand {
/** 鐏靛伐Id */
ids?: string[];
@@ -5386,6 +5614,8 @@
/** 鏈嶅姟璐� */
serviceFee: number;
settlementCycle: EnumSettlementCycle;
+ /** 缁撶畻鏃ユ湡 */
+ settlementDate: number;
/** 绂忓埄缂栧彿 */
benefits?: string[];
/** 骞撮緞鑼冨洿鏈�灏� */
@@ -5603,6 +5833,13 @@
hireStatus?: EnumTaskUserHireStatus;
}
+ enum SettlementReceiveStatus {
+ /**宸插埌璐� */
+ Completed = 10,
+ /**宸查��娆� */
+ Refunded = 20,
+ }
+
interface SetUserInfoRolesCommand {
/** 鐢ㄦ埛Id */
userInfoId?: string;
@@ -5644,32 +5881,6 @@
taskInfoId?: string;
}
- interface SureTaskSettlementOrderCommand {
- /** 浠诲姟Id */
- taskInfoId?: string;
- /** 缁撶畻鍗曞湴鍧� */
- settlementOrderUrl?: string;
- /** 缁撶畻鍚嶅崟 */
- taskInfoUsers?: SureTaskSettlementOrderCommandUser[];
- }
-
- interface SureTaskSettlementOrderCommandUser {
- /** 浠诲姟鐢ㄦ埛Id */
- id?: string;
- /** 濮撳悕 */
- name?: string;
- /** 鎵�灞為摱琛� */
- bank?: string;
- /** 寮�鎴锋敮琛屽悕绉� */
- bankBranch?: string;
- /** 鏀舵璐︽埛 */
- receiveAccount: string;
- /** 缁撶畻閲戦 */
- settlementAmount: number;
- /** 瀹炲彂閲戦 */
- actualSettlementAmount: number;
- }
-
type SyncDatabaseCommand = Record<string, any>;
interface SyncElectronSignSettingsCommand {
--
Gitblit v1.10.0