From 03d24a395c0a5b0aa06445b70da4a9bf26997bb0 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期五, 26 九月 2025 09:51:56 +0800 Subject: [PATCH] fix: s --- apps/cMiniApp/src/subpackages/authentication/authenticationRealName/InnerPage.vue | 3 packages/services/apiV2/enterpriseWallet.ts | 32 +++++--- packages/services/apiV2/logRecords.ts | 18 ++++ packages/services/apiV2/electronSign.ts | 19 ++-- packages/services/apiV2/typings.d.ts | 163 ++++++++++++++++++++++++++++++++++++++-- packages/constants/apiEnum.ts | 4 + 6 files changed, 207 insertions(+), 32 deletions(-) diff --git a/apps/cMiniApp/src/subpackages/authentication/authenticationRealName/InnerPage.vue b/apps/cMiniApp/src/subpackages/authentication/authenticationRealName/InnerPage.vue index d2ae4ab..6e5dda9 100644 --- a/apps/cMiniApp/src/subpackages/authentication/authenticationRealName/InnerPage.vue +++ b/apps/cMiniApp/src/subpackages/authentication/authenticationRealName/InnerPage.vue @@ -211,7 +211,8 @@ }; let res = await electronSignServices.personalUserFaceReal(params); if (res) { - const encodedUrl = encodeURIComponent(res); + // 涓轰簡鍏煎鏃х増鏈殑api res鐩存帴鏄痜aceUrl + const encodedUrl = encodeURIComponent(typeof res === 'string' ? res : res.faceUrl); updateUserInfo(); Taro.navigateTo({ url: `${RouterPath.extraPage}?url=${encodedUrl}` }); } diff --git a/packages/constants/apiEnum.ts b/packages/constants/apiEnum.ts index 448f703..7910571 100644 --- a/packages/constants/apiEnum.ts +++ b/packages/constants/apiEnum.ts @@ -19,6 +19,8 @@ PcWeb = 10, /**寰俊灏忕▼搴� */ Wxmp = 20, + /**H5鐧诲綍 */ + H5 = 30, } /** 缂栧彿鍦板潃鍦烘櫙 */ @@ -109,6 +111,8 @@ Alipay = 10, /**骞冲畨閾惰 */ PingAnPay = 20, + /**寰俊 */ + WeChatPay = 30, } /** 浼佷笟閽卞寘浠h繘浠跺崟闄勪欢绫诲瀷 */ diff --git a/packages/services/apiV2/electronSign.ts b/packages/services/apiV2/electronSign.ts index abd2700..10ce0d9 100644 --- a/packages/services/apiV2/electronSign.ts +++ b/packages/services/apiV2/electronSign.ts @@ -179,14 +179,17 @@ body: API.PersonalUserFaceRealCommand, options?: API.RequestConfig ) { - return request<string>('/api/user/electronSign/personalUserFaceReal', { - method: 'POST', - headers: { - 'Content-Type': 'application/json-patch+json', - }, - data: body, - ...(options || {}), - }); + return request<API.PersonalUserFaceRealCommandResult>( + '/api/user/electronSign/personalUserFaceReal', + { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + } + ); } /** 涓汉涓夎绱犲疄鍚嶈璇� POST /api/user/electronSign/personalUserIdentity3Real */ diff --git a/packages/services/apiV2/enterpriseWallet.ts b/packages/services/apiV2/enterpriseWallet.ts index a71c0c5..3ccb9f2 100644 --- a/packages/services/apiV2/enterpriseWallet.ts +++ b/packages/services/apiV2/enterpriseWallet.ts @@ -239,6 +239,26 @@ ); } +/** 鏌ヨ宸茬绾︿紒涓氶挶鍖呴�氶亾閫夋嫨鍣ㄦ暟鎹� GET /api/user/enterpriseWallet/getEnterpriseWalletAccessSelect */ +export async function getEnterpriseWalletAccessSelect( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetEnterpriseWalletAccessSelectParams, + options?: API.RequestConfig +) { + return request<API.SelectOptionGuidGetEnterpriseWalletAccessSelectQueryOption[]>( + '/api/user/enterpriseWallet/getEnterpriseWalletAccessSelect', + { + method: 'GET', + params: { + ...params, + request: undefined, + ...params['request'], + }, + ...(options || {}), + } + ); +} + /** 鏌ヨ鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠跺崟璇︽儏 GET /api/user/enterpriseWallet/getEnterpriseWalletExpandindirectOrder */ export async function getEnterpriseWalletExpandindirectOrder( // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) @@ -309,16 +329,4 @@ ...(options || {}), } ); -} - -/** 娴嬭瘯闃块噷鏀粯 POST /api/user/enterpriseWallet/testAliPay */ -export async function testAliPay(body: API.TestAliPayCommand, options?: API.RequestConfig) { - return request<string>('/api/user/enterpriseWallet/testAliPay', { - method: 'POST', - headers: { - 'Content-Type': 'application/json-patch+json', - }, - data: body, - ...(options || {}), - }); } diff --git a/packages/services/apiV2/logRecords.ts b/packages/services/apiV2/logRecords.ts index ed70d74..0cb3919 100644 --- a/packages/services/apiV2/logRecords.ts +++ b/packages/services/apiV2/logRecords.ts @@ -41,6 +41,24 @@ }); } +/** 绗笁鏂硅祫婧愭棩蹇楀垎椤靛垪琛ㄦ煡璇� POST /api/common/logRecords/getThreeResourceLogs */ +export async function getThreeResourceLogs( + body: API.GetThreeResourceLogsQuery, + options?: API.RequestConfig +) { + return request<API.GetThreeResourceLogsQueryResult>( + '/api/common/logRecords/getThreeResourceLogs', + { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + } + ); +} + /** 璺熻釜Id鏃ュ織鏌ヨ GET /api/common/logRecords/getTraceIdLog */ export async function getTraceIdLog( // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts index bc18054..3b3cf96 100644 --- a/packages/services/apiV2/typings.d.ts +++ b/packages/services/apiV2/typings.d.ts @@ -112,6 +112,11 @@ id?: string; } + interface APIgetEnterpriseWalletAccessSelectParams { + /** 鏌ヨ宸茬绾︿紒涓氶挶鍖呴�氶亾閫夋嫨鍣ㄦ暟鎹� */ + request?: GetEnterpriseWalletAccessSelectQuery; + } + interface APIgetEnterpriseWalletExpandindirectOrderParams { /** 浼佷笟Id */ enterpriseId?: string; @@ -545,6 +550,8 @@ PcWeb = 10, /**寰俊灏忕▼搴� */ Wxmp = 20, + /**H5鐧诲綍 */ + H5 = 30, } enum EnumCodeUrlScene { @@ -624,6 +631,8 @@ Alipay = 10, /**骞冲畨閾惰 */ PingAnPay = 20, + /**寰俊 */ + WeChatPay = 30, } enum EnumEnterpriseWalletExpandindirectOrderFileType { @@ -1951,6 +1960,24 @@ timestamp?: number; } + interface FriendlyResultGetThreeResourceLogsQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetThreeResourceLogsQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + interface FriendlyResultGetTraceIdLogQueryResult { /** 璺熻釜Id */ traceId?: string; @@ -2378,6 +2405,25 @@ timestamp?: number; } + interface FriendlyResultListSelectOptionGuidGetEnterpriseWalletAccessSelectQueryOption { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + /** 鏁版嵁 */ + data?: SelectOptionGuidGetEnterpriseWalletAccessSelectQueryOption[]; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + interface FriendlyResultListSelectOptionGuidGetTaskSelectQueryOption { /** 璺熻釜Id */ traceId?: string; @@ -2550,6 +2596,24 @@ /** 閿欒鐮� */ errorCode?: string; data?: PersonalUserElectronSignCommandResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultPersonalUserFaceRealCommandResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: PersonalUserFaceRealCommandResult; /** 鎵ц鎴愬姛 */ success?: boolean; /** 閿欒淇℃伅 */ @@ -2993,8 +3057,6 @@ oldValues?: string; /** 鏂板�� */ newValues?: string; - /** 鎿嶄綔浜篒d */ - createdUserId?: string; createdUser?: GetResourceLogsQueryResultItemCreatedUser; /** 鍒涘缓鏃堕棿 */ createdTime?: string; @@ -3410,6 +3472,14 @@ isConfigured?: boolean; } + type GetEnterpriseWalletAccessSelectQuery = Record<string, any>; + + interface GetEnterpriseWalletAccessSelectQueryOption { + /** Id */ + id?: string; + access?: EnumEnterpriseWalletAccess; + } + interface GetEnterpriseWalletExpandindirectOrderQueryResult { /** 鍗曞彿 */ outBizNo?: string; @@ -3534,8 +3604,6 @@ message?: string; /** 鍫嗘爤璺熻釜 */ stackTrace?: string; - /** 鎿嶄綔浜篒d */ - createdUserId?: string; createdUser?: GetResourceLogsQueryResultItemCreatedUser; /** 鍒涘缓鏃堕棿 */ createdTime?: string; @@ -4293,8 +4361,6 @@ consoleLogs?: string; /** 鑰楁椂姣鏁� */ elapsedMilliseconds?: number; - /** 鎿嶄綔浜篒d */ - createdUserId?: string; createdUser?: GetResourceLogsQueryResultItemCreatedUser; /** 鍒涘缓鏃堕棿 */ createdTime?: string; @@ -4502,6 +4568,8 @@ interface GetSettlementTaskUsersQueryResultItem { /** 缁撶畻鍚嶅崟Id */ id?: string; + /** 鐢ㄦ埛淇℃伅Id */ + userId?: string; /** 濮撳悕 */ name?: string; /** 韬唤璇佸彿 */ @@ -4812,9 +4880,68 @@ hireStatus?: EnumTaskUserHireStatus; } + interface GetThreeResourceLogsQuery { + /** 璺熻釜Id */ + traceId?: string; + /** 鍏抽敭瀛� */ + keywords?: string; + /** 鍒涘缓鏃堕棿-璧峰 */ + createdTimeBegin?: string; + /** 鍒涘缓鏃堕棿-鎴 */ + createdTimeEnd?: string; + pageModel?: PagedListQueryPageModel; + } + + interface GetThreeResourceLogsQueryResult { + pageModel?: PagedListQueryResultPageModel; + /** 鏁版嵁 */ + data?: GetThreeResourceLogsQueryResultItem[]; + } + + interface GetThreeResourceLogsQueryResultItem { + /** Id */ + id?: string; + method?: EnumResourceMethod; + /** 鍩熷悕 */ + domain?: string; + /** 鍦板潃 */ + path?: string; + /** 璇锋眰澶� */ + requestHeaders?: string; + /** 璇锋眰鍙傛暟 */ + request?: string; + /** 璇锋眰澶� */ + responseHeaders?: string; + /** 鍝嶅簲缁撴灉 */ + response?: string; + /** 鏄惁鎴愬姛 */ + isSuccess?: boolean; + /** 鑰楁椂姣鏁� */ + elapsedMilliseconds?: number; + createdUser?: GetThreeResourceLogsQueryResultItemCreatedUser; + /** 鍒涘缓鏃堕棿 */ + createdTime?: string; + } + + interface GetThreeResourceLogsQueryResultItemCreatedUser { + /** Id */ + id?: string; + type?: EnumUserType; + /** 濮撳悕 */ + name?: string; + /** 鐢ㄦ埛鍚� */ + userName?: string; + /** 浼佷笟Id */ + enterpriseId?: string; + /** 浼佷笟鍏ㄧО */ + enterpriseName?: string; + } + interface GetTraceIdLogQueryResult { /** 璧勬簮鏃ュ織 */ resourceLogs?: GetResourceLogsQueryResultItem[]; + /** 绗笁鏂硅祫婧愭棩蹇� */ + threeResourceLogs?: GetThreeResourceLogsQueryResultItem[]; /** 寮傚父鏃ュ織 */ exceptionLogs?: GetExceptionLogsQueryResultItem[]; /** 鏁版嵁搴撳璁℃棩蹇� */ @@ -5282,6 +5409,8 @@ id?: string; /** 閭�绾︾煭淇$紪鍙凤紙浜岄�変竴锛� */ smsCode?: string; + /** 鍚堝悓妯℃澘Id锛堢绾﹀伐鍏锋椂浣跨敤锛� */ + templateId?: string; } interface PersonalUserElectronSignCommandResult { @@ -5300,6 +5429,15 @@ identityImg: string; /** 韬唤璇佸浗寰介潰 */ identityBackImg: string; + } + + interface PersonalUserFaceRealCommandResult { + /** 鐢ㄦ埛Id */ + userId?: string; + /** 鐏靛伐Id */ + enterpriseEmployeeId?: string; + /** 浜鸿劯璇嗗埆鍦板潃 */ + faceUrl?: string; } interface PersonalUserIdentity3RealCommand { @@ -5764,6 +5902,14 @@ data?: GetEnterpriseContractTemplateSelectQueryOption; } + interface SelectOptionGuidGetEnterpriseWalletAccessSelectQueryOption { + /** 鍊� */ + value?: string; + /** 鏍囩 */ + label?: string; + data?: GetEnterpriseWalletAccessSelectQueryOption; + } + interface SelectOptionGuidGetTaskSelectQueryOption { /** 鍊� */ value?: string; @@ -6052,11 +6198,6 @@ status?: EnumUserStatus; /** 澶囨敞 */ remark?: string; - } - - interface TestAliPayCommand { - code?: string; - freezeNo?: string; } interface UpdatePhoneNumberVerifyCodeCommand { -- Gitblit v1.9.1